[Git][reproducible-builds/reprotest][master] 3 commits: check setarch can run before including an arch

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Reproducible Builds / reprotest


Commits:
aa9a790a by Philip Hands at 2022-09-05T12:47:36+02:00
check setarch can run before including an arch

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
48b9c119 by Philip Hands at 2022-09-05T12:47:44+02:00
remove unneeded `head` invocation

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
796d00a7 by Philip Hands at 2022-09-05T12:47:55+02:00
Revert "build.py: add ia64 to archs to be ignored"

This reverts commit a4a2057e931ec3f46b47fe78d8455b08a3bd2b60.

let's see if the for loop fixes this problem without needing the exclusion

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- reprotest/build.py


Changes:

=====================================
reprotest/build.py
=====================================
@@ -297,7 +297,7 @@ def kernel(ctx, build, vary):
     if not vary:
         _ = _.append_setup_exec_raw('SETARCH_ARCH=$(uname -m)')
     else:
-        _ = _.append_setup_exec_raw('SETARCH_ARCH=$(setarch --list)')
+        _ = _.append_setup_exec_raw('SETARCH_ARCH=$(for a in $(setarch --list); do setarch $a true && echo $a || true; done)')
         # Perform realistic shuffling of architectures depending
         # on the bitness of application.
         # 64-bit binaries can NOT be executed on 32-bit CPU,
@@ -309,7 +309,7 @@ def kernel(ctx, build, vary):
         _ = _.append_setup_exec_raw('WORDSIZE={}'.format(struct.calcsize("P")*8))
         _ = _.append_setup_exec_raw('if [ $WORDSIZE -eq 64 ]; then \
     for _ARCH_TO_DROP in armh armv7b armv7l \
-        armv8b armv8l arm athlon ia64 i386 i486 \
+        armv8b armv8l arm athlon i386 i486 \
         i586 i686 linux32 mips32 mips parisc32 \
         parisc ppc32le ppc32 ppcle ppc s390 \
         sparc32bash sparc32 sparc; \
@@ -317,7 +317,7 @@ def kernel(ctx, build, vary):
         DROP_ARCH="$DROP_ARCH -e ^$_ARCH_TO_DROP\$"; \
     done; \
 fi')
-        _ = _.append_setup_exec_raw('SETARCH_ARCH=$(echo "$SETARCH_ARCH" | grep $DROP_ARCH | shuf | head -n1)')
+        _ = _.append_setup_exec_raw('SETARCH_ARCH=$(echo "$SETARCH_ARCH" | grep $DROP_ARCH | shuf -n1)')
         _ = _.append_setup_exec_raw('KERNEL_VERSION=$(uname -r)')
         _ = _.append_setup_exec_raw('if [ ${KERNEL_VERSION#2.6} = $KERNEL_VERSION ]; then SETARCH_OPTS=--uname-2.6; fi')
         if ctx.verbosity >= 1:



View it on GitLab: https://salsa.debian.org/reproducible-builds/reprotest/-/compare/a4a2057e931ec3f46b47fe78d8455b08a3bd2b60...796d00a7b379755afd87e67dd336b6d058a59c8d

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/reprotest/-/compare/a4a2057e931ec3f46b47fe78d8455b08a3bd2b60...796d00a7b379755afd87e67dd336b6d058a59c8d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20220905/1b5b22c2/attachment.htm>