Re: [gentoo-catalyst] [PATCH] Make the use of preserved_libs optional by setting the options variable.

["Rick \"Zero_Chaos\" Farina" <zerochaos@gentoo.org>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 03/30/2013 10:31 PM, Jorge Manuel B. S. Vicetto (jmbsvicetto) wrote:

Seems okay to me.

- -ZC

> From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@gentoo.org>
> 
> ---
>  catalyst                   | 3 +++
>  files/catalyst.conf        | 2 ++
>  targets/support/unmerge.sh | 3 ++-
>  3 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/catalyst b/catalyst
> index 9f8dd30..f885dd4 100755
> --- a/catalyst
> +++ b/catalyst
> @@ -147,6 +147,9 @@ def parse_config(myconfig):
>  	if "pkgcache" in string.split(conf_values["options"]):
>  		print "Package cache support enabled."
>  		conf_values["PKGCACHE"]="1"
> +	if "preserve_libs" in string.split(conf_values["options"]);
> +		print "Preserving libs during unmerge."
> +		conf_values["PRESERVE_LIBS"]="1"
>  
>  	if "purge" in string.split(conf_values["options"]):
>  		print "Purge support enabled."
> diff --git a/files/catalyst.conf b/files/catalyst.conf
> index f88f105..2983acc 100644
> --- a/files/catalyst.conf
> +++ b/files/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 907113e..0c0c037 100644
> --- 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
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJRWO8OAAoJEKXdFCfdEflKhvQQAIRa8ej8Om6cBR+5thPqiwAI
vIQeuhC7EYPmbVvXWRW2RE+NGChGQu3ynS4Rjifrx3guXPhEws+y8d3SdIX/9A1S
BZb8qFu9GZVsB6WjVhNX7/7PF8AJOK74i6Df7p+PyobO25/nXz/PkwqrfEdI7ZxG
DLOGG+ZoHwH+5LMqSyrWXQiCd4iK4e+kzqmPsX9YGqtZSsZKNqFQ9O/cfnuWKKll
sil1XS26YxTgtOXHlF3e+8rDJf3xIuuiuwZAhcwLn1hHjfl+im0tilzphiTGylhh
JQjzS30hO+i2Yg2vSKc7WJp26YfR3AL5VmjrnOfSuG7b+0ezXDx8p7qYlAqZ1W5n
qonansgVksbLu6oNlOcCIXsWWjlD325XqSIx3fc1W/dH3PMeOvTEgJgpX+UcORGp
8Q59Tcifz9uW5QJOnsGTxyfe76YrDR7U/uQzKYCAQSnIal+60WT2lXTRNRSFRo+U
gVJhTAsiBQvbvZ0vHC+CFFFjcWX6JAZOU6iTLFblgQzA9e7cYTIy37jCujhyn/+P
FEt9NlxPvToCximcvwsgkiCoV2R2eNsafZ8DhKk+4qVfmhrR5ntH5E0AB3m3xpam
GNd+GhG8N/eLCgh6jexN1EDiGG1T/o950YpKavj9AyjEPZSKQRzMnvmIVkajYCFK
SwmcVf14J9CkFs/4oQS8
=C2AX
-----END PGP SIGNATURE-----