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