From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH v7 06/13] sbuild: support of DEB_BUILD_PROFILES
Date: Sun, 13 Feb 2022 08:44:52 +0100 [thread overview]
Message-ID: <20220213074459.24200-7-ubely@ilbers.de> (raw)
In-Reply-To: <20220213074459.24200-1-ubely@ilbers.de>
In Isar packages may use their own profiles. For example, linux-custom.inc
introduces 'nolibcdev' profile that should be passed to dpkg-buildpackage
in both cross and native builds.
By default, sbuild for cross-building uses passes "cross,nocheck" options
to dpkg-buildpackage and ignores DEB_BUILD_PROFILES environment variable.
This change makes sbuild use custom profiles even in cross-build mode.
Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
meta/classes/dpkg.bbclass | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
index 848ffad1..5511de64 100644
--- a/meta/classes/dpkg.bbclass
+++ b/meta/classes/dpkg.bbclass
@@ -40,10 +40,18 @@ dpkg_runbuild() {
export DEB_BUILD_PROFILES="${@ isar_deb_build_profiles(d)}"
export PARALLEL_MAKE="${PARALLEL_MAKE}"
+ profiles=$(grep "DEB_BUILD_PROFILES" ${SBUILD_CONFIG} | tail -n1 | cut -d "'" -f 4)
+ if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then
+ profiles="${profiles} cross nocheck"
+ fi
+ if [ ! -z "$profiles" ]; then
+ profiles=$(echo --profiles="$profiles" | sed -e 's/ \+/,/g')
+ fi
+
export SBUILD_CONFIG="${SBUILD_CONFIG}"
sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \
- --host=${PACKAGE_ARCH} --build=${SBUILD_HOST_ARCH} \
+ --host=${PACKAGE_ARCH} --build=${SBUILD_HOST_ARCH} ${profiles} \
--no-run-lintian --no-run-piuparts --no-run-autopkgtest \
--debbuildopts="--source-option=-I" \
--build-dir=${WORKDIR} ${WORKDIR}/${PPS}
--
2.20.1
next prev parent reply other threads:[~2022-02-13 7:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-13 7:44 [PATCH v7 00/13] Sbuild/Schroot migration Uladzimir Bely
2022-02-13 7:44 ` [PATCH v7 01/13] dpkg-gbp: Use separate command to export tarball Uladzimir Bely
2022-02-13 7:44 ` [PATCH v7 02/13] dpkg-gbp: Use host tools for dsc preparation Uladzimir Bely
2022-02-13 7:44 ` [PATCH v7 03/13] sbuild: Add recipes for host and target rootfs to run sbuild Uladzimir Bely
2022-02-13 7:44 ` [PATCH v7 04/13] sbuild: Introduce a class for another build method Uladzimir Bely
2022-02-13 7:44 ` [PATCH v7 05/13] dpkg: Build packages with sbuild Uladzimir Bely
2022-02-13 7:44 ` Uladzimir Bely [this message]
2022-02-13 16:04 ` [PATCH v7 06/13] sbuild: support of DEB_BUILD_PROFILES Moessbauer, Felix
2022-02-13 20:09 ` Uladzimir Bely
2022-02-13 7:44 ` [PATCH v7 07/13] sbuild: support of shell exports from dpkg_runbuild_prepend Uladzimir Bely
2022-02-13 7:44 ` [PATCH v7 08/13] dpkg: Remove builddeps install task Uladzimir Bely
2022-02-13 7:44 ` [PATCH v7 09/13] sbuild: add ccache support Uladzimir Bely
2022-02-13 7:44 ` [PATCH v7 10/13] dpkg-base: Switch devshell to use schroot Uladzimir Bely
2022-02-13 7:44 ` [PATCH v7 11/13] dpkg-base: Switch apt_fetch and apt_unpack " Uladzimir Bely
2022-02-13 7:44 ` [PATCH v7 12/13] doc: Add sbuild-related documentation Uladzimir Bely
2022-02-13 7:44 ` [PATCH v7 13/13] sbuild: Use .dsc file instead of source directory Uladzimir Bely
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=20220213074459.24200-7-ubely@ilbers.de \
--to=ubely@ilbers.de \
--cc=isar-users@googlegroups.com \
/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