Merge pull request #108 from ersonp/arm-updates

armv6 and v7 download link update

Author: jdknives

build.conf

@@ -8,7 +8,7 @@
 #
 # version must always start with "v" like:  v0.1.45-rc
 
-VERSION=v0.3.0
+VERSION=v0.4.0
 # This must match the tags in the github repository
 
 # loading the actual path
@@ -20,14 +20,13 @@ ROOT=$(pwd)
 
 ARMBIAN_DOWNLOAD_URL="https://mirrors.netix.net/armbian/dl/orangepiprime/archive/Armbian_21.08.1_Orangepiprime_buster_current_5.10.60.img.xz"
 ARMBIAN_DOWNLOAD_URL_OPI3="https://mirrors.netix.net/armbian/dl/orangepi3/archive/Armbian_21.08.1_Orangepi3_buster_current_5.10.60.img.xz"
-RASPBIAN_ARMHF_DOWNLOAD_URL="https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2021-05-28/2021-05-07-raspios-buster-armhf-lite.zip"
+RASPBIAN_ARM_DOWNLOAD_URL="https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2021-05-28/2021-05-07-raspios-buster-armhf-lite.zip"
 RASPBIAN_ARM64_DOWNLOAD_URL="https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2021-05-28/2021-05-07-raspios-buster-arm64-lite.zip"
 
 # Skywire release download for OS running on destination skyminer
-SKYWIRE_VERSION=v0.4.1
+SKYWIRE_VERSION=v0.5.0
 SKYWIRE_ARM64_DOWNLOAD_URL="https://github.com/skycoin/skywire/releases/download/$SKYWIRE_VERSION/skywire-$SKYWIRE_VERSION-linux-arm64.tar.gz"
 SKYWIRE_ARM_DOWNLOAD_URL="https://github.com/skycoin/skywire/releases/download/$SKYWIRE_VERSION/skywire-$SKYWIRE_VERSION-linux-arm.tar.gz"
-SKYWIRE_ARMV6_DOWNLOAD_URL="https://github.com/asxtree/skywire-mainnet/releases/download/$SKYWIRE_VERSION/skywire-$SKYWIRE_VERSION-linux-armv6l.tar.gz"
 # Offset and sector size of the Armbian image for rootfs (found automatically if not set)
 IMG_OFFSET="" # 8192
 IMG_SECTOR="" # 512

build.sh

@@ -170,12 +170,9 @@ get_skywire()
   local _DST=${PARTS_SKYWIRE_DIR}/skywire.tar.gz # Download destination file name.
 
   if [ ! -f "${_DST}" ] ; then
-    if [ ${ARCH} == armhf ] ; then
+    if [ ${ARCH} == armv6 ] || [ ${ARCH} == armv7] || [ ${ARCH} == armhf ]; then
       notice "Downloading package from ${SKYWIRE_ARM_DOWNLOAD_URL} to ${_DST}..."
       wget -c "${SKYWIRE_ARM_DOWNLOAD_URL}" -O "${_DST}" || return 1
-    elif [ ${ARCH} == armv6 ] ; then
-      notice "Downloading package from ${SKYWIRE_ARMV6_DOWNLOAD_URL} to ${_DST}..."
-      wget -c "${SKYWIRE_ARMV6_DOWNLOAD_URL}" -O "${_DST}" || return 1
     elif [ ${ARCH} == arm64 ] ; then
       notice "Downloading package from ${SKYWIRE_ARM64_DOWNLOAD_URL} to ${_DST}..."
       wget -c "${SKYWIRE_ARM64_DOWNLOAD_URL}" -O "${_DST}" || return 1
@@ -214,12 +211,12 @@ download_os()
     wget -c "${ARMBIAN_DOWNLOAD_URL_OPI3}.sha" ||
       (error "Checksum download failed." && return 1)
   elif [ ${BOARD} == rpi ] || [ ${BOARD} == rpiw ] ; then
-    info "Downloading image from ${RASPBIAN_ARMHF_DOWNLOAD_URL} to ${_DST} ..."
-    wget -c "${RASPBIAN_ARMHF_DOWNLOAD_URL}" ||
+    info "Downloading image from ${RASPBIAN_ARM_DOWNLOAD_URL} to ${_DST} ..."
+    wget -c "${RASPBIAN_ARM_DOWNLOAD_URL}" ||
       (error "Download failed." && return 1)
 
-    info "Downloading checksum from ${RASPBIAN_ARMHF_DOWNLOAD_URL}.sha..."
-    wget -c "${RASPBIAN_ARMHF_DOWNLOAD_URL}.sha256" ||
+    info "Downloading checksum from ${RASPBIAN_ARM_DOWNLOAD_URL}.sha..."
+    wget -c "${RASPBIAN_ARM_DOWNLOAD_URL}.sha256" ||
       (error "Checksum download failed." && return 1)
   elif [ ${BOARD} == rpi64 ] ; then
     info "Downloading image from ${RASPBIAN_ARM64_DOWNLOAD_URL} to ${_DST} ..."