Make the use of preserved_libs optional by setting the options variable.

Ported from commits:
 462348d88b3a5fa783f322c64131025581ecc220
 f6ad384914a00099eea2a0f66232728c479ec628
 in the master branch.
AUTHOR: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> (Sun 14 Apr 2013 08:22:34 PM PDT)

diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 15244ed9e19996ded641e27d340a9b6aa12dfd71..d327a1b52d822059e56fa2aaae2b278fbd5e3a69 100644 (file)
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -107,5 +107,6 @@ option_messages = {
        "purge": "Purge support enabled.",
        "seedcache": "Seed cache support enabled.",
        "snapcache": "Snapshot cache support enabled.",
+       'preserve_libs': "Preserving libs during unmerge.",
        #"tarball": "Tarball creation enabled.",
        }

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index a6ca66d0e16cb4dbedab3f3aa4b597d439cebdca..a65413cdbdc4a87fd203c4027c83dd81e7ab232e 100644 (file)
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -59,6 +59,8 @@ hash_function="crc32"
 #      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
 # snapcache = cache the snapshot so that it can be bind-mounted into the chroot.

diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
index 907113e3b12b0ad2f13e0752b13ed50158f413eb..0c0c03743cc0be30d917a04fbeb5aa0b15bbf75e 100755 (executable)
--- a/targets/support/unmerge.sh
+++ b/targets/support/unmerge.sh
@@ -2,7 +2,8 @@
 
 source /tmp/chroot-functions.sh
 
-FEATURES="${clst_myfeatures} preserve-libs"
+# 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