RE: [PATCH v8 04/16] sbuild: Introduce a class for another build method

["Moessbauer, Felix" <felix.moessbauer@siemens.com>]

Hi,

> -----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 04/16] sbuild: Introduce a class for another build method
> 
> This also adds mounts for base-apt inside schroot and adds import/export deb
> files to/from schroot. So that it becomes possible to run second  `cached` build
> from local base-apt repo.
> 
> Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> ---
>  meta/classes/sbuild.bbclass | 160 ++++++++++++++++++++++++++++++++++++
>  meta/conf/bitbake.conf      |   2 +
>  2 files changed, 162 insertions(+)
>  create mode 100644 meta/classes/sbuild.bbclass
> 
> diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass new file
> mode 100644 index 00000000..e4341a6f
> --- /dev/null
> +++ b/meta/classes/sbuild.bbclass
> @@ -0,0 +1,160 @@
> +# This software is a part of ISAR.
> +# Copyright (C) 2021 ilbers GmbH
> +
> +SCHROOT_CONF ?= "/etc/schroot"
> +
> +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')
> +    if mode == "0" or d.getVar('HOST_ARCH') ==  distro_arch or \
> +       (d.getVar('HOST_DISTRO') == "debian-stretch" and distro_arch == "i386"):
> +        d.setVar('SBUILD_HOST_ARCH', distro_arch)
> +        d.setVar('SCHROOT_DIR', d.getVar('SCHROOT_TARGET_DIR'))
> +        dep = "sbuild-chroot-target:do_build"
> +    else:
> +        d.setVar('SBUILD_HOST_ARCH', d.getVar('HOST_ARCH'))
> +        d.setVar('SCHROOT_DIR', d.getVar('SCHROOT_HOST_DIR'))
> +        dep = "sbuild-chroot-host:do_build"
> +    d.setVar('SCHROOT_DEP', dep)
> +}
> +
> +SBUILD_CHROOT ?= "${DEBDISTRONAME}-${SCHROOT_USER}-
> ${@os.getpid()}"
> +SBUILD_CHROOT_RW ?= "${SBUILD_CHROOT}-rw"
> +
> +SBUILD_CONF_DIR ?= "${SCHROOT_CONF}/${SBUILD_CHROOT}"
> +SCHROOT_CONF_FILE ?= "${SCHROOT_CONF}/chroot.d/${SBUILD_CHROOT}"
> +SCHROOT_CONF_FILE_RW ?=
> "${SCHROOT_CONF}/chroot.d/${SBUILD_CHROOT}-rw"
> +
> +schroot_create_configs() {

Can we split this function into at least one per target file?
Having this large "cat" here is hard to maintain.

> +    sudo -s <<'EOSUDO'
> +        set -e
> +
> +        cat << EOF > "${SCHROOT_CONF_FILE}"
> +[${SBUILD_CHROOT}]
> +type=directory
> +directory=${SCHROOT_DIR}
> +profile=${SBUILD_CHROOT}
> +users=${SCHROOT_USER}
> +groups=root,sbuild
> +root-users=${SCHROOT_USER}
> +root-groups=root,sbuild
> +source-root-users=${SCHROOT_USER}
> +source-root-groups=root,sbuild
> +union-type=overlay
> +preserve-environment=true
> +EOF
> +
> +        cat << EOF > "${SCHROOT_CONF_FILE_RW}"
> +[${SBUILD_CHROOT_RW}]
> +type=directory
> +directory=${SCHROOT_DIR}
> +profile=${SBUILD_CHROOT}
> +users=${SCHROOT_USER}
> +groups=root,sbuild
> +root-users=${SCHROOT_USER}
> +root-groups=root,sbuild
> +preserve-environment=true
> +EOF
> +
> +        mkdir -p "${SCHROOT_DIR}/etc/apt/preferences.d"
> +        cat << EOF > "${SCHROOT_DIR}/etc/apt/preferences.d/isar-apt"

Outside sbuild, we have some other apt preferences that are relevant as well.
An example is the apt-retry patch, added in d349b76140482997a595ef33da6407e041113a8f

We should either duplicate them here, or better copy from buildchroot.

Felix