From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7319406651323187200 X-Received: by 2002:a05:600c:418c:b0:40d:39bb:b8eb with SMTP id p12-20020a05600c418c00b0040d39bbb8ebmr1337459wmh.118.1705648844900; Thu, 18 Jan 2024 23:20:44 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3c85:b0:40e:41b7:1c28 with SMTP id bg5-20020a05600c3c8500b0040e41b71c28ls398121wmb.2.-pod-prod-04-eu; Thu, 18 Jan 2024 23:20:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IGK5Ko2Xro7xwuzluRqwD3J/Wz+eI6Wz+dL0k54uvs5Tv2dBecmy3LX1z/EJcY8/LMw68cE X-Received: by 2002:a05:600c:4744:b0:40e:877f:250c with SMTP id w4-20020a05600c474400b0040e877f250cmr1153868wmo.103.1705648842651; Thu, 18 Jan 2024 23:20:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705648842; cv=none; d=google.com; s=arc-20160816; b=dmHApNOls7TJEremyiQpmxa2ShsuDV38rVWqlJZMvWh0ywvK8xSvmKN+FdHzqXltfC 8gXmlY5E3hl8+IjXOEFSRDEP92tSHcd9kn2KgsxB9/AsdEsZACr0ZcMUiCrN+5csU8+e V0Blqk9dDjq05NewBbfC5lap84yCVAZtxmn+dteP24Xi9XYjuQDhhDh09JI/NeuEk4fk k7SvyC/E7vqYTzsFmPVqlE+RQQOUm80WHLt+DQUqzAimvc9oOd6LgMnlvsUgONwHIRbY HLEyCzCzHD9h8G1nD9TFVf6NFuITGKPzjAt4kNKI/W8Z1vCTu3RFv46GP+epKkH07EGr GifA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id; bh=XSwZVc3OYfBPmGMPR5SX4HJ8f8mmXxD6rJ778J24uvA=; fh=aaFGT06UvsPZN9Aa963VOe44p/83dfhivamCD7BmcAE=; b=NFSuBEfzXqum2WMOvJWo8tOX8+DKr/Z43sP9uqffUmGERPHVrvy0MN1u8QUzE8US0j zZngsoi1rqdZynWulfnqiIffNCXurLfDjyUiLdEdC6i45y0+EhlmO7JWyp/XRD+Oqvtn CB4cLkrHwBg2nFH7ep4N47BEAxWas1ZM7wn8NXARsX1ZS9HRdj/AdEUgUyxnNZiqntn3 gFAw/4sJP9tnW0C5HxeZDu5xyKMdqncip25RYp/KTJ/MVUbxOnv9umJ1nw0hYLY5eiE+ 16Hn55EpdmUtC0jVbelaKYA/OSpsmuPBg4jYZQHugkjohNRdXbtM3x6AZpDcV87KkPFF Vmyw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id c12-20020adfef4c000000b00337bc211c66si151214wrp.0.2024.01.18.23.20.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Jan 2024 23:20:42 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from [127.0.0.1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 40J7Kest012754 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 19 Jan 2024 08:20:41 +0100 Message-ID: Subject: Re: [PATCH v6] dpkg: Restore support for replacing pre-installed packages in sbuild-chroot From: Uladzimir Bely To: Jan Kiszka , isar-users Cc: "A, Srinuvasan" Date: Fri, 19 Jan 2024 10:20:40 +0300 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.50.3 (by Flathub.org) MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: Kb87T/apPCwT On Thu, 2024-01-18 at 14:50 +0100, Jan Kiszka wrote: > From: Jan Kiszka >=20 > During the migration to sbuild, support for using self-built packages > in > the build environment was lost if those were already part of the > sbuild-chroot. This restores it by adding --apt-distupgrade to the > sbuild call. But that is not enough because sbuild will only upgrade > packages from already configured sources, not those specified via > --extra-repository. We therefore have to switch back to configuring > isar-apt during sbuild-chroot creation. >=20 > As rootfs_configure_isar_apt configures the isar repo under > /isar-apt, we bind-mount the one in /home/builder/${PN} to that > folder. > Another difference is that we now need to run apt-get update > explicitly, > but only for isar-apt. >=20 > For apt fetching, we neither need nor want isar-apt to be available. > Rebuilding self-generated apt packages is generally pointless as the > needs are better addressed in the generating recipe itself. Exposing > isar-apt to the fetch may furthermore lead to fetching a previously > built source package of the same recipe, rather than pulling the > external version. >=20 > And because the sbuild-chroots are now left behind with isar-apt > configured, the configuration in imager_run can be removed (credits > to > Srinuvasan Arjunan). >=20 > Signed-off-by: Jan Kiszka > --- >=20 > Changes in v6: > =C2=A0- basically, going back to v4 but disabling isar-apt in do_apt_fetc= h >=20 > I was able to resolve the scenario that Uladzimir was sharing this > way.=20 > And I also realized that apt fetching as well as unpacking should > have=20 > no deal with isar-apt. So, v5 was taking a wrong turn. >=20 > =C2=A0meta/classes/dpkg-base.bbclass=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 29 +++++++++++----= -- > -- > =C2=A0meta/classes/dpkg.bbclass=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 |=C2=A0 5 ++-- > =C2=A0meta/classes/image-tools-extension.bbclass=C2=A0=C2=A0=C2=A0 | 13 -= -------- > =C2=A0.../sbuild-chroot/sbuild-chroot.inc=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 2 -- > =C2=A04 files changed, 20 insertions(+), 29 deletions(-) >=20 > diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg- > base.bbclass > index 7b054d3f..80686677 100644 > --- a/meta/classes/dpkg-base.bbclass > +++ b/meta/classes/dpkg-base.bbclass > @@ -19,8 +19,6 @@ DEPENDS:append:riscv64 =3D "${@' crossbuild- > essential-riscv64' if d.getVar('ISAR_C > =C2=A0DEB_BUILD_PROFILES ?=3D "" > =C2=A0DEB_BUILD_OPTIONS ?=3D "" > =C2=A0 > -ISAR_APT_REPO ?=3D "deb [trusted=3Dyes] file:///home/builder/${PN}/isar- > apt/${DISTRO}-${DISTRO_ARCH}/apt/${DISTRO}=C2=A0${DEBDISTRONAME} main" > - > =C2=A0python do_adjust_git() { > =C2=A0=C2=A0=C2=A0=C2=A0 import subprocess > =C2=A0 > @@ -115,6 +113,8 @@ do_apt_fetch() { > =C2=A0=C2=A0=C2=A0=C2=A0 trap 'exit 1' INT HUP QUIT TERM ALRM USR1 > =C2=A0=C2=A0=C2=A0=C2=A0 trap 'schroot_cleanup' EXIT > =C2=A0 > +=C2=A0=C2=A0=C2=A0 schroot -d / -u root -c ${SBUILD_CHROOT} -- \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 rm /etc/apt/sources.list.d/is= ar-apt.list > /etc/apt/preferences.d/isar-apt The issue is still reproducible with the steps I posted below, as well as CI still fails with v6. I think, the steps above are not sufficient to completely stop dealing with isar-apt in do_apt_fetch() and we need some kind of 'apt update' here to consider removed list and preferences. The question is how to say apt to forget about isar-apt and do not run apt update for other source lists... maybe, simply remove isar-apt files from /var/lib/apt/lists/. > =C2=A0=C2=A0=C2=A0=C2=A0 for uri in "${SRC_APT}"; do > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 schroot -d / -c ${SBUILD= _CHROOT} -- \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 = sh -c 'mkdir -p /downloads/deb-src/"$1"/"$2" && cd > /downloads/deb-src/"$1"/"$2" && apt-get -y --download-only --only- > source source "$2"' my_script "${BASE_DISTRO}- > ${BASE_DISTRO_CODENAME}" "${uri}" > @@ -221,8 +221,17 @@ def isar_export_build_settings(d): > =C2=A0=C2=A0=C2=A0=C2=A0 os.environ['DEB_BUILD_OPTIONS']=C2=A0 =3D isar_d= eb_build_options(d) > =C2=A0=C2=A0=C2=A0=C2=A0 os.environ['DEB_BUILD_PROFILES'] =3D isar_deb_bu= ild_profiles(d) > =C2=A0 > +dpkg_schroot_create_configs() { > +=C2=A0=C2=A0=C2=A0 schroot_create_configs > +=C2=A0=C2=A0=C2=A0 sudo -s <<'EOSUDO' > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sbuild_fstab=3D"${SBUILD_CONF= _DIR}/fstab" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fstab_isarapt=3D"${WORKDIR}/i= sar-apt/${DISTRO}- > ${DISTRO_ARCH}/apt/${DISTRO} /isar-apt none rw,bind 0 0" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 grep -qxF "${fstab_isarapt}" = ${sbuild_fstab} || echo > "${fstab_isarapt}" >> ${sbuild_fstab} > +EOSUDO > +} > + > =C2=A0python do_dpkg_build() { > -=C2=A0=C2=A0=C2=A0 bb.build.exec_func('schroot_create_configs', d) > +=C2=A0=C2=A0=C2=A0 bb.build.exec_func('dpkg_schroot_create_configs', d) > =C2=A0=C2=A0=C2=A0=C2=A0 try: > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 bb.build.exec_func("dpkg= _runbuild", d) > =C2=A0=C2=A0=C2=A0=C2=A0 finally: > @@ -288,7 +297,7 @@ do_deploy_deb[lockfiles] =3D > "${REPO_ISAR_DIR}/isar.lock" > =C2=A0do_deploy_deb[dirs] =3D "${S}" > =C2=A0 > =C2=A0python do_devshell() { > -=C2=A0=C2=A0=C2=A0 bb.build.exec_func('schroot_create_configs', d) > +=C2=A0=C2=A0=C2=A0 bb.build.exec_func('dpkg_schroot_create_configs', d) > =C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0 isar_export_proxies(d) > =C2=A0=C2=A0=C2=A0=C2=A0 isar_export_ccache(d) > @@ -297,11 +306,9 @@ python do_devshell() { > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 bb.build.exec_func('schr= oot_configure_ccache', d) > =C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0 schroot =3D d.getVar('SBUILD_CHROOT') > -=C2=A0=C2=A0=C2=A0 isar_apt =3D d.getVar('ISAR_APT_REPO') > =C2=A0=C2=A0=C2=A0=C2=A0 pkg_arch =3D d.getVar('PACKAGE_ARCH') > =C2=A0=C2=A0=C2=A0=C2=A0 build_arch =3D d.getVar('BUILD_ARCH') > =C2=A0=C2=A0=C2=A0=C2=A0 pp_pps =3D os.path.join(d.getVar('PP'), d.getVar= ('PPS')) > -=C2=A0=C2=A0=C2=A0 debdistroname =3D d.getVar('DEBDISTRONAME') > =C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0 install_deps =3D ":" if d.getVar('BB_CURRENTTASK= ') =3D=3D > "devshell_nodeps" else f"mk-build-deps -i \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --host-arch {pkg_arch} -= -build-arch {build_arch}=C2=A0 \ > @@ -310,15 +317,13 @@ python do_devshell() { > =C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0 termcmd =3D "schroot -d / -c {0} -u root -- sh -= c ' \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cd {1}; \ > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 echo {2} > /etc/apt/sources.l= ist.d/isar_apt.list; \ > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 echo \"Package: *\nPin: relea= se n=3D{3}\nPin-Priority: 1000\" > > /etc/apt/preferences.d/isar-apt; \ > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 echo \"APT::Get::allow-downgr= ades 1;\" > > /etc/apt/apt.conf.d/50isar-apt; \ > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 apt-get -y -q update; \ > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 {4}; \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 apt-get -y -q update -o > Dir::Etc::SourceList=3D\"sources.list.d/isar-apt.list\" -o > Dir::Etc::SourceParts=3D\"-\" -o APT::Get::List-Cleanup=3D\"0\"; \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 apt-get -y upgrade; \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 {2}; \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 export PATH=3D$PATH_PREP= END:$PATH; \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $SHELL -i \ > =C2=A0=C2=A0=C2=A0=C2=A0 '" > -=C2=A0=C2=A0=C2=A0 oe_terminal(termcmd.format(schroot, pp_pps, isar_apt, > debdistroname, install_deps), "Isar devshell", d) > +=C2=A0=C2=A0=C2=A0 oe_terminal(termcmd.format(schroot, pp_pps, install_d= eps), "Isar > devshell", d) > =C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0 bb.build.exec_func('schroot_delete_configs', d) > =C2=A0} > diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass > index c699a84d..d1666f78 100644 > --- a/meta/classes/dpkg.bbclass > +++ b/meta/classes/dpkg.bbclass > @@ -110,16 +110,17 @@ dpkg_runbuild() { > =C2=A0=C2=A0=C2=A0=C2=A0 DEB_SOURCE_NAME=3D$(dpkg-parsechangelog --show-f= ield Source --file > ${WORKDIR}/${PPS}/debian/changelog) > =C2=A0=C2=A0=C2=A0=C2=A0 DSC_FILE=3D$(find ${WORKDIR} -name "${DEB_SOURCE= _NAME}*.dsc" - > maxdepth 1 -print) > =C2=A0 > -=C2=A0=C2=A0=C2=A0 sbuild -A -n -c ${SBUILD_CHROOT} --extra- > repository=3D"${ISAR_APT_REPO}" \ > +=C2=A0=C2=A0=C2=A0 sbuild -A -n -c ${SBUILD_CHROOT} \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --host=3D${PACKAGE_ARCH}= --build=3D${BUILD_ARCH} ${profiles} \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --no-run-lintian --no-ru= n-piuparts --no-run-autopkgtest -- > resolve-alternatives \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --bd-uninstallable-expla= iner=3Dapt \ > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --no-apt-update \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --no-apt-update --apt-distupg= rade \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --chroot-setup-commands= =3D"echo \"Package: *\nPin: release > n=3D${DEBDISTRONAME}\nPin-Priority: 1000\" > > /etc/apt/preferences.d/isar-apt" \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --chroot-setup-commands= =3D"echo \"APT::Get::allow-downgrades > 1;\" > /etc/apt/apt.conf.d/50isar-apt" \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --chroot-setup-commands= =3D"rm -f /var/log/dpkg.log" \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --chroot-setup-commands= =3D"mkdir -p ${deb_dir}" \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --chroot-setup-commands= =3D"ln -sf ${ext_deb_dir}/*.deb -t > ${deb_dir}/" \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --chroot-setup-commands=3D"ap= t-get update -o > Dir::Etc::SourceList=3D\"sources.list.d/isar-apt.list\" -o > Dir::Etc::SourceParts=3D\"-\" -o APT::Get::List-Cleanup=3D\"0\"" \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --finished-build-command= s=3D"rm -f ${deb_dir}/sbuild-build- > depends-main-dummy_*.deb" \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --finished-build-command= s=3D"[ -z \"\$(find ${deb_dir} - > maxdepth 1 -name '*.deb' -print -quit)\" ] || cp ${CP_FLAGS} > ${deb_dir}/*.deb -t ${ext_deb_dir}/" \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --finished-build-command= s=3D"cp /var/log/dpkg.log > ${ext_root}/dpkg_partial.log" \ > diff --git a/meta/classes/image-tools-extension.bbclass > b/meta/classes/image-tools-extension.bbclass > index 58799fcf..46bdf78b 100644 > --- a/meta/classes/image-tools-extension.bbclass > +++ b/meta/classes/image-tools-extension.bbclass > @@ -44,19 +44,6 @@ imager_run() { > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 = distro=3D"${HOST_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi > =C2=A0 > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 # prepare isar-apt > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 schroot -r -c ${session_id} -= d / -u root -- sh -c " \ > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 mkdir= -p '/etc/apt/sources.list.d' > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 echo = 'deb [trusted=3Dyes] file:///isar- > apt=C2=A0${DEBDISTRONAME} main' > \ > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 '/etc/apt/sources.list.d/isar-apt.list' > - > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 mkdir= -p '/etc/apt/preferences.d' > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cat <= < EOF > '/etc/apt/preferences.d/isar-apt' > -Package: * > -Pin: release n=3D${DEBDISTRONAME} > -Pin-Priority: 1000 > -EOF" > - > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 E=3D"${@ isar_export_pro= xies(d)}" > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 deb_dl_dir_import ${schr= oot_dir} ${distro} > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 schroot -r -c ${session_= id} -d / -u root -- sh -c " \ > diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc > b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc > index 39ced80b..2f07de82 100644 > --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc > +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc > @@ -56,8 +56,6 @@ SBUILD_CHROOT_DIR =3D "${WORKDIR}/rootfs" > =C2=A0ROOTFSDIR =3D "${SBUILD_CHROOT_DIR}" > =C2=A0ROOTFS_PACKAGES =3D "${SBUILD_CHROOT_PREINSTALL}" > =C2=A0 > -# We don't need /etc/apt/sources.list.d/isar-apt.list' while it's > handled by sbuild > -ROOTFS_CONFIGURE_COMMAND:remove =3D "rootfs_configure_isar_apt" > =C2=A0ROOTFS_POSTPROCESS_COMMAND:remove =3D "rootfs_cleanup_isar_apt" > =C2=A0 > =C2=A0# Do not cleanup base-apt