From patchwork Tue Jul 5 05:06:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 1933 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 05 Jul 2022 15:06:52 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f55.google.com (mail-lf1-f55.google.com [209.85.167.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 265D6p5E007317 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 5 Jul 2022 15:06:51 +0200 Received: by mail-lf1-f55.google.com with SMTP id y35-20020a0565123f2300b0047f70612402sf4000786lfa.12 for ; Tue, 05 Jul 2022 06:06:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1657026406; cv=pass; d=google.com; s=arc-20160816; b=xVpKEz1TAhW5ZZrj/7oV0LeNA9D3yw2xLW7jVXIQ1reSjLs4yPJ5DuzdUrTG6DOkzZ hi0S1UZHG3ZnBudgnXeRdMgtzZXbqN109o0C3/KZ0YiR5NvDOvGty8O/co5BZ3Puc2wm NERxy3WgEx/8RyvjSMGARIkyWkIEoi+p31QjQhtSU8ETUHoxSWiOq/uPbaFoLvRkUXXf T2DxPAt6IKNqRWeSYtZNSAXF3SHbLSX7Vd7OHDEUSK/9B3yNABYzDnxBZaiQGQGseKZO Jv6hBflUceeh7vvNgcHi5zTOnf6KQ3ehY3zVfqRl+aL2/IOwEon9MI0oVO+IHv6y5UAl 45WQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:message-id :date:subject:to:from:sender:dkim-signature; bh=IqAb6JPXS5/LNcxXffIWjZlm5B2qg8VfPIFdivlV0o8=; b=Iw/ngqvuxWJPAzQFXYfJqj3xPRVy67sS/+id1fZQ39HbvW0GslQbhaVs17fAz0FzGs t1hcqLD5MScgco9ZZ6ofKvf6Ng/nDyAQZqORQcqh2u1qeeEuMDpPuU9fVzNRvm38kG1H BTyQhLMYfUQKZ8CT7a0fFlxcJ6I01GOk+esGwnaGRQ/FNxM2hZgU9pazbvwxwGVAUN2W oj9+/wgS6IDqFaBDf26rzBB9yvCqfccWmhKmiZy5oKDwHJl26Pqlcf+wgfiU9twtsmwu +v+RNj3mDIIsth96VjvD1IaTtjX635tTUGbAYVYt+4yW3RJzA0W8ggvZ7BAKS1xFn87v Llmw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=PHWcDknv; spf=pass (google.com: domain of fm-51332-202207051306434454dc8d809c607e18-zunqar@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-51332-202207051306434454dc8d809c607e18-zunQar@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:subject:date:message-id:mime-version:feedback-id :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=IqAb6JPXS5/LNcxXffIWjZlm5B2qg8VfPIFdivlV0o8=; b=p2XPO2SKXLvMvFmoJByqr5kPcHJmhh09ein+GhH3a+TfzNiY1QPm/0Qx8kan8Pn4mJ fhiX5X/mVq8M5J6lqYOL/DbLfzxqqRshQuygNqXbATLBTj35KRZLtWka915kIey84mUl 5ZxQcjWYe+znOiJmz9xxmC71ELC+AfqWzxXKL22cbNW/clhkUVhXy02ivOAAUsA3prHn X+bSSqrS/cO4c9NlLIk9mex3qi4LPwDdgg8XFEHJe13h+uFNUpO0j/T+m+h9MCZJjG0K 9eyxkk3XAWB/6YJ3qVDbArHAP61W7/yWmcwc1DaChnJUSJpxUO7zpHnjSa5HAPbdGKn6 DByw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:subject:date:message-id :mime-version:feedback-id:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=IqAb6JPXS5/LNcxXffIWjZlm5B2qg8VfPIFdivlV0o8=; b=GWo8jhq67+9zHm5t2aVGsCIVJVl5FyEuw2yl/pL2nd8Jsf5wyNj+obFMTnXO+o9GIs vsi4ixM04noxkkn4NgdSZBdnGmUBAJYAaOWj7WIUvZu5aBPmGV2VAF7c2/NmD0//TaqD Ali2LQOfxAZfeHYf0hof2CEcgdezbCaA0S/ASsT+2qUNTtEV4fkVEtH1jFFzMyszc3Ge T3jkLV/ZNveT9MGo5Vyi25qbRiDxKbY6VUMkHOYg8/HPf0X/GPS8ltSoTUOi7hFU0AWs pcnoHiIb+8/DLtquy1yC4hwescvwWsdh/IJXUNkuw1WO3TgA4GSs1nEsF5UTltik5K+/ uPyg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AJIora8Zhz5vRg82v95W7e+m8SMt0h91oYBQt8yecuoLuOD1FWC9Bw1p Eehy6YXtyKOW/hSUNo1RjMM= X-Google-Smtp-Source: AGRyM1uyz5CCX5BnG8B30lifAl5kb3vGlgU+1EO/Po2sutUuJCqNT/JVS1A9xcqplkvDIdodT1gp6w== X-Received: by 2002:ac2:4c52:0:b0:481:233a:d721 with SMTP id o18-20020ac24c52000000b00481233ad721mr23191279lfk.295.1657026405941; Tue, 05 Jul 2022 06:06:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:99c6:0:b0:25a:89ff:c693 with SMTP id l6-20020a2e99c6000000b0025a89ffc693ls6131383ljj.9.gmail; Tue, 05 Jul 2022 06:06:44 -0700 (PDT) X-Received: by 2002:a2e:91d1:0:b0:25b:c1cf:6eb9 with SMTP id u17-20020a2e91d1000000b0025bc1cf6eb9mr19338640ljg.53.1657026404399; Tue, 05 Jul 2022 06:06:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657026404; cv=none; d=google.com; s=arc-20160816; b=Z91P5LphubvnPY2gU0pl5ulMlTlc05f+Abl14r8y56iMpMU7+KTQ8S1iVwSJetxSHx QJvuL7fojAO8mH/ZN/yf0UgvkOYvzeIZpBVDQ15PrYouJoKJJjOP3UYmptQ3DafHIbZs R6Yj7SeObnhExCchu5gMrklGqs2HWG4IRcOH41Yti+ZZAE1aVVU8dqwVFcbKsNT4ur1R mxT32N5v6VWVfZp0UR7zOxZivOFFIaGKXiFE1BKueSEDGCFeEVmyX2FIQff4TMV/AI6l 8zmhFhe//r1zqgNTz5NT9k4toacQ8GRsxzv6PQt1MAp1QcLDsQDGQn78YSqhBBwpVpgj IpPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:to:from:dkim-signature; bh=UTSyIpzn0Ukt2VIjn42wIQmAc9FhiciT6ijJyuzI6WA=; b=B+8FsnU2TxG6NM4zoP8mHfy0/nDrbKW8Up0nIhSOAOR0j4BoQJt+ABerA4Ly3QdP2h HAMhtvzMcixhETUiNGjodLF+OIh1iXJYe8DMzdpKTx6fmOZQaVVTHB7vEyU5fg8TlVWL VersK/Xq8GEXysH+jx3ESkheCjKWEXVk/K1/DCGL/G9v/0lzHtaqzgrPfqOcfSozle8I JVTUdcwcS0+FzTNLqHRCobW2IQdTKEF16XNE+Ep4aFBpBmDADo0dFfpqR3YAQKWliPot qf2I/M4pyCpktvidZxIUe7AmM+W018M3pWPAoGk/DqC0WojLE4+QXMS9K3pYS1YD0HU7 RxVg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=PHWcDknv; spf=pass (google.com: domain of fm-51332-202207051306434454dc8d809c607e18-zunqar@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-51332-202207051306434454dc8d809c607e18-zunQar@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id g14-20020a0565123b8e00b004810be25317si1094514lfv.4.2022.07.05.06.06.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Jul 2022 06:06:44 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-51332-202207051306434454dc8d809c607e18-zunqar@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 202207051306434454dc8d809c607e18 for ; Tue, 05 Jul 2022 15:06:43 +0200 From: Quirin Gylstorff To: isar-users@googlegroups.com, amikan@ilbers.de Subject: [PATCH] sbuild: Resolve package alternatives Date: Tue, 5 Jul 2022 15:06:42 +0200 Message-Id: <20220705130642.28518-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-Original-Sender: quirin.gylstorff@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=PHWcDknv; spf=pass (google.com: domain of fm-51332-202207051306434454dc8d809c607e18-zunqar@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-51332-202207051306434454dc8d809c607e18-zunQar@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX From: Quirin Gylstorff Some Debian packages allow multiple packages to fulfill the build requirements, e.g.: https://salsa.debian.org/debian/swupdate/-/blob/e7daba180b4aefda379e833dfbbb3fd6d5dc15c3/debian/control By default, sbuild does not resolve these alternatives. This patch sets the sbuild command line option to resolve these alternatives if necessary. Signed-off-by: Quirin Gylstorff --- meta/classes/dpkg.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 3dda7d24..b726ea9d 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -84,7 +84,7 @@ dpkg_runbuild() { sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \ --host=${PACKAGE_ARCH} --build=${SBUILD_HOST_ARCH} ${profiles} \ - --no-run-lintian --no-run-piuparts --no-run-autopkgtest \ + --no-run-lintian --no-run-piuparts --no-run-autopkgtest --resolve-alternatives \ --chroot-setup-commands="rm -f /var/log/dpkg.log" \ --chroot-setup-commands="cp -n --no-preserve=owner ${ext_deb_dir}/*.deb -t ${deb_dir}/ || :" \ --finished-build-commands="rm -f ${deb_dir}/sbuild-build-depends-main-dummy_*.deb" \