From patchwork Wed Apr 4 00:15:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 10321871 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 55EFB60116 for ; Wed, 4 Apr 2018 00:15:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47A7E28D32 for ; Wed, 4 Apr 2018 00:15:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3AC6228D3B; Wed, 4 Apr 2018 00:15:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E437628D32 for ; Wed, 4 Apr 2018 00:15:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756397AbeDDAPW (ORCPT ); Tue, 3 Apr 2018 20:15:22 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:32908 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756393AbeDDAPU (ORCPT ); Tue, 3 Apr 2018 20:15:20 -0400 Received: by mail-pl0-f66.google.com with SMTP id s10-v6so9469490plp.0 for ; Tue, 03 Apr 2018 17:15:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=PqN/SIJImImvKwGLvjZ56re9XBlwYqHkMdjd8lBkzwo=; b=E/3I2+XKoBK2VyI+bOwBv/iCl26m5MTjRUIFWd4Lk8hcOSzibIZST4W68Voj0b8Vab lSdpxeb4kD23s3CJgwVdJZuwoXp5OdJ1J93re0WLM47jW5gdXnLG05W4424TWWwQbK9/ uTxPfdy1rC9SsOHzhbGKpneFdGE9ZSF236hCsmYOdBT2Ke4Bso6WwGF2F1sT/heq30SU y7l0MMvpcJnLhRr2mBXjShi8X4cQx8vNfxH3EhtEq4fFhgGkqNlD1YGvnN9wdMRi34kJ CW4oY3j9aiCi1B0qBdnzvYLqcHsvBGXfOvgFXikYbce043hl/lw2t1tHug+3TbTlpLmg E10w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=PqN/SIJImImvKwGLvjZ56re9XBlwYqHkMdjd8lBkzwo=; b=c7lHw142J+vgqvT2eZo3sDcHxnG/t7SK6Q+rHVRdiPEUPUzvCjBEP8LtvDa0UMMkQh VQd30XjN7EioBHwE8XdhO+6E3CMVAou5PldYEZKp0aL8kL6zLZQDkn/AiivzKbNucI/P Oy4zYCa0+iohXvClC5TFOzCmHyDLXPh6xflWVFcVitJ2NMVMsEB2uUnqSLbS5H6C43dY BWyp0EIZhDLyiDaCpEfd9ea7D7ZsyuSuz0g/XraGOeO34L6NY+RmVY1DwqjCuIKcyZi7 m9FU7Xpq/o9mGN1kSmEHDX226JXm8CDfc4pLXCdvc2uDnBoMKwA/xMdwjrq970RHX+ZY TYmw== X-Gm-Message-State: AElRT7HqXQ+3EapfZgXBKAfncBBa0yJr99j/qHk7c9k0lWmNQ5hah7KP VTh5P5+CeTNds9lR6TBnMTIZWg== X-Google-Smtp-Source: AIpwx4+PJBCxJY9k18NnzzpfWwmyfPbu7EtisGohGSIKnOMHdXBHPdjyhwPySQNfA92SVLZ392SHZw== X-Received: by 10.99.176.12 with SMTP id h12mr10414316pgf.448.1522800919959; Tue, 03 Apr 2018 17:15:19 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([2620:15c:17:3:dc28:5c82:b905:e8a8]) by smtp.gmail.com with ESMTPSA id u4sm7325587pfb.43.2018.04.03.17.15.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Apr 2018 17:15:18 -0700 (PDT) From: Eric Biggers To: Theodore Ts'o Cc: fstests@vger.kernel.org, Eric Biggers Subject: [xfstests-bld PATCH] gen-image: exclude packages for other architectures Date: Tue, 3 Apr 2018 17:15:12 -0700 Message-Id: <20180404001512.81876-1-ebiggers@google.com> X-Mailer: git-send-email 2.17.0.484.g0c8726318c-goog Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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)"