From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8F1CA1382C5 for ; Sat, 16 May 2020 19:16:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6332E0AA6; Sat, 16 May 2020 19:16:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 99B0FE0AA6 for ; Sat, 16 May 2020 19:16:15 +0000 (UTC) Date: Sat, 16 May 2020 12:16:12 -0700 From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] [PATCH 8/9] catalyst: Remove remnants of options="preserve_libs" Message-ID: <20200516121612.2307344e@storm> In-Reply-To: <20200516065317.2678080-8-mattst88@gentoo.org> References: <20200516065317.2678080-1-mattst88@gentoo.org> <20200516065317.2678080-8-mattst88@gentoo.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Archives-Salt: b1e02c59-1766-476d-b4c4-475f0f7c722a X-Archives-Hash: 8a19b2ccdf05f281e2a0294db695388d On Fri, 15 May 2020 23:53:16 -0700 Matt Turner wrote: > This option has been broken since commit e3114e65ffda (Some options > cleanup, unifying their use, reducing redundancy.) in 2013 which was > first in catalyst 3.0.0. > > I think the feature was a kludge, and that if or when we find the need > for something similar that we instead just run emerge > @preserved-rebuild instead. > > Signed-off-by: Matt Turner > --- Yeah, time for this one to go > etc/catalyst.conf | 2 -- > targets/support/depclean.sh | 2 -- > targets/support/unmerge.sh | 2 -- > 3 files changed, 6 deletions(-) > > diff --git a/etc/catalyst.conf b/etc/catalyst.conf > index 5aa2b3fb..f64fe971 100644 > --- a/etc/catalyst.conf > +++ b/etc/catalyst.conf > @@ -38,8 +38,6 @@ envscript="/etc/catalyst/catalystrc" > # build stops in livecd-stage2) > # pkgcache = keeps a tbz2 of every built package (useful if your > build stops # prematurely) > -# preserve_libs = enables portage to preserve used libs when > unmerging packages -# (used on installcd-stage2 and stage4 > targets) # seedcache = use the build output of a previous target if > it exists to speed up # the copy > # sticky-config = enables the code that will keep any internal > 'catalyst_use' flags diff --git a/targets/support/depclean.sh > b/targets/support/depclean.sh index 56f9a669..f99134e0 100755 > --- a/targets/support/depclean.sh > +++ b/targets/support/depclean.sh > @@ -2,8 +2,6 @@ > > source /tmp/chroot-functions.sh > > -# If the user enabled PRESERVE_LIBS in options, tell portage to > preserve them. -[ -n "${clst_PRESERVE_LIBS}" ] && > FEATURES="${clst_myfeatures} preserve-libs" if [ > "${clst_livecd_depclean}" = "keepbdeps" ]; then run_merge --depclean > --with-bdeps=y else > diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh > index 0c0c0374..9f112735 100755 > --- a/targets/support/unmerge.sh > +++ b/targets/support/unmerge.sh > @@ -2,8 +2,6 @@ > > source /tmp/chroot-functions.sh > > -# If the user enabled PRESERVE_LIBS in options, tell portage to > preserve them. -[ -n "${clst_PRESERVE_LIBS}" ] && > FEATURES="${clst_myfeatures} preserve-libs" run_merge -C > ${clst_packages} > exit 0