diff options
| author | Steven Chamberlain <steven@pyro.eu.org> | 2016-02-09 13:44:08 +0000 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-02-09 16:08:21 +0100 |
| commit | c8cdd98601e16a2215aa48773da4748281f1f7d5 (patch) | |
| tree | 493ac310bda5d40a32070e0b15ef9ffbb9eb37a7 | |
| parent | 1596171d45ccc7196b8b9a62bf44e5c72483dc02 (diff) | |
| download | jenkins.debian.net-c8cdd98601e16a2215aa48773da4748281f1f7d5.tar.xz | |
reproducible debian: don't always build arch:all on "any" arch
If a package builds arch-dep parts on a restricted set of arches,
don't assume the arch-indep parts can build on "any" arch.
If a package *only* lists Architecture: all, keep the current behaviour:
(linux-)amd64 will most likely work; armhf is less likely but is nice
to try anyway.
| -rwxr-xr-x | bin/reproducible_build.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 4d5dd4b3..7b11cef1 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -525,8 +525,14 @@ check_suitability() { # check whether the package is not for us... local SUITABLE=false local ARCHITECTURES=$(grep "^Architecture: " ${SRCPACKAGE}_*.dsc| cut -d " " -f2- | sed -s "s# #\n#g" | sort -u) + + # packages that are *only* arch:all can be tried on any arch + if [ "$ARCHITECTURES" = "all" ]; then + ARCHITECTURES="any" + fi + for arch in ${ARCHITECTURES} ; do - if [ "$arch" = "any" ] || [ "$arch" = "$ARCH" ] || [ "$arch" = "linux-any" ] || [ "$arch" = "linux-$ARCH" ] || [ "$arch" = "any-$ARCH" ] || [ "$arch" = "all" ] ; then + if [ "$arch" = "any" ] || [ "$arch" = "$ARCH" ] || [ "$arch" = "linux-any" ] || [ "$arch" = "linux-$ARCH" ] || [ "$arch" = "any-$ARCH" ] ; then SUITABLE=true break fi |