| 1 |
-----BEGIN PGP SIGNED MESSAGE----- |
| 2 |
Hash: SHA1 |
| 3 |
|
| 4 |
On 03/30/2013 10:31 PM, Jorge Manuel B. S. Vicetto (jmbsvicetto) wrote: |
| 5 |
|
| 6 |
Seems okay to me. |
| 7 |
|
| 8 |
- -ZC |
| 9 |
|
| 10 |
> From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@g.o> |
| 11 |
> |
| 12 |
> --- |
| 13 |
> catalyst | 3 +++ |
| 14 |
> files/catalyst.conf | 2 ++ |
| 15 |
> targets/support/unmerge.sh | 3 ++- |
| 16 |
> 3 files changed, 7 insertions(+), 1 deletion(-) |
| 17 |
> |
| 18 |
> diff --git a/catalyst b/catalyst |
| 19 |
> index 9f8dd30..f885dd4 100755 |
| 20 |
> --- a/catalyst |
| 21 |
> +++ b/catalyst |
| 22 |
> @@ -147,6 +147,9 @@ def parse_config(myconfig): |
| 23 |
> if "pkgcache" in string.split(conf_values["options"]): |
| 24 |
> print "Package cache support enabled." |
| 25 |
> conf_values["PKGCACHE"]="1" |
| 26 |
> + if "preserve_libs" in string.split(conf_values["options"]); |
| 27 |
> + print "Preserving libs during unmerge." |
| 28 |
> + conf_values["PRESERVE_LIBS"]="1" |
| 29 |
> |
| 30 |
> if "purge" in string.split(conf_values["options"]): |
| 31 |
> print "Purge support enabled." |
| 32 |
> diff --git a/files/catalyst.conf b/files/catalyst.conf |
| 33 |
> index f88f105..2983acc 100644 |
| 34 |
> --- a/files/catalyst.conf |
| 35 |
> +++ b/files/catalyst.conf |
| 36 |
> @@ -59,6 +59,8 @@ hash_function="crc32" |
| 37 |
> # build stops in livecd-stage2) |
| 38 |
> # pkgcache = keeps a tbz2 of every built package (useful if your build stops |
| 39 |
> # prematurely) |
| 40 |
> +# preserve_libs = enables portage to preserve used libs when unmerging packages |
| 41 |
> +# (used on installcd-stage2 and stage4 targets) |
| 42 |
> # seedcache = use the build output of a previous target if it exists to speed up |
| 43 |
> # the copy |
| 44 |
> # snapcache = cache the snapshot so that it can be bind-mounted into the chroot. |
| 45 |
> diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh |
| 46 |
> index 907113e..0c0c037 100644 |
| 47 |
> --- a/targets/support/unmerge.sh |
| 48 |
> +++ b/targets/support/unmerge.sh |
| 49 |
> @@ -2,7 +2,8 @@ |
| 50 |
> |
| 51 |
> source /tmp/chroot-functions.sh |
| 52 |
> |
| 53 |
> -FEATURES="${clst_myfeatures} preserve-libs" |
| 54 |
> +# If the user enabled PRESERVE_LIBS in options, tell portage to preserve them. |
| 55 |
> +[ -n "${clst_PRESERVE_LIBS}" ] && FEATURES="${clst_myfeatures} preserve-libs" |
| 56 |
> run_merge -C ${clst_packages} |
| 57 |
> |
| 58 |
> exit 0 |
| 59 |
> |
| 60 |
|
| 61 |
-----BEGIN PGP SIGNATURE----- |
| 62 |
Version: GnuPG v2.0.19 (GNU/Linux) |
| 63 |
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ |
| 64 |
|
| 65 |
iQIcBAEBAgAGBQJRWO8OAAoJEKXdFCfdEflKhvQQAIRa8ej8Om6cBR+5thPqiwAI |
| 66 |
vIQeuhC7EYPmbVvXWRW2RE+NGChGQu3ynS4Rjifrx3guXPhEws+y8d3SdIX/9A1S |
| 67 |
BZb8qFu9GZVsB6WjVhNX7/7PF8AJOK74i6Df7p+PyobO25/nXz/PkwqrfEdI7ZxG |
| 68 |
DLOGG+ZoHwH+5LMqSyrWXQiCd4iK4e+kzqmPsX9YGqtZSsZKNqFQ9O/cfnuWKKll |
| 69 |
sil1XS26YxTgtOXHlF3e+8rDJf3xIuuiuwZAhcwLn1hHjfl+im0tilzphiTGylhh |
| 70 |
JQjzS30hO+i2Yg2vSKc7WJp26YfR3AL5VmjrnOfSuG7b+0ezXDx8p7qYlAqZ1W5n |
| 71 |
qonansgVksbLu6oNlOcCIXsWWjlD325XqSIx3fc1W/dH3PMeOvTEgJgpX+UcORGp |
| 72 |
8Q59Tcifz9uW5QJOnsGTxyfe76YrDR7U/uQzKYCAQSnIal+60WT2lXTRNRSFRo+U |
| 73 |
gVJhTAsiBQvbvZ0vHC+CFFFjcWX6JAZOU6iTLFblgQzA9e7cYTIy37jCujhyn/+P |
| 74 |
FEt9NlxPvToCximcvwsgkiCoV2R2eNsafZ8DhKk+4qVfmhrR5ntH5E0AB3m3xpam |
| 75 |
GNd+GhG8N/eLCgh6jexN1EDiGG1T/o950YpKavj9AyjEPZSKQRzMnvmIVkajYCFK |
| 76 |
SwmcVf14J9CkFs/4oQS8 |
| 77 |
=C2AX |
| 78 |
-----END PGP SIGNATURE----- |
Archives