diff mbox series

sbuild: Resolve package alternatives

Message ID 20220705130642.28518-1-Quirin.Gylstorff@siemens.com
State Accepted, archived
Headers show
Series sbuild: Resolve package alternatives | expand

Commit Message

Quirin Gylstorff July 5, 2022, 5:06 a.m. UTC 
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

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 <quirin.gylstorff@siemens.com>
---
 meta/classes/dpkg.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Anton Mikanovich July 12, 2022, 4:41 a.m. UTC | #1 
05.07.2022 16:06, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>
> 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 <quirin.gylstorff@siemens.com>
Applied to next, thanks.
diff mbox series

Patch

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" \