public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: "Moessbauer, Felix" <felix.moessbauer@siemens.com>
To: Uladzimir Bely <ubely@ilbers.de>
Cc: "isar-users@googlegroups.com" <isar-users@googlegroups.com>
Subject: RE: [PATCH v8 08/16] dpkg: Remove builddeps install task.
Date: Fri, 8 Apr 2022 09:11:55 +0000	[thread overview]
Message-ID: <AM9PR10MB4869D7558953335FD797301189E99@AM9PR10MB4869.EURPRD10.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <20220317045021.4018-9-ubely@ilbers.de>

> -----Original Message-----
> From: isar-users@googlegroups.com <isar-users@googlegroups.com> On
> Behalf Of Uladzimir Bely
> Sent: Thursday, March 17, 2022 5:50 AM
> To: isar-users@googlegroups.com
> Subject: [PATCH v8 08/16] dpkg: Remove builddeps install task.
> 
> While builddeps are now handled interlnally by sbuild, we don't need a task to
> preinstall them in buildchroot.
> 
> But for the second local (base-apt) build we need a way to keep all dependencies
> in form of .deb files in DL_DIR. This is done by executing additional commands in
> sbuild that copy them to/from an externally mounted folder.
> 
> Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> ---
>  meta/classes/dpkg.bbclass   | 44 ++++++++++++++-----------------------
>  meta/classes/sbuild.bbclass |  1 -
>  2 files changed, 17 insertions(+), 28 deletions(-)
> 
> diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index
> b61d182d..b3931850 100644
> --- a/meta/classes/dpkg.bbclass
> +++ b/meta/classes/dpkg.bbclass
> @@ -5,33 +5,6 @@ inherit dpkg-base
> 
>  PACKAGE_ARCH ?= "${DISTRO_ARCH}"
> 
> -# Install build dependencies for package
> -do_install_builddeps() {
> -    dpkg_do_mounts
> -    E="${@ isar_export_proxies(d)}"
> -    export DEB_BUILD_OPTIONS="${@ isar_deb_build_options(d)}"
> -    export DEB_BUILD_PROFILES="${@ isar_deb_build_profiles(d)}"
> -    distro="${DISTRO}"
> -    if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then
> -        distro="${HOST_DISTRO}"
> -    fi
> -
> -    deb_dl_dir_import "${BUILDCHROOT_DIR}" "${distro}"
> -    sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \
> -        ${PP}/${PPS} ${PACKAGE_ARCH} --download-only
> -    deb_dl_dir_export "${BUILDCHROOT_DIR}" "${distro}"
> -    sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \
> -        ${PP}/${PPS} ${PACKAGE_ARCH}
> -    dpkg_undo_mounts
> -}
> -
> -addtask install_builddeps after do_prepare_build before do_dpkg_build -
> do_install_builddeps[depends] += "isar-apt:do_cache_config"
> -# apt and reprepro may not run in parallel, acquire the Isar lock -
> do_install_builddeps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock"
> -
> -addtask devshell after do_install_builddeps
> -
>  DPKG_PREBUILD_ENV_FILE="${WORKDIR}/dpkg_prebuild.env"
> 
>  do_prepare_build_append() {
> @@ -65,6 +38,16 @@ dpkg_runbuild() {
>          bbwarn "Export of '${line}' detected, please migrate to templates"
>      done
> 
> +    distro="${DISTRO}"
> +    if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then
> +        distro="${HOST_DISTRO}"
> +    fi
> +
> +    deb_dl_dir_import "${WORKDIR}/rootfs" "${distro}"
> +
> +    deb_dir="/var/cache/apt/archives/"
> +    ext_deb_dir="/home/builder/${PN}/rootfs/${deb_dir}"
Hi,

please use the PP variable from dpkg-base.bbclass here:
ext_root="${PP}/rootfs"

Felix

  reply	other threads:[~2022-04-08  9:11 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 [this message]
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 ` [PATCH v8 16/16] fix: support build of packages with epoch version Uladzimir Bely
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=AM9PR10MB4869D7558953335FD797301189E99@AM9PR10MB4869.EURPRD10.PROD.OUTLOOK.COM \
    --to=felix.moessbauer@siemens.com \
    --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