[gentoo-commits] proj/catalyst:unversioned-cachedir commit in: targets/support/, targets/livecd-stage2/

[Robin H. Johnson]

commit:     4295fce1791067d7589b8f7f12cb5270bb86bcca
Author:     Ben Kohler <bkohler <AT> gmail <DOT> com>
AuthorDate: Wed Sep 20 13:13:59 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 17:31:44 2017 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4295fce1

introduce depclean.sh and add it to livecd-stage2 (first test)

 targets/livecd-stage2/livecd-stage2-controller.sh | 11 ++++++-----
 targets/support/depclean.sh                       |  9 +++++++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh 
b/targets/livecd-stage2/livecd-stage2-controller.sh
index 10ee98e6..845d6d55 100755
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -186,11 +186,12 @@ case $1 in
                ${clst_shdir}/support/bootloader-setup.sh $1
                ;;
 
-    unmerge)
-        shift
-        export clst_packages="$*"
-        exec_in_chroot ${clst_shdir}/support/unmerge.sh
-    ;;
+       unmerge)
+               exec_in_chroot ${clst_shdir}/support/depclean.sh
+               shift
+               export clst_packages="$*"
+               exec_in_chroot ${clst_shdir}/support/unmerge.sh
+       ;;
 
        target_image_setup)
                shift

diff --git a/targets/support/depclean.sh b/targets/support/depclean.sh
new file mode 100755
index 00000000..aa66c9fd
--- /dev/null
+++ b/targets/support/depclean.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+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 --depclean --with-bdeps=n
+
+exit 0