[gentoo-commits] proj/catalyst:master commit in: doc/, examples/, targets/support/
commit: f82226cf8a9f09099557ef344dce60b7d4d6f663
Author: Matt Turner gentoo org>
AuthorDate: Tue Mar 31 03:25:48 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Mar 31 03:54:29 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f82226cf
catalyst: Remove references to spind
spind was deleted from livecd-tools in 2011.
See:
https://gitweb.gentoo.org/proj/livecd-tools.git/commit/?id=7d4d363bae7313e46de960a45888907059b0f2d6
Signed-off-by: Matt Turner gentoo.org>
doc/catalyst-spec.5.txt | 2 +-
examples/livecd-stage2_template.spec | 2 +-
examples/stage4_template.spec| 2 +-
targets/support/rc-update.sh | 7 ---
4 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index 4c0be357..ecea9ba7 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -319,7 +319,7 @@ the `stage4` and `livecd` targets.
This is for adding init scripts to runlevels. The syntax for the init
script is the script name, followed by a pipe, followed by the
runlevel in which you want the script to run. It looks like
-`spind|default` and is space delimited. We do not use this on the
+`acpid|default` and is space delimited. We do not use this on the
official media, as catalyst sets up the runlevels correctly for us.
This setting is supported by the `stage4` and `livecd` targets.
diff --git a/examples/livecd-stage2_template.spec
b/examples/livecd-stage2_template.spec
index fe9b36e7..0c45bd67 100644
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -188,7 +188,7 @@ livecd/modblacklist:
# This is for adding init scripts to runlevels. The syntax for the init script
# is the script name, followed by a pipe, followed by the runlevel in which you
-# want the script to run. It looks like spind|default and is space delimited.
+# want the script to run. It looks like acpid|default and is space delimited.
# We do not use this on the official media, as catalyst sets up the runlevels
# correctly for us. Since we do not use this, it is left blank below.
# This option will automatically create missing runlevels
diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec
index fe394f3e..f3531f90 100644
--- a/examples/stage4_template.spec
+++ b/examples/stage4_template.spec
@@ -148,7 +148,7 @@ stage4/modblacklist:
# This is for adding init scripts to runlevels. The syntax for the init script
# is the script name, followed by a pipe, followed by the runlevel in which you
-# want the script to run. It looks like spind|default and is space delimited.
+# want the script to run. It looks like acpid|default and is space delimited.
# We do not use this on the official media, as catalyst sets up the runlevels
# correctly for us. Since we do not use this, it is left blank below.
# example:
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
index 3941f2e0..6e739966 100755
--- a/targets/support/rc-update.sh
+++ b/targets/support/rc-update.sh
@@ -18,16 +18,9 @@ then
# Do some livecd_type specific rc-update changes
case ${clst_livecd_type} in
- gentoo-gamecd)
- rc-update add spind default
- ;;
gentoo-release-live*)
- rc-update add spind default
rc-update add xdm default
;;
- generic-livecd)
- rc-update add spind default
- ;;
esac
fi
[gentoo-commits] proj/catalyst:master commit in: doc/, examples/, targets/support/, targets/livecd-stage2/
commit: 189a1ce2cfb24efad8bc33c43a955c82547b4364
Author: Rick Farina (Zero_Chaos) gentoo org>
AuthorDate: Thu Apr 5 15:57:52 2018 +
Commit: Richard Farina gentoo org>
CommitDate: Thu Apr 5 15:57:52 2018 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=189a1ce2
make livecd depclean settings optional
allow livecd to keep build deps or just not run depclean at all
doc/catalyst-spec.5.txt | 9 +
examples/livecd-stage2_template.spec | 7 +++
targets/livecd-stage2/livecd-stage2-controller.sh | 2 +-
targets/support/depclean.sh | 6 +-
4 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index a1559faf..5e9cf87a 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -383,6 +383,15 @@ This is a list of any other files, not belonging to the
above
packages, that you would wish to have copied into your netboot image
(example: `/lib/libresolv.so.2 /lib/libnss_compat.so.2`).
+*livecd/depclean*::
+This feature controls the depclean run after fsscript and before unmerge.
+The default is unset, and will run emerge --depclean --with-bdeps=n which
results
+in the smallest possible livecd. For some use cases it may be nice to not run
depclean at all,
+or to keep build deps. For those cases, the following two special cases are
available:
+livecd/depclean: no
+livecd/depclean: keepbdeps
+This setting is only supported by the livecd target.
+
*/unmerge*::
This is a list of packages that will be unmerged after all the kernels
have been built (example: `autoconf automake libtool m4 bison`).
diff --git a/examples/livecd-stage2_template.spec
b/examples/livecd-stage2_template.spec
index a90b7aac..a19812ae 100644
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -336,6 +336,13 @@ boot/kernel/gentoo/console:
# Currently this feature will be enabled if livecd/verify is defined to *any*
value, leave commented to disable.
#livecd/verify: true
+# This feature controls the depclean run after fsscript and before unmerge.
+# The default is unset, and will run emerge --depclean --with-bdeps=n which
results
+# in the smallest possible livecd. For some use cases it may be nice to not
run depclean at all,
+# or to keep build deps. For those cases, the following two special cases are
available:
+# livecd/depclean: no
+# livecd/depclean: keepbdeps
+
# This is a list of packages that will be unmerged after all the kernels have
# been built. There are no checks on these packages, so be careful what you
# add here. They can potentially break your CD.
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh
b/targets/livecd-stage2/livecd-stage2-controller.sh
index 845d6d55..2f0af1f9 100755
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -187,7 +187,7 @@ case $1 in
;;
unmerge)
- exec_in_chroot ${clst_shdir}/support/depclean.sh
+ [ "${clst_depclean}" != "no" ] && exec_in_chroot
${clst_shdir}/support/depclean.sh
shift
export clst_packages="$*"
exec_in_chroot ${clst_shdir}/support/unmerge.sh
diff --git a/targets/support/depclean.sh b/targets/support/depclean.sh
index aa66c9fd..b3640958 100755
--- a/targets/support/depclean.sh
+++ b/targets/support/depclean.sh
@@ -4,6 +4,10 @@ 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
+if [ "${clst_depclean}" = "keepbdeps" ]; then
+ run_merge --depclean --with-bdeps=y
+else
+ run_merge --depclean --with-bdeps=n
+fi
exit 0
