public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
* [xfstests-bld PATCH] gen-image: exclude packages for other architectures
@ 2018-04-04  0:15 Eric Biggers
  2018-04-16 22:08 ` Eric Biggers
  0 siblings, 1 reply; 3+ messages in thread
From: Eric Biggers @ 2018-04-04  0:15 UTC (permalink / raw)
  To: Theodore Ts'o; +Cc: fstests, Eric Biggers

Now that gen-image is run with '-e', it fails if the debs/ directory
contains packages for multiple architectures.  Fix it by installing just
the packages for the needed architecture or for "all" architectures.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 kvm-xfstests/test-appliance/gen-image | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kvm-xfstests/test-appliance/gen-image b/kvm-xfstests/test-appliance/gen-image
index 8d4bebb..2755cb5 100755
--- a/kvm-xfstests/test-appliance/gen-image
+++ b/kvm-xfstests/test-appliance/gen-image
@@ -283,7 +283,8 @@ if test -f "backport-packages-$SUITE" ; then
     fi
     rm -rf "$ROOTDIR/debootstrap"
 fi
-DEBS=$(find debs -name \*.deb)
+DEBIAN_ARCH="$(dpkg --print-architecture)"
+DEBS="$(find debs -name "*_${DEBIAN_ARCH}.deb" -o -name "*_all.deb")"
 if test -n "$DEBS"
 then
     run_in_chroot "dpkg --ignore-depends=e2fsprogs --auto-deconfigure -i $(echo $DEBS)"
-- 
2.17.0.484.g0c8726318c-goog


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-04-17 16:10 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-04  0:15 [xfstests-bld PATCH] gen-image: exclude packages for other architectures Eric Biggers
2018-04-16 22:08 ` Eric Biggers
2018-04-17 16:10   ` Theodore Y. Ts'o

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox