From fde26ae4d62cb28c37bb5f7709f33b7a1a2df1f1 Mon Sep 17 00:00:00 2001 From: ersonp Date: Fri, 23 Apr 2021 12:59:59 +0530 Subject: [PATCH 1/7] armv6 and v7 link update --- build.conf | 4 ++-- build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.conf b/build.conf index 05365b57..b7f68d43 100644 --- a/build.conf +++ b/build.conf @@ -26,8 +26,8 @@ RASPBIAN_ARM64_DOWNLOAD_URL="https://downloads.raspberrypi.org/raspios_lite_arm6 # Skywire release download for OS running on destination skyminer SKYWIRE_VERSION=v0.4.1 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" +SKYWIRE_ARMV7_DOWNLOAD_URL="https://github.com/skycoin/skywire/releases/download/$SKYWIRE_VERSION/skywire-$SKYWIRE_VERSION-linux-armv7.tar.gz" +SKYWIRE_ARMV6_DOWNLOAD_URL="https://github.com/skycoin/skywire/releases/download/$SKYWIRE_VERSION/skywire-$SKYWIRE_VERSION-linux-armv6.tar.gz" # Offset and sector size of the Armbian image for rootfs (found automatically if not set) IMG_OFFSET="" # 8192 IMG_SECTOR="" # 512 diff --git a/build.sh b/build.sh index b010ade2..0f9bd872 100755 --- a/build.sh +++ b/build.sh @@ -171,8 +171,8 @@ get_skywire() if [ ! -f "${_DST}" ] ; then if [ ${BOARD} == rpi ] ; then - notice "Downloading package from ${SKYWIRE_ARM_DOWNLOAD_URL} to ${_DST}..." - wget -c "${SKYWIRE_ARM_DOWNLOAD_URL}" -O "${_DST}" || return 1 + notice "Downloading package from ${SKYWIRE_ARMV7_DOWNLOAD_URL} to ${_DST}..." + wget -c "${SKYWIRE_ARMV7_DOWNLOAD_URL}" -O "${_DST}" || return 1 elif [ ${BOARD} == rpiw ] ; then notice "Downloading package from ${SKYWIRE_ARMV6_DOWNLOAD_URL} to ${_DST}..." wget -c "${SKYWIRE_ARMV6_DOWNLOAD_URL}" -O "${_DST}" || return 1 From 1b269c4415de614f3110f7a5c24600f68c8d0671 Mon Sep 17 00:00:00 2001 From: MohammadReza Palide Date: Tue, 12 Oct 2021 17:30:34 +0330 Subject: [PATCH 2/7] change version of skywire to 0.5.0-rc1 --- build.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.conf b/build.conf index f8510fc9..d52d5080 100644 --- a/build.conf +++ b/build.conf @@ -24,7 +24,7 @@ RASPBIAN_ARMHF_DOWNLOAD_URL="https://downloads.raspberrypi.org/raspios_lite_armh 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-rc1 SKYWIRE_ARM64_DOWNLOAD_URL="https://github.com/skycoin/skywire/releases/download/$SKYWIRE_VERSION/skywire-$SKYWIRE_VERSION-linux-arm64.tar.gz" SKYWIRE_ARMV7_DOWNLOAD_URL="https://github.com/skycoin/skywire/releases/download/$SKYWIRE_VERSION/skywire-$SKYWIRE_VERSION-linux-armv7.tar.gz" SKYWIRE_ARMV6_DOWNLOAD_URL="https://github.com/skycoin/skywire/releases/download/$SKYWIRE_VERSION/skywire-$SKYWIRE_VERSION-linux-armv6.tar.gz" From d320c887e842a79a3593931a57be552aadcecaed Mon Sep 17 00:00:00 2001 From: MohammadReza Palide Date: Tue, 12 Oct 2021 17:40:17 +0330 Subject: [PATCH 3/7] change version of skywire to 0.5.0 --- build.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.conf b/build.conf index d52d5080..4c9f0bca 100644 --- a/build.conf +++ b/build.conf @@ -24,7 +24,7 @@ RASPBIAN_ARMHF_DOWNLOAD_URL="https://downloads.raspberrypi.org/raspios_lite_armh 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.5.0-rc1 +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_ARMV7_DOWNLOAD_URL="https://github.com/skycoin/skywire/releases/download/$SKYWIRE_VERSION/skywire-$SKYWIRE_VERSION-linux-armv7.tar.gz" SKYWIRE_ARMV6_DOWNLOAD_URL="https://github.com/skycoin/skywire/releases/download/$SKYWIRE_VERSION/skywire-$SKYWIRE_VERSION-linux-armv6.tar.gz" From 638ff14847c32520919941ae8655f5bb9aa44bf4 Mon Sep 17 00:00:00 2001 From: MohammadReza Palide Date: Wed, 20 Oct 2021 14:38:59 +0330 Subject: [PATCH 4/7] fix URLs for architectures --- build.conf | 5 ++--- build.sh | 17 +++++++---------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/build.conf b/build.conf index 4c9f0bca..bcbf5d63 100644 --- a/build.conf +++ b/build.conf @@ -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.5.0 SKYWIRE_ARM64_DOWNLOAD_URL="https://github.com/skycoin/skywire/releases/download/$SKYWIRE_VERSION/skywire-$SKYWIRE_VERSION-linux-arm64.tar.gz" -SKYWIRE_ARMV7_DOWNLOAD_URL="https://github.com/skycoin/skywire/releases/download/$SKYWIRE_VERSION/skywire-$SKYWIRE_VERSION-linux-armv7.tar.gz" -SKYWIRE_ARMV6_DOWNLOAD_URL="https://github.com/skycoin/skywire/releases/download/$SKYWIRE_VERSION/skywire-$SKYWIRE_VERSION-linux-armv6.tar.gz" +SKYWIRE_ARM_DOWNLOAD_URL="https://github.com/skycoin/skywire/releases/download/$SKYWIRE_VERSION/skywire-$SKYWIRE_VERSION-linux-arm.tar.gz" # Offset and sector size of the Armbian image for rootfs (found automatically if not set) IMG_OFFSET="" # 8192 IMG_SECTOR="" # 512 diff --git a/build.sh b/build.sh index d926f23a..085d1e1c 100755 --- a/build.sh +++ b/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 - notice "Downloading package from ${SKYWIRE_ARMV7_DOWNLOAD_URL} to ${_DST}..." - wget -c "${SKYWIRE_ARMV7_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 + 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} == 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} ..." From 3c51f2a4aa4bc4e57a1d145bc0a0cd16149b8fcd Mon Sep 17 00:00:00 2001 From: MohammadReza Palide Date: Wed, 20 Oct 2021 17:00:47 +0330 Subject: [PATCH 5/7] change skywire version to v0.5.0-rc8 for pass checks --- build.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.conf b/build.conf index bcbf5d63..ba889037 100644 --- a/build.conf +++ b/build.conf @@ -24,7 +24,7 @@ RASPBIAN_ARM_DOWNLOAD_URL="https://downloads.raspberrypi.org/raspios_lite_armhf/ 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.5.0 +SKYWIRE_VERSION=v0.5.0-rc8 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" # Offset and sector size of the Armbian image for rootfs (found automatically if not set) From 23c3b3625d496f2443e2ade4d7ff4d3ff1b964e1 Mon Sep 17 00:00:00 2001 From: MohammadReza Palide Date: Wed, 20 Oct 2021 17:13:32 +0330 Subject: [PATCH 6/7] change skywire version to v0.5.0-rc10 for pass checks --- build.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.conf b/build.conf index ba889037..082ee7ce 100644 --- a/build.conf +++ b/build.conf @@ -24,7 +24,7 @@ RASPBIAN_ARM_DOWNLOAD_URL="https://downloads.raspberrypi.org/raspios_lite_armhf/ 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.5.0-rc8 +SKYWIRE_VERSION=v0.5.0-rc10 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" # Offset and sector size of the Armbian image for rootfs (found automatically if not set) From 6f9bf9261ff7dd05e3a07e91c9237dab69de5994 Mon Sep 17 00:00:00 2001 From: jdknives <36450093+jdknives@users.noreply.github.com> Date: Thu, 21 Oct 2021 15:53:39 +0300 Subject: [PATCH 7/7] Point links to latest release v0.5.0 --- build.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.conf b/build.conf index 082ee7ce..3538f1bb 100644 --- a/build.conf +++ b/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 @@ -24,7 +24,7 @@ RASPBIAN_ARM_DOWNLOAD_URL="https://downloads.raspberrypi.org/raspios_lite_armhf/ 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.5.0-rc10 +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" # Offset and sector size of the Armbian image for rootfs (found automatically if not set)