public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: Uladzimir Bely <ubely@ilbers.de>
Subject: [PATCH v11 06/21] sbuild: Support of DEB_BUILD_PROFILES
Date: Mon, 23 May 2022 17:36:02 +0300	[thread overview]
Message-ID: <20220523143617.24759-7-amikan@ilbers.de> (raw)
In-Reply-To: <20220523143617.24759-1-amikan@ilbers.de>

From: Uladzimir Bely <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 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
index 5f68fd6..218c7e8 100644
--- a/meta/classes/dpkg.bbclass
+++ b/meta/classes/dpkg.bbclass
@@ -37,13 +37,17 @@ dpkg_runbuild() {
     E="${@ isar_export_proxies(d)}"
     E="${@ isar_export_ccache(d)}"
     export DEB_BUILD_OPTIONS="${@ isar_deb_build_options(d)}"
-    export DEB_BUILD_PROFILES="${@ isar_deb_build_profiles(d)}"
     export PARALLEL_MAKE="${PARALLEL_MAKE}"
 
+    profiles="${@ isar_deb_build_profiles(d)}"
+    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.17.1


  parent reply	other threads:[~2022-05-23 14:36 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-23 14:35 [PATCH v11 00/21] Sbuild/Schroot migration Anton Mikanovich
2022-05-23 14:35 ` [PATCH v11 01/21] dpkg-gbp: Use separate command to export tarball Anton Mikanovich
2022-05-23 14:35 ` [PATCH v11 02/21] dpkg-gbp: Use host tools for dsc preparation Anton Mikanovich
2022-05-23 14:35 ` [PATCH v11 03/21] sbuild: Add recipes for host and target rootfs to run sbuild Anton Mikanovich
2022-05-23 14:36 ` [PATCH v11 04/21] sbuild: Introduce a class for another build method Anton Mikanovich
2022-05-23 14:36 ` [PATCH v11 05/21] dpkg: Build packages with sbuild Anton Mikanovich
2022-05-23 14:36 ` Anton Mikanovich [this message]
2022-05-23 14:36 ` [PATCH v11 07/21] sbuild: Support of shell exports from dpkg_runbuild_prepend Anton Mikanovich
2022-05-23 14:36 ` [PATCH v11 08/21] dpkg: Remove builddeps install task Anton Mikanovich
2022-05-23 14:36 ` [PATCH v11 09/21] sbuild: Add ccache support Anton Mikanovich
2022-05-23 14:36 ` [PATCH v11 10/21] dpkg-base: Switch devshell to use schroot Anton Mikanovich
2022-05-23 14:36 ` [PATCH v11 11/21] dpkg-base: Switch apt_fetch and apt_unpack " Anton Mikanovich
2022-05-23 14:36 ` [PATCH v11 12/21] doc: Add sbuild-related documentation Anton Mikanovich
2022-05-23 14:36 ` [PATCH v11 13/21] sbuild: Use .dsc file instead of source directory Anton Mikanovich
2022-05-23 14:36 ` [PATCH v11 14/21] sbuild: Fixed proxy support Anton Mikanovich
2022-05-23 14:36 ` [PATCH v11 15/21] sbuild: Fix debsrc_download for packages dependencies Anton Mikanovich
2022-05-23 14:36 ` [PATCH v11 16/21] fix: support build of packages with epoch version Anton Mikanovich
2022-05-23 14:36 ` [PATCH v11 17/21] always create apt-cache dirs in deb_dl_dir_import Anton Mikanovich
2022-05-23 14:36 ` [PATCH v11 18/21] avoid absolute SCHROOT_* paths to improve caching Anton Mikanovich
2022-05-23 14:36 ` [PATCH v11 19/21] dpkg-base: Cleanup on schroot fail Anton Mikanovich
2022-05-23 14:36 ` [PATCH v11 20/21] locate generated binary package in WORKDIR Anton Mikanovich
2022-05-23 14:36 ` [PATCH v11 21/21] sbuild: Add changelog entry Anton Mikanovich
2022-05-23 14:41 ` [PATCH v11 00/21] Sbuild/Schroot migration Anton Mikanovich

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=20220523143617.24759-7-amikan@ilbers.de \
    --to=amikan@ilbers.de \
    --cc=isar-users@googlegroups.com \
    --cc=ubely@ilbers.de \
    /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