Re: [PATCH v12 08/21] dpkg: Remove builddeps install task

[Henning Schild <henning.schild@siemens.com>]

Am Tue, 28 Jun 2022 09:49:00 +0300
schrieb Anton Mikanovich <amikan@ilbers.de>:

> From: Uladzimir Bely <ubely@ilbers.de>
> 
> 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>
> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> ---
>  meta/classes/dpkg.bbclass   | 47
> ++++++++++++++++--------------------- meta/classes/sbuild.bbclass |
> 1 - 2 files changed, 20 insertions(+), 28 deletions(-)
> 
> diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
> index 05b46c9..3c7b670 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] += "${BUILDCHROOT_DEP}
> 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="${PP}/rootfs/${deb_dir}"
> +
>      profiles="${@ isar_deb_build_profiles(d)}"
>      if [ ! -z "$profiles" ]; then
>          profiles=$(echo --profiles="$profiles" | sed -e 's/ \+/,/g')
> @@ -72,9 +55,19 @@ dpkg_runbuild() {
>  
>      export SBUILD_CONFIG="${SBUILD_CONFIG}"
>  
> +    echo '$apt_keep_downloaded_packages = 1;' >> ${SBUILD_CONFIG}
> +

This is not idempotent. If the task runs multiple times one gets many
of these lines in sbuild.conf.

Not sure why we keep that old file in the first place and do not simply
start over with a fresh file in every build.

Henning

>      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 \
> +        --chroot-setup-commands="cp -n --no-preserve=owner
> ${ext_deb_dir}/*.deb -t ${deb_dir}/ || :" \
> +        --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} +
> +    deb_dl_dir_export "${WORKDIR}/rootfs" "${distro}"
> +
> +    # Cleanup apt artifacts
> +    sudo rm -rf ${WORKDIR}/rootfs
>  }
> diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass
> index a3783bc..178ba1b 100644
> --- a/meta/classes/sbuild.bbclass
> +++ b/meta/classes/sbuild.bbclass
> @@ -8,7 +8,6 @@ SCHROOT_MOUNTS ?= ""
>  python __anonymous() {
>      import pwd
>      d.setVar('SCHROOT_USER', pwd.getpwuid(os.geteuid()).pw_name)
> -    d.setVar('SCHROOT_USER_HOME', pwd.getpwuid(os.geteuid()).pw_dir)
>  
>      mode = d.getVar('ISAR_CROSS_COMPILE', True)
>      distro_arch = d.getVar('DISTRO_ARCH')