From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6881298752062095360 Date: Tue, 3 Nov 2020 23:44:12 -0800 (PST) From: "vijaikumar....@gmail.com" To: isar-users Message-Id: <7c02c403-1afc-48f9-b948-10094afdb663n@googlegroups.com> In-Reply-To: <76603767-1d25-c347-f7b1-84d4c106e771@siemens.com> References: <76603767-1d25-c347-f7b1-84d4c106e771@siemens.com> Subject: Re: [PATCH] dpkg: Add control over removal of built packages MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_76_664545732.1604475852432" X-TUID: SCOk+PyBMP3T ------=_Part_76_664545732.1604475852432 Content-Type: multipart/alternative; boundary="----=_Part_77_1124145778.1604475852432" ------=_Part_77_1124145778.1604475852432 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Tested in a downstream project. Works fine. Tested-by: Vijai Kumar K On Thursday, October 8, 2020 at 10:43:37 PM UTC+5:30 Jan Kiszka wrote: > From: Jan Kiszka > > In almost all cases, the packages built by a recipe wasn't used yet and > will only be requested down the dependency chain. Then it is fine to > purge it from the buildchroots during partial rebuilds. > > There are corner cases, though, when the packages will never be used in > the buildchroots, only in the target filesystem. That can affect core > packages rebuilt for the target but also used in their upstream variant > in the buildchroots. While buildchroot installation can be controlled > via preferences, purging can't this way. Add a variable that allows to > control it without having to overwrite deb_clean. > > Signed-off-by: Jan Kiszka > --- > meta/classes/dpkg-base.bbclass | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/meta/classes/dpkg-base.bbclass > b/meta/classes/dpkg-base.bbclass > index 7e12ab0a..01c6eb65 100644 > --- a/meta/classes/dpkg-base.bbclass > +++ b/meta/classes/dpkg-base.bbclass > @@ -154,6 +154,8 @@ python do_dpkg_build() { > > addtask dpkg_build before do_build > > +KEEP_INSTALLED_ON_CLEAN ?= "0" > + > CLEANFUNCS += "deb_clean" > > deb_clean() { > @@ -162,6 +164,9 @@ deb_clean() { > for d in ${DEBS}; do > repo_del_package "${REPO_ISAR_DIR}"/"${DISTRO}" \ > "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" "${d}" > + if [ "${KEEP_INSTALLED_ON_CLEAN}" = "1" ]; then > + continue; > + fi > package=$(basename "${d}") > package_remove="/usr/bin/apt-get remove -y ${package%%_*}" > sudo -E chroot ${BUILDCHROOT_DIR} ${package_remove} || true > -- > 2.26.2 > ------=_Part_77_1124145778.1604475852432 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 7bit Tested in a downstream project. Works fine.

Tested-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>

On Thursday, October 8, 2020 at 10:43:37 PM UTC+5:30 Jan Kiszka wrote:
From: Jan Kiszka <jan.k...@siemens.com>

In almost all cases, the packages built by a recipe wasn't used yet and
will only be requested down the dependency chain. Then it is fine to
purge it from the buildchroots during partial rebuilds.

There are corner cases, though, when the packages will never be used in
the buildchroots, only in the target filesystem. That can affect core
packages rebuilt for the target but also used in their upstream variant
in the buildchroots. While buildchroot installation can be controlled
via preferences, purging can't this way. Add a variable that allows to
control it without having to overwrite deb_clean.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---
meta/classes/dpkg-base.bbclass | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 7e12ab0a..01c6eb65 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -154,6 +154,8 @@ python do_dpkg_build() {

addtask dpkg_build before do_build

+KEEP_INSTALLED_ON_CLEAN ?= "0"
+
CLEANFUNCS += "deb_clean"

deb_clean() {
@@ -162,6 +164,9 @@ deb_clean() {
for d in ${DEBS}; do
repo_del_package "${REPO_ISAR_DIR}"/"${DISTRO}" \
"${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" "${d}"
+ if [ "${KEEP_INSTALLED_ON_CLEAN}" = "1" ]; then
+ continue;
+ fi
package=$(basename "${d}")
package_remove="/usr/bin/apt-get remove -y ${package%%_*}"
sudo -E chroot ${BUILDCHROOT_DIR} ${package_remove} || true
--
2.26.2
------=_Part_77_1124145778.1604475852432-- ------=_Part_76_664545732.1604475852432--