From: Matt Turner <mattst88@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Cc: Matt Turner <mattst88@gentoo.org>
Subject: [gentoo-catalyst] [PATCH 8/9] catalyst: Remove remnants of options="preserve_libs"
Date: Fri, 15 May 2020 23:53:16 -0700 [thread overview]
Message-ID: <20200516065317.2678080-8-mattst88@gentoo.org> (raw)
In-Reply-To: <20200516065317.2678080-1-mattst88@gentoo.org>
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 <mattst88@gentoo.org>
---
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
--
2.26.2
next prev parent reply other threads:[~2020-05-16 6:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-16 6:53 [gentoo-catalyst] [PATCH 1/9] targets: Remove clst_my* prefix Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 2/9] targets: Make features variable local Matt Turner
2020-05-16 19:10 ` Brian Dolbec
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 3/9] targets: Use arrays rather than string concatenation Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 4/9] targets: Drop duplicate FEATURES=-news Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 5/9] targets: Don't unnecessarily override emerge_opts Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 6/9] targets: Remove || exit 1 from run_merge invocations Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 7/9] targets: Decouple distfile fetching from binary packages Matt Turner
2020-05-16 6:53 ` Matt Turner [this message]
2020-05-16 19:16 ` [gentoo-catalyst] [PATCH 8/9] catalyst: Remove remnants of options="preserve_libs" Brian Dolbec
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 9/9] catalyst: Remove fbsplash support Matt Turner
2020-05-16 19:20 ` Brian Dolbec
2020-05-16 19:01 ` [gentoo-catalyst] [PATCH 1/9] targets: Remove clst_my* prefix Brian Dolbec
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200516065317.2678080-8-mattst88@gentoo.org \
--to=mattst88@gentoo.org \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox