From 0dc6e24451e3c3e5a1e047ddd9e3a645602644fd Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 16 Mar 2018 10:10:44 +0000 Subject: [PATCH 1/2] Add armhf target for CircleCI --- .circleci/config.yml | 1 + contrib/deb/generate.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0ec36733..9f675435 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,6 +25,7 @@ jobs: PKGARCH=i386 sh contrib/deb/generate.sh && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-linux-i386; PKGARCH=mipsel sh contrib/deb/generate.sh && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-linux-mipsel; PKGARCH=mips sh contrib/deb/generate.sh && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-linux-mips; + PKGARCH=armmhf sh contrib/deb/generate.sh && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-linux-armhf; mv *.deb /tmp/upload/ - run: diff --git a/contrib/deb/generate.sh b/contrib/deb/generate.sh index 8f604d31..c46aa247 100644 --- a/contrib/deb/generate.sh +++ b/contrib/deb/generate.sh @@ -20,8 +20,9 @@ if [ $PKGARCH = "amd64" ]; then GOARCH=amd64 GOOS=linux ./build elif [ $PKGARCH = "i386" ]; then GOARCH=386 GOOS=linux ./build elif [ $PKGARCH = "mipsel" ]; then GOARCH=mipsle GOOS=linux ./build elif [ $PKGARCH = "mips" ]; then GOARCH=mips64 GOOS=linux ./build +elif [ $PKGARCH = "armhf" ]; then GOARCH=arm GOOS=linux GOARM=7 ./build else - echo "Specify PKGARCH=amd64,i386,mips,mipsel" + echo "Specify PKGARCH=amd64,i386,mips,mipsel,armhf" exit -1 fi From b3117e6fe0091ed38303aa07287f47ae6303c354 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 16 Mar 2018 10:16:05 +0000 Subject: [PATCH 2/2] Fix armmhf into armhf for PKGARCH --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9f675435..5773c6b1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,7 @@ jobs: PKGARCH=i386 sh contrib/deb/generate.sh && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-linux-i386; PKGARCH=mipsel sh contrib/deb/generate.sh && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-linux-mipsel; PKGARCH=mips sh contrib/deb/generate.sh && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-linux-mips; - PKGARCH=armmhf sh contrib/deb/generate.sh && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-linux-armhf; + PKGARCH=armhf sh contrib/deb/generate.sh && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-linux-armhf; mv *.deb /tmp/upload/ - run: