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 v12 13/21] sbuild: Use .dsc file instead of source directory
Date: Tue, 28 Jun 2022 09:49:05 +0300	[thread overview]
Message-ID: <20220628064913.27938-14-amikan@ilbers.de> (raw)
In-Reply-To: <20220628064913.27938-1-amikan@ilbers.de>

From: Uladzimir Bely <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 d92135c..564e654 100644
--- a/meta/classes/dpkg.bbclass
+++ b/meta/classes/dpkg.bbclass
@@ -61,6 +61,10 @@ dpkg_runbuild() {
 
     echo '$apt_keep_downloaded_packages = 1;' >> ${SBUILD_CONFIG}
 
+    # Create a .dsc file from source directory to use it with sbuild
+    sh -c "cd ${WORKDIR}; dpkg-source -q -b ${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 \
@@ -68,7 +72,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.17.1


  parent reply	other threads:[~2022-06-28  6:49 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-28  6:48 [PATCH v12 00/21] Sbuild/Schroot migration Anton Mikanovich
2022-06-28  6:48 ` [PATCH v12 01/21] dpkg-gbp: Use separate command to export tarball Anton Mikanovich
2022-06-28  6:48 ` [PATCH v12 02/21] dpkg-gbp: Use host tools for dsc preparation Anton Mikanovich
2022-06-28  6:48 ` [PATCH v12 03/21] sbuild: Add recipes for host and target rootfs to run sbuild Anton Mikanovich
2022-06-28  6:48 ` [PATCH v12 04/21] sbuild: Introduce a class for another build method Anton Mikanovich
2022-06-28  6:48 ` [PATCH v12 05/21] dpkg: Build packages with sbuild Anton Mikanovich
2023-01-11 20:59   ` Jan Kiszka
2023-01-12  8:01     ` Uladzimir Bely
2022-06-28  6:48 ` [PATCH v12 06/21] sbuild: Support of DEB_BUILD_PROFILES Anton Mikanovich
2022-06-28  6:48 ` [PATCH v12 07/21] sbuild: Support of shell exports from dpkg_runbuild_prepend Anton Mikanovich
2022-06-28  6:49 ` [PATCH v12 08/21] dpkg: Remove builddeps install task Anton Mikanovich
2022-07-19 14:55   ` Henning Schild
2022-06-28  6:49 ` [PATCH v12 09/21] sbuild: Add ccache support Anton Mikanovich
2022-06-28  6:49 ` [PATCH v12 10/21] dpkg-base: Switch devshell to use schroot Anton Mikanovich
2022-06-28  6:49 ` [PATCH v12 11/21] dpkg-base: Switch apt_fetch and apt_unpack " Anton Mikanovich
2022-06-28  6:49 ` [PATCH v12 12/21] doc: Add sbuild-related documentation Anton Mikanovich
2022-06-28  6:49 ` Anton Mikanovich [this message]
2022-06-28  6:49 ` [PATCH v12 14/21] sbuild: Fixed proxy support Anton Mikanovich
2022-06-28  6:49 ` [PATCH v12 15/21] sbuild: Fix debsrc_download for packages dependencies Anton Mikanovich
2022-06-28  6:49 ` [PATCH v12 16/21] fix: support build of packages with epoch version Anton Mikanovich
2022-06-28  6:49 ` [PATCH v12 17/21] always create apt-cache dirs in deb_dl_dir_import Anton Mikanovich
2022-06-28  6:49 ` [PATCH v12 18/21] avoid absolute SCHROOT_* paths to improve caching Anton Mikanovich
2022-06-28  6:49 ` [PATCH v12 19/21] dpkg-base: Cleanup on schroot fail Anton Mikanovich
2022-06-28  6:49 ` [PATCH v12 20/21] locate generated binary package in WORKDIR Anton Mikanovich
2022-06-28  6:49 ` [PATCH v12 21/21] sbuild: Add changelog entry Anton Mikanovich
2022-06-28  6:57 ` [PATCH v12 00/21] Sbuild/Schroot migration Anton Mikanovich
2022-06-28  7:24   ` Moessbauer, Felix
2022-06-28  9:10     ` Baurzhan Ismagulov
2022-06-29 12:47 ` 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=20220628064913.27938-14-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