From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH v8 16/16] fix: support build of packages with epoch version
Date: Thu, 17 Mar 2022 05:50:21 +0100 [thread overview]
Message-ID: <20220317045021.4018-17-ubely@ilbers.de> (raw)
In-Reply-To: <20220317045021.4018-1-ubely@ilbers.de>
From: Felix Moessbauer <felix.moessbauer@siemens.com>
This patch reworks the logic how the DSC file for building
with sbuild is located.
By that, we do not rely on implementation details of dpkg-source
regarding the name of the generated .dsc file.
Instead, we remove all <package>*.dsc files in advance, let dpkg-source
generate the file and use a find to locate the generated one.
By that, package versions with epochs (e.g. "1:1.0.0") are
supported.
Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
meta/classes/dpkg.bbclass | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
index 9b9de236..e4d9519f 100644
--- a/meta/classes/dpkg.bbclass
+++ b/meta/classes/dpkg.bbclass
@@ -77,8 +77,10 @@ dpkg_runbuild() {
echo '$apt_keep_downloaded_packages = 1;' >> ${SBUILD_CONFIG}
# Create a .dsc file from source directory to use it with sbuild
+ DEB_SOURCE_NAME=$(dpkg-parsechangelog --show-field Source --file ${WORKDIR}/${PPS}/debian/changelog)
+ find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -delete
sh -c "cd ${WORKDIR}; dpkg-source -q -b ${PPS}"
- DSC=$(head -n1 ${WORKDIR}/${PPS}/debian/changelog | awk '{gsub(/[()]/,""); printf "%s_%s.dsc", $1, $2}')
+ DSC_FILE=$(find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -print)
sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \
--host=${PACKAGE_ARCH} --build=${SBUILD_HOST_ARCH} ${profiles} \
@@ -89,7 +91,7 @@ dpkg_runbuild() {
--finished-build-commands="cp -n --no-preserve=owner ${deb_dir}/*.deb -t ${ext_deb_dir}/ || :" \
--finished-build-commands="cp /var/log/dpkg.log ${ext_root}/dpkg_partial.log" \
--debbuildopts="--source-option=-I" \
- --build-dir=${WORKDIR} --dist="isar" ${WORKDIR}/${DSC}
+ --build-dir=${WORKDIR} --dist="isar" ${DSC_FILE}
sbuild_dpkg_log_export "${WORKDIR}/rootfs/dpkg_partial.log"
deb_dl_dir_export "${WORKDIR}/rootfs" "${distro}"
--
2.20.1
next prev parent reply other threads:[~2022-03-17 4:50 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-17 4:50 [PATCH v8 00/16] Sbuild/Schroot migration Uladzimir Bely
2022-03-17 4:50 ` [PATCH v8 01/16] dpkg-gbp: Use separate command to export tarball Uladzimir Bely
2022-03-17 4:50 ` [PATCH v8 02/16] dpkg-gbp: Use host tools for dsc preparation Uladzimir Bely
2022-03-17 4:50 ` [PATCH v8 03/16] sbuild: Add recipes for host and target rootfs to run sbuild Uladzimir Bely
2022-03-17 4:50 ` [PATCH v8 04/16] sbuild: Introduce a class for another build method Uladzimir Bely
2022-03-17 15:31 ` Moessbauer, Felix
2022-03-17 4:50 ` [PATCH v8 05/16] dpkg: Build packages with sbuild Uladzimir Bely
2022-03-17 4:50 ` [PATCH v8 06/16] sbuild: Support of DEB_BUILD_PROFILES Uladzimir Bely
2022-03-17 4:50 ` [PATCH v8 07/16] sbuild: Support of shell exports from dpkg_runbuild_prepend Uladzimir Bely
2022-03-17 4:50 ` [PATCH v8 08/16] dpkg: Remove builddeps install task Uladzimir Bely
2022-04-08 9:11 ` Moessbauer, Felix
2022-03-17 4:50 ` [PATCH v8 09/16] sbuild: Add ccache support Uladzimir Bely
2022-03-17 4:50 ` [PATCH v8 10/16] dpkg-base: Switch devshell to use schroot Uladzimir Bely
2022-03-17 4:50 ` [PATCH v8 11/16] dpkg-base: Switch apt_fetch and apt_unpack " Uladzimir Bely
2022-03-17 4:50 ` [PATCH v8 12/16] doc: Add sbuild-related documentation Uladzimir Bely
2022-03-17 4:50 ` [PATCH v8 13/16] sbuild: Use .dsc file instead of source directory Uladzimir Bely
2022-03-17 4:50 ` [PATCH v8 14/16] sbuild: Fixed proxy support Uladzimir Bely
2022-03-17 4:50 ` [PATCH v8 15/16] sbuild: Fix debsrc_download for packages dependencies Uladzimir Bely
2022-03-17 4:50 ` Uladzimir Bely [this message]
2022-04-07 9:32 ` [PATCH v8 00/16] Sbuild/Schroot migration Anton Mikanovich
2022-04-07 10:15 ` Moessbauer, Felix
2022-05-04 8:56 ` 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=20220317045021.4018-17-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