From b6f90f74c953fb582862dcef23afc38bc691249a Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sun, 30 Aug 2015 16:58:37 +0200 Subject: reproducible: stop special casing architectures, almost --- bin/reproducible_build.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index f9701a3e..e067ea8c 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -13,8 +13,8 @@ common_init "$@" set -e -# support for different architectures (we have actual support only for amd64) -ARCH="amd64" +# support for different architectures +ARCH="$(dpkg --print-architecture)" # sleep 1-12 secs to randomize start times delay_start() { @@ -414,10 +414,16 @@ check_suitability() { local SUITABLE=false local ARCHITECTURES=$(grep "^Architecture: " ${SRCPACKAGE}_*.dsc| cut -d " " -f2- | sed -s "s# #\n#g" | sort -u) for arch in ${ARCHITECTURES} ; do - if [ "$arch" = "any" ] || [ "$arch" = "amd64" ] || [ "$arch" = "linux-any" ] || [ "$arch" = "linux-amd64" ] || [ "$arch" = "any-amd64" ] || [ "$arch" = "all" ] ; then + if [ "$arch" = "any" ] || [ "$arch" = "$ARCH" ] || [ "$arch" = "linux-any" ] || [ "$arch" = "linux-$ARCH" ] || [ "$arch" = "any-ARCH" ] || [ "$arch" = "all" ] ; then SUITABLE=true break fi + # special case arm… + if [ "$ARCH" = "armhf" ] && [ "$arch" = "any-arm" ] ; then + SUITABLE=true + break + fi + done if ! $SUITABLE ; then handle_not_for_us $ARCHITECTURES ; fi } -- cgit v1.2.3-70-g09d2