public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH v7 13/13] sbuild: Use .dsc file instead of source directory.
Date: Sun, 13 Feb 2022 08:44:59 +0100	[thread overview]
Message-ID: <20220213074459.24200-14-ubely@ilbers.de> (raw)
In-Reply-To: <20220213074459.24200-1-ubely@ilbers.de>

This makes build more Debian-like and avoids additional execution of
"dh clean" by sbuild before dependencies resolved and build started.

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 meta/classes/dpkg.bbclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
index 3cd40ba8..19bd582d 100644
--- a/meta/classes/dpkg.bbclass
+++ b/meta/classes/dpkg.bbclass
@@ -69,6 +69,10 @@ dpkg_runbuild() {
 
     export SBUILD_CONFIG="${SBUILD_CONFIG}"
 
+    # Create a .dsc file from source directory to use it with sbuild
+    dpkg-source -q -b ${WORKDIR}/${PPS}
+    DSC=$(head -n1 ${WORKDIR}/${PPS}/debian/changelog | awk '{gsub(/[()]/,""); printf "%s_%s.dsc", $1, $2}')
+
     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 \
@@ -76,7 +80,7 @@ dpkg_runbuild() {
         --finished-build-commands="rm -f ${deb_dir}/sbuild-build-depends-main-dummy_*.deb" \
         --finished-build-commands="cp -n --no-preserve=owner ${deb_dir}/*.deb -t ${ext_deb_dir}/ || :" \
         --debbuildopts="--source-option=-I" \
-        --build-dir=${WORKDIR} ${WORKDIR}/${PPS}
+        --build-dir=${WORKDIR} --dist="isar" ${WORKDIR}/${DSC}
 
     deb_dl_dir_export "${WORKDIR}/rootfs" "${distro}"
 }
-- 
2.20.1


      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 ` [PATCH v7 06/13] sbuild: support of DEB_BUILD_PROFILES Uladzimir Bely
2022-02-13 16:04   ` 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 ` Uladzimir Bely [this message]

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-14-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