| 1 |
This option has been broken since commit e3114e65ffda (Some options |
| 2 |
cleanup, unifying their use, reducing redundancy.) in 2013 which was |
| 3 |
first in catalyst 3.0.0. |
| 4 |
|
| 5 |
I think the feature was a kludge, and that if or when we find the need |
| 6 |
for something similar that we instead just run emerge @preserved-rebuild |
| 7 |
instead. |
| 8 |
|
| 9 |
Signed-off-by: Matt Turner <mattst88@g.o> |
| 10 |
--- |
| 11 |
etc/catalyst.conf | 2 -- |
| 12 |
targets/support/depclean.sh | 2 -- |
| 13 |
targets/support/unmerge.sh | 2 -- |
| 14 |
3 files changed, 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/etc/catalyst.conf b/etc/catalyst.conf |
| 17 |
index 5aa2b3fb..f64fe971 100644 |
| 18 |
--- a/etc/catalyst.conf |
| 19 |
+++ b/etc/catalyst.conf |
| 20 |
@@ -38,8 +38,6 @@ envscript="/etc/catalyst/catalystrc" |
| 21 |
# build stops in livecd-stage2) |
| 22 |
# pkgcache = keeps a tbz2 of every built package (useful if your build stops |
| 23 |
# prematurely) |
| 24 |
-# preserve_libs = enables portage to preserve used libs when unmerging packages |
| 25 |
-# (used on installcd-stage2 and stage4 targets) |
| 26 |
# seedcache = use the build output of a previous target if it exists to speed up |
| 27 |
# the copy |
| 28 |
# sticky-config = enables the code that will keep any internal 'catalyst_use' flags |
| 29 |
diff --git a/targets/support/depclean.sh b/targets/support/depclean.sh |
| 30 |
index 56f9a669..f99134e0 100755 |
| 31 |
--- a/targets/support/depclean.sh |
| 32 |
+++ b/targets/support/depclean.sh |
| 33 |
@@ -2,8 +2,6 @@ |
| 34 |
|
| 35 |
source /tmp/chroot-functions.sh |
| 36 |
|
| 37 |
-# If the user enabled PRESERVE_LIBS in options, tell portage to preserve them. |
| 38 |
-[ -n "${clst_PRESERVE_LIBS}" ] && FEATURES="${clst_myfeatures} preserve-libs" |
| 39 |
if [ "${clst_livecd_depclean}" = "keepbdeps" ]; then |
| 40 |
run_merge --depclean --with-bdeps=y |
| 41 |
else |
| 42 |
diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh |
| 43 |
index 0c0c0374..9f112735 100755 |
| 44 |
--- a/targets/support/unmerge.sh |
| 45 |
+++ b/targets/support/unmerge.sh |
| 46 |
@@ -2,8 +2,6 @@ |
| 47 |
|
| 48 |
source /tmp/chroot-functions.sh |
| 49 |
|
| 50 |
-# If the user enabled PRESERVE_LIBS in options, tell portage to preserve them. |
| 51 |
-[ -n "${clst_PRESERVE_LIBS}" ] && FEATURES="${clst_myfeatures} preserve-libs" |
| 52 |
run_merge -C ${clst_packages} |
| 53 |
|
| 54 |
exit 0 |
| 55 |
-- |
| 56 |
2.26.2 |
Archives