From: Eric Biggers <ebiggers@google.com>
To: Theodore Ts'o <tytso@mit.edu>
Cc: fstests@vger.kernel.org, Eric Biggers <ebiggers@google.com>
Subject: [xfstests-bld PATCH] gen-image: exclude packages for other architectures
Date: Tue, 3 Apr 2018 17:15:12 -0700 [thread overview]
Message-ID: <20180404001512.81876-1-ebiggers@google.com> (raw)
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
next reply other threads:[~2018-04-04 0:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-04 0:15 Eric Biggers [this message]
2018-04-16 22:08 ` [xfstests-bld PATCH] gen-image: exclude packages for other architectures Eric Biggers
2018-04-17 16:10 ` Theodore Y. Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180404001512.81876-1-ebiggers@google.com \
--to=ebiggers@google.com \
--cc=fstests@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox