* [gentoo-catalyst] [PATCH 2/9] targets: Make features variable local
2020-05-16 6:53 [gentoo-catalyst] [PATCH 1/9] targets: Remove clst_my* prefix Matt Turner
@ 2020-05-16 6:53 ` Matt Turner
2020-05-16 19:10 ` Brian Dolbec
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 3/9] targets: Use arrays rather than string concatenation Matt Turner
` (7 subsequent siblings)
8 siblings, 1 reply; 13+ messages in thread
From: Matt Turner @ 2020-05-16 6:53 UTC (permalink / raw
To: gentoo-catalyst; +Cc: Matt Turner
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
targets/stage1/chroot.sh | 2 +-
targets/stage2/chroot.sh | 2 +-
targets/support/chroot-functions.sh | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index a42afd19..58ed2b1d 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -9,7 +9,7 @@ export clst_buildpkgs="$(/tmp/build.py)"
[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
-FEATURES="${features} nodoc noman noinfo -news"
+FEATURES="${FEATURES} nodoc noman noinfo -news"
## Sanity check profile
if [ -z "${clst_buildpkgs}" ]
diff --git a/targets/stage2/chroot.sh b/targets/stage2/chroot.sh
index e472fe16..0cbaeb1d 100755
--- a/targets/stage2/chroot.sh
+++ b/targets/stage2/chroot.sh
@@ -3,7 +3,7 @@
source /tmp/chroot-functions.sh
# Setup the environment
-export FEATURES="${features} nodoc noman noinfo -news"
+export FEATURES="${FEATURES} nodoc noman noinfo -news"
export CONFIG_PROTECT="-* /etc/locale.gen"
echo "$locales" > /etc/locale.gen
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 2eb90117..a4074d91 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -78,17 +78,17 @@ get_libdir() {
setup_features() {
setup_emerge_opts
- export features="-news binpkg-multi-instance clean-logs parallel-install"
+ local features="-news binpkg-multi-instance clean-logs parallel-install"
export FEATURES="${features}"
if [ -n "${clst_CCACHE}" ]
then
- export features="${features} ccache"
+ features="${features} ccache"
clst_root_path=/ run_merge --oneshot --noreplace dev-util/ccache || exit 1
fi
if [ -n "${clst_DISTCC}" ]
then
- export features="${features} distcc"
+ features="${features} distcc"
export DISTCC_HOSTS="${clst_distcc_hosts}"
[ -e ${clst_make_conf} ] && \
echo 'USE="${USE} -avahi -gtk -gnome"' >> ${clst_make_conf}
--
2.26.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [gentoo-catalyst] [PATCH 2/9] targets: Make features variable local
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 2/9] targets: Make features variable local Matt Turner
@ 2020-05-16 19:10 ` Brian Dolbec
0 siblings, 0 replies; 13+ messages in thread
From: Brian Dolbec @ 2020-05-16 19:10 UTC (permalink / raw
To: gentoo-catalyst
On Fri, 15 May 2020 23:53:10 -0700
Matt Turner <mattst88@gentoo.org> wrote:
> Signed-off-by: Matt Turner <mattst88@gentoo.org>
> ---
The diff wasn't clear on this one... needed to look at the code a bit..
yes, is good
> targets/stage1/chroot.sh | 2 +-
> targets/stage2/chroot.sh | 2 +-
> targets/support/chroot-functions.sh | 6 +++---
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
> index a42afd19..58ed2b1d 100755
> --- a/targets/stage1/chroot.sh
> +++ b/targets/stage1/chroot.sh
> @@ -9,7 +9,7 @@ export clst_buildpkgs="$(/tmp/build.py)"
> [ -n "${clst_BINDIST}" ] && BINDIST="bindist"
> BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
>
> -FEATURES="${features} nodoc noman noinfo -news"
> +FEATURES="${FEATURES} nodoc noman noinfo -news"
>
> ## Sanity check profile
> if [ -z "${clst_buildpkgs}" ]
> diff --git a/targets/stage2/chroot.sh b/targets/stage2/chroot.sh
> index e472fe16..0cbaeb1d 100755
> --- a/targets/stage2/chroot.sh
> +++ b/targets/stage2/chroot.sh
> @@ -3,7 +3,7 @@
> source /tmp/chroot-functions.sh
>
> # Setup the environment
> -export FEATURES="${features} nodoc noman noinfo -news"
> +export FEATURES="${FEATURES} nodoc noman noinfo -news"
> export CONFIG_PROTECT="-* /etc/locale.gen"
>
> echo "$locales" > /etc/locale.gen
> diff --git a/targets/support/chroot-functions.sh
> b/targets/support/chroot-functions.sh index 2eb90117..a4074d91 100755
> --- a/targets/support/chroot-functions.sh
> +++ b/targets/support/chroot-functions.sh
> @@ -78,17 +78,17 @@ get_libdir() {
>
> setup_features() {
> setup_emerge_opts
> - export features="-news binpkg-multi-instance clean-logs
> parallel-install"
> + local features="-news binpkg-multi-instance clean-logs
> parallel-install" export FEATURES="${features}"
> if [ -n "${clst_CCACHE}" ]
> then
> - export features="${features} ccache"
> + features="${features} ccache"
> clst_root_path=/ run_merge --oneshot --noreplace
> dev-util/ccache || exit 1 fi
>
> if [ -n "${clst_DISTCC}" ]
> then
> - export features="${features} distcc"
> + features="${features} distcc"
> export DISTCC_HOSTS="${clst_distcc_hosts}"
> [ -e ${clst_make_conf} ] && \
> echo 'USE="${USE} -avahi -gtk -gnome"' >>
> ${clst_make_conf}
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-catalyst] [PATCH 3/9] targets: Use arrays rather than string concatenation
2020-05-16 6:53 [gentoo-catalyst] [PATCH 1/9] targets: Remove clst_my* prefix Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 2/9] targets: Make features variable local Matt Turner
@ 2020-05-16 6:53 ` Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 4/9] targets: Drop duplicate FEATURES=-news Matt Turner
` (6 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Matt Turner @ 2020-05-16 6:53 UTC (permalink / raw
To: gentoo-catalyst; +Cc: Matt Turner
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
targets/stage2/chroot.sh | 2 +-
targets/support/bootloader-setup.sh | 38 ++++++++++++++-------------
targets/support/chroot-functions.sh | 40 +++++++++++++++++------------
targets/support/kmerge.sh | 14 +++++-----
4 files changed, 51 insertions(+), 43 deletions(-)
diff --git a/targets/stage2/chroot.sh b/targets/stage2/chroot.sh
index 0cbaeb1d..4f1019f2 100755
--- a/targets/stage2/chroot.sh
+++ b/targets/stage2/chroot.sh
@@ -9,7 +9,7 @@ export CONFIG_PROTECT="-* /etc/locale.gen"
echo "$locales" > /etc/locale.gen
## START BUILD
-${clst_repo_basedir}/${clst_repo_name}/scripts/bootstrap.sh ${bootstrap_opts} || exit 1
+${clst_repo_basedir}/${clst_repo_name}/scripts/bootstrap.sh ${bootstrap_opts[@]} || exit 1
# Replace modified /etc/locale.gen with default
etc-update --automode -5
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index d3a6b2dc..e3d8037c 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -20,27 +20,29 @@ fi
extract_kernels $1/boot
+cmdline_opts=()
+
# Add any additional options
if [ -n "${clst_livecd_bootargs}" ]
then
for x in ${clst_livecd_bootargs}
do
- cmdline_opts="${cmdline_opts} ${x}"
+ cmdline_opts+=(${x})
done
fi
case ${clst_fstype} in
squashfs)
- cmdline_opts="${cmdline_opts} looptype=squashfs loop=/image.squashfs"
+ cmdline_opts+=(looptype=squashfs loop=/image.squashfs)
;;
jffs2)
- cmdline_opts="${cmdline_opts} looptype=jffs2 loop=/image.jffs2"
+ cmdline_opts+=(looptype=jffs2 loop=/image.jffs2)
;;
esac
-default_append_line="root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot"
-[ -n "${clst_splash_theme}" ] && default_append_line="${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet"
+default_append_line=(root=/dev/ram0 init=/linuxrc ${cmdline_opts[@]} ${custom_kopts} cdroot)
+[ -n "${clst_splash_theme}" ] && default_append_line+=(splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet)
case ${clst_hostarch} in
alpha)
@@ -52,16 +54,16 @@ case ${clst_hostarch} in
do
echo -n "${bctr}:/boot/${x} " >> ${acfg}
echo -n "initrd=/boot/${x}.igz root=/dev/ram0 " >> ${acfg}
- echo "init=/linuxrc ${cmdline_opts} cdroot" >> ${acfg}
+ echo "init=/linuxrc ${cmdline_opts[@]} cdroot" >> ${acfg}
((bctr=${bctr}+1))
done
# Pass 2 is for serial
- cmdline_opts="${cmdline_opts} console=ttyS0"
+ cmdline_opts+=(console=ttyS0)
for x in ${clst_boot_kernel}
do
echo -n "${bctr}:/boot/${x} " >> ${acfg}
echo -n "initrd=/boot/${x}.igz root=/dev/ram0 " >> ${acfg}
- echo "init=/linuxrc ${cmdline_opts} cdroot" >> ${acfg}
+ echo "init=/linuxrc ${cmdline_opts[@]} cdroot" >> ${acfg}
((bctr=${bctr}+1))
done
;;
@@ -81,14 +83,14 @@ case ${clst_hostarch} in
for x in ${clst_boot_kernel}
do
- eval kopts=\$clst_boot_kernel_${x}_kernelopts
- my_kopts="${my_kopts} ${kopts}"
+ eval kopt=\$clst_boot_kernel_${x}_kernelopts
+ kopts+=(${kopt})
done
# copy the bootloader for the final image
cp /usr/share/palo/iplboot $1/boot/
- echo "--commandline=0/${boot_kernel_common_name} initrd=${first}.igz ${default_append_line} ${my_kopts}" >> ${icfg}
+ echo "--commandline=0/${boot_kernel_common_name} initrd=${first}.igz ${default_append_line[@]} ${kopts[@]}" >> ${icfg}
echo "--bootloader=boot/iplboot" >> ${icfg}
echo "--ramdisk=boot/${first}.igz" >> ${icfg}
for x in ${clst_boot_kernel}
@@ -134,25 +136,25 @@ case ${clst_hostarch} in
do
echo "label ${x}-${y}" >> ${icfg}
echo " kernel /boot/${x}" >> ${icfg}
- echo " append ${default_append_line} softlevel=${y} initrd=/boot/${x}.igz vga=791" >> ${icfg}
+ echo " append ${default_append_line[@]} softlevel=${y} initrd=/boot/${x}.igz vga=791" >> ${icfg}
echo >> ${icfg}
echo " ${x}" >> ${kmsg}
echo "label ${x}-${y}-nofb" >> ${icfg}
echo " kernel /boot/${x}" >> ${icfg}
- echo " append ${default_append_line} softlevel=${y} initrd=/boot/${x}.igz" >> ${icfg}
+ echo " append ${default_append_line[@]} softlevel=${y} initrd=/boot/${x}.igz" >> ${icfg}
echo >> ${icfg}
echo " ${x}-nofb" >> ${kmsg}
done
else
echo "label ${x}" >> ${icfg}
echo " kernel /boot/${x}" >> ${icfg}
- echo " append ${default_append_line} initrd=/boot/${x}.igz vga=791" >> ${icfg}
+ echo " append ${default_append_line[@]} initrd=/boot/${x}.igz vga=791" >> ${icfg}
echo >> ${icfg}
echo " ${x}" >> ${kmsg}
echo "label ${x}-nofb" >> ${icfg}
echo " kernel /boot/${x}" >> ${icfg}
- echo " append ${default_append_line} initrd=/boot/${x}.igz" >> ${icfg}
+ echo " append ${default_append_line[@]} initrd=/boot/${x}.igz" >> ${icfg}
echo >> ${icfg}
echo " ${x}-nofb" >> ${kmsg}
fi
@@ -186,12 +188,12 @@ case ${clst_hostarch} in
eval custom_kopts=\$${x}_kernelopts
echo "menuentry 'Boot LiveCD (kernel: ${x})' --class gnu-linux --class os {" >> ${iacfg}
- echo " linux ${kern_subdir}/${x} ${default_append_line}" >> ${iacfg}
+ echo " linux ${kern_subdir}/${x} ${default_append_line[@]}" >> ${iacfg}
echo " initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
echo "}" >> ${iacfg}
echo "" >> ${iacfg}
echo "menuentry 'Boot LiveCD (kernel: ${x}) (cached)' --class gnu-linux --class os {" >> ${iacfg}
- echo " linux ${kern_subdir}/${x} ${default_append_line} docache" >> ${iacfg}
+ echo " linux ${kern_subdir}/${x} ${default_append_line[@]} docache" >> ${iacfg}
echo " initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
echo "}" >> ${iacfg}
if [ -n "${clst_kernel_console}" ]
@@ -200,7 +202,7 @@ case ${clst_hostarch} in
for y in ${clst_kernel_console}
do
echo "menuentry 'Boot LiveCD (kernel: ${x} console=${y})' --class gnu-linux --class os {" >> ${iacfg}
- echo " linux ${kern_subdir}/${x} ${default_append_line} console=${y}" >> ${iacfg}
+ echo " linux ${kern_subdir}/${x} ${default_append_line[@]} console=${y}" >> ${iacfg}
echo " initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
echo "}" >> ${iacfg}
echo "" >> ${iacfg}
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index a4074d91..b7969607 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -78,17 +78,17 @@ get_libdir() {
setup_features() {
setup_emerge_opts
- local features="-news binpkg-multi-instance clean-logs parallel-install"
- export FEATURES="${features}"
+ local features=(-news binpkg-multi-instance clean-logs parallel-install)
+ export FEATURES="${features[@]}"
if [ -n "${clst_CCACHE}" ]
then
- features="${features} ccache"
+ features+=(ccache)
clst_root_path=/ run_merge --oneshot --noreplace dev-util/ccache || exit 1
fi
if [ -n "${clst_DISTCC}" ]
then
- features="${features} distcc"
+ features+=(distcc)
export DISTCC_HOSTS="${clst_distcc_hosts}"
[ -e ${clst_make_conf} ] && \
echo 'USE="${USE} -avahi -gtk -gnome"' >> ${clst_make_conf}
@@ -133,28 +133,34 @@ setup_features() {
export PATH="/usr/lib/icecc/bin:${PATH}"
export PREROOTPATH="/usr/lib/icecc/bin"
fi
- export FEATURES="${features}"
+ export FEATURES="${features[@]}"
}
setup_emerge_opts() {
+ emerge_opts=()
+ bootstrap_opts=()
+
if [[ "${clst_VERBOSE}" == "true" ]]
then
- emerge_opts="--verbose"
- bootstrap_opts="${bootstrap_opts} -v"
+ emerge_opts+=(--verbose)
+ bootstrap_opts+=(-v)
else
- emerge_opts="--quiet"
- bootstrap_opts="${bootstrap_opts} -q"
+ emerge_opts+=(--quiet)
+ bootstrap_opts+=(-q)
fi
if [ -n "${clst_FETCH}" ]
then
- export bootstrap_opts="${bootstrap_opts} -f"
- export emerge_opts="${emerge_opts} -f"
+ emerge_opts+=(--fetchonly)
+ bootstrap_opts+=(-f)
# if we have PKGCACHE, and either update_seed is empty or 'no', make and use binpkgs
elif [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o "${clst_update_seed}" = "no" ]
then
- export emerge_opts="${emerge_opts} --usepkg --buildpkg --binpkg-respect-use=y --newuse"
- export bootstrap_opts="${bootstrap_opts} -r"
+ emerge_opts+=(--usepkg --buildpkg --binpkg-respect-use=y --newuse)
+ bootstrap_opts+=(-r)
fi
+
+ export emerge_opts
+ export bootstrap_opts
}
setup_binutils(){
@@ -274,13 +280,13 @@ run_merge() {
if [[ "${clst_VERBOSE}" == "true" ]]
then
- echo "ROOT=${ROOT} emerge ${emerge_opts} -pt $@" || exit 1
- emerge ${emerge_opts} -pt $@ || exit 3
+ echo "ROOT=${ROOT} emerge ${emerge_opts[@]} -pt $@" || exit 1
+ emerge ${emerge_opts[@]} -pt $@ || exit 3
fi
- echo "emerge ${emerge_opts} $@" || exit 1
+ echo "emerge ${emerge_opts[@]} $@" || exit 1
- emerge ${emerge_opts} $@ || exit 1
+ emerge ${emerge_opts[@]} $@ || exit 1
}
show_debug() {
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 8a15fc04..23489d8e 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -104,22 +104,22 @@ genkernel_compile(){
# callback is put here to avoid escaping issues
if [[ "${clst_VERBOSE}" == "true" ]]
then
- gk_callback_opts="-vN"
+ gk_callback_opts=(-vN)
else
- gk_callback_opts="-qN"
+ gk_callback_opts=(-qN)
fi
PKGDIR=${PKGDIR}
if [ -n "${clst_KERNCACHE}" ]
then
- gk_callback_opts="${gk_callback_opts} -kb"
+ gk_callback_opts+=(-kb)
fi
if [ -n "${clst_FETCH}" ]
then
- gk_callback_opts="${gk_callback_opts} -f"
+ gk_callback_opts+=(-f)
fi
if [ "${clst_kernel_merge}" != "" ]
then
- genkernel --callback="emerge ${gk_callback_opts} ${clst_kernel_merge}" \
+ genkernel --callback="emerge ${gk_callback_opts[@]} ${clst_kernel_merge}" \
"${GK_ARGS[@]}" || exit 1
else
genkernel "${GK_ARGS[@]}" || exit 1
@@ -212,7 +212,7 @@ then
# install dependencies of kernel sources ahead of time in case
# package.provided generated below causes them not to be (re)installed
- PKGDIR=${PKGDIR} emerge_opts="--quiet --usepkg --buildpkg --binpkg-respect-use=y --update --newuse --onlydeps" run_merge "${clst_ksource}" || exit 1
+ PKGDIR=${PKGDIR} emerge_opts=(--quiet --usepkg --buildpkg --binpkg-respect-use=y --update --newuse --onlydeps) run_merge "${clst_ksource}" || exit 1
# Create the kerncache directory if it doesn't exists
mkdir -p /tmp/kerncache/${clst_kname}
@@ -236,7 +236,7 @@ then
[ -L /usr/src/linux ] && rm -f /usr/src/linux
- PKGDIR=${PKGDIR} emerge_opts="--quiet --update --newuse" run_merge "${clst_ksource}" || exit 1
+ PKGDIR=${PKGDIR} emerge_opts=(--quiet --update --newuse) run_merge "${clst_ksource}" || exit 1
SOURCESDIR="/tmp/kerncache/${clst_kname}/sources"
if [ -L /usr/src/linux ]
--
2.26.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-catalyst] [PATCH 4/9] targets: Drop duplicate FEATURES=-news
2020-05-16 6:53 [gentoo-catalyst] [PATCH 1/9] targets: Remove clst_my* prefix Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 2/9] targets: Make features variable local Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 3/9] targets: Use arrays rather than string concatenation Matt Turner
@ 2020-05-16 6:53 ` Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 5/9] targets: Don't unnecessarily override emerge_opts Matt Turner
` (5 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Matt Turner @ 2020-05-16 6:53 UTC (permalink / raw
To: gentoo-catalyst; +Cc: Matt Turner
It's already set in setup_features().
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
targets/stage1/chroot.sh | 2 +-
targets/stage2/chroot.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index 58ed2b1d..2a8dc59b 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -9,7 +9,7 @@ export clst_buildpkgs="$(/tmp/build.py)"
[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
-FEATURES="${FEATURES} nodoc noman noinfo -news"
+FEATURES="${FEATURES} nodoc noman noinfo"
## Sanity check profile
if [ -z "${clst_buildpkgs}" ]
diff --git a/targets/stage2/chroot.sh b/targets/stage2/chroot.sh
index 4f1019f2..4448239d 100755
--- a/targets/stage2/chroot.sh
+++ b/targets/stage2/chroot.sh
@@ -3,7 +3,7 @@
source /tmp/chroot-functions.sh
# Setup the environment
-export FEATURES="${FEATURES} nodoc noman noinfo -news"
+export FEATURES="${FEATURES} nodoc noman noinfo"
export CONFIG_PROTECT="-* /etc/locale.gen"
echo "$locales" > /etc/locale.gen
--
2.26.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-catalyst] [PATCH 5/9] targets: Don't unnecessarily override emerge_opts
2020-05-16 6:53 [gentoo-catalyst] [PATCH 1/9] targets: Remove clst_my* prefix Matt Turner
` (2 preceding siblings ...)
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 4/9] targets: Drop duplicate FEATURES=-news Matt Turner
@ 2020-05-16 6:53 ` Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 6/9] targets: Remove || exit 1 from run_merge invocations Matt Turner
` (4 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Matt Turner @ 2020-05-16 6:53 UTC (permalink / raw
To: gentoo-catalyst; +Cc: Matt Turner
emerge_opts contains the options we want already, and if there are extra
options we need for a special case we can just pass them to run_merge.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
targets/support/kmerge.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 23489d8e..e92072bb 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -212,7 +212,7 @@ then
# install dependencies of kernel sources ahead of time in case
# package.provided generated below causes them not to be (re)installed
- PKGDIR=${PKGDIR} emerge_opts=(--quiet --usepkg --buildpkg --binpkg-respect-use=y --update --newuse --onlydeps) run_merge "${clst_ksource}" || exit 1
+ PKGDIR=${PKGDIR} run_merge --onlydeps "${clst_ksource}" || exit 1
# Create the kerncache directory if it doesn't exists
mkdir -p /tmp/kerncache/${clst_kname}
@@ -236,7 +236,7 @@ then
[ -L /usr/src/linux ] && rm -f /usr/src/linux
- PKGDIR=${PKGDIR} emerge_opts=(--quiet --update --newuse) run_merge "${clst_ksource}" || exit 1
+ PKGDIR=${PKGDIR} run_merge "${clst_ksource}" || exit 1
SOURCESDIR="/tmp/kerncache/${clst_kname}/sources"
if [ -L /usr/src/linux ]
--
2.26.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-catalyst] [PATCH 6/9] targets: Remove || exit 1 from run_merge invocations
2020-05-16 6:53 [gentoo-catalyst] [PATCH 1/9] targets: Remove clst_my* prefix Matt Turner
` (3 preceding siblings ...)
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 5/9] targets: Don't unnecessarily override emerge_opts Matt Turner
@ 2020-05-16 6:53 ` Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 7/9] targets: Decouple distfile fetching from binary packages Matt Turner
` (3 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Matt Turner @ 2020-05-16 6:53 UTC (permalink / raw
To: gentoo-catalyst; +Cc: Matt Turner
run_merge itself executes exit 1 if it fails, so this is dead code.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
targets/stage2/preclean-chroot.sh | 6 +++---
targets/stage3/preclean-chroot.sh | 4 ++--
targets/support/chroot-functions.sh | 8 ++++----
targets/support/kmerge.sh | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/targets/stage2/preclean-chroot.sh b/targets/stage2/preclean-chroot.sh
index 3b693d81..84b267ec 100755
--- a/targets/stage2/preclean-chroot.sh
+++ b/targets/stage2/preclean-chroot.sh
@@ -11,15 +11,15 @@ cleanup_stages
if [ -n "${clst_CCACHE}" ]
then
- run_merge -C dev-util/ccache || exit 1
+ run_merge -C dev-util/ccache
fi
if [ -n "${clst_DISTCC}" ]
then
- run_merge -C sys-devel/distcc || exit 1
+ run_merge -C sys-devel/distcc
fi
if [ -n "${clst_ICECREAM}" ]
then
- run_merge -C sys-devel/icecream || exit 1
+ run_merge -C sys-devel/icecream
fi
diff --git a/targets/stage3/preclean-chroot.sh b/targets/stage3/preclean-chroot.sh
index 33a700a6..1d801572 100755
--- a/targets/stage3/preclean-chroot.sh
+++ b/targets/stage3/preclean-chroot.sh
@@ -13,11 +13,11 @@ if [ -n "${clst_DISTCC}" ]
then
portageq has_version / sys-devel/distcc
if [ $? == 0 ]; then
- run_merge -C sys-devel/distcc || exit 1
+ run_merge -C sys-devel/distcc
fi
fi
if [ -n "${clst_ICECREAM}" ]
then
- run_merge -C sys-devel/icecream || exit 1
+ run_merge -C sys-devel/icecream
fi
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index b7969607..488041fe 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -83,7 +83,7 @@ setup_features() {
if [ -n "${clst_CCACHE}" ]
then
features+=(ccache)
- clst_root_path=/ run_merge --oneshot --noreplace dev-util/ccache || exit 1
+ clst_root_path=/ run_merge --oneshot --noreplace dev-util/ccache
fi
if [ -n "${clst_DISTCC}" ]
@@ -98,9 +98,9 @@ setup_features() {
# reinstall if it isn't found.
if [ "$(getent passwd distcc | cut -d: -f1)" != "distcc" ]
then
- clst_root_path=/ run_merge --oneshot sys-devel/distcc || exit 1
+ clst_root_path=/ run_merge --oneshot sys-devel/distcc
else
- clst_root_path=/ run_merge --oneshot --noreplace sys-devel/distcc || exit 1
+ clst_root_path=/ run_merge --oneshot --noreplace sys-devel/distcc
fi
sed -i '/USE="${USE} -avahi -gtk -gnome"/d' ${clst_make_conf}
mkdir -p /etc/distcc
@@ -119,7 +119,7 @@ setup_features() {
if [ -n "${clst_ICECREAM}" ]
then
- clst_root_path=/ run_merge --oneshot --noreplace sys-devel/icecream || exit 1
+ clst_root_path=/ run_merge --oneshot --noreplace sys-devel/icecream
# This sets up automatic cross-icecc-fu according to
# http://www.gentoo-wiki.info/HOWTO_Setup_An_ICECREAM_Compile_Cluster
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index e92072bb..3629be57 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -212,7 +212,7 @@ then
# install dependencies of kernel sources ahead of time in case
# package.provided generated below causes them not to be (re)installed
- PKGDIR=${PKGDIR} run_merge --onlydeps "${clst_ksource}" || exit 1
+ PKGDIR=${PKGDIR} run_merge --onlydeps "${clst_ksource}"
# Create the kerncache directory if it doesn't exists
mkdir -p /tmp/kerncache/${clst_kname}
@@ -236,7 +236,7 @@ then
[ -L /usr/src/linux ] && rm -f /usr/src/linux
- PKGDIR=${PKGDIR} run_merge "${clst_ksource}" || exit 1
+ PKGDIR=${PKGDIR} run_merge "${clst_ksource}"
SOURCESDIR="/tmp/kerncache/${clst_kname}/sources"
if [ -L /usr/src/linux ]
@@ -269,7 +269,7 @@ then
fi
else
- run_merge "${clst_ksource}" || exit 1
+ run_merge "${clst_ksource}"
#ensure that there is a /usr/src/linux symlink and it points to the sources we just installed
echo "Adjusting /usr/src/linux to point to \
$(portageq contents / $(portageq best_visible / "${clst_ksource}" 2>/dev/null) 2>/dev/null | grep --color=never '/usr/src/' | head -n1 2>/dev/null)"
--
2.26.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-catalyst] [PATCH 7/9] targets: Decouple distfile fetching from binary packages
2020-05-16 6:53 [gentoo-catalyst] [PATCH 1/9] targets: Remove clst_my* prefix Matt Turner
` (4 preceding siblings ...)
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 6/9] targets: Remove || exit 1 from run_merge invocations Matt Turner
@ 2020-05-16 6:53 ` Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 8/9] catalyst: Remove remnants of options="preserve_libs" Matt Turner
` (2 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Matt Turner @ 2020-05-16 6:53 UTC (permalink / raw
To: gentoo-catalyst; +Cc: Matt Turner
This removes a hack introduced in 2006 to work around a bug in portage
where it wouldn't fetch distfiles if a binary package existed for the
package. Presumably that's been fixed in the intervening 14 years. See
commit 4e00f1338637 (We now only set the options for pkgcache if we are
not using fetchonly.)
Also remove the useless "i++ // increment i"-style comment.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
targets/support/chroot-functions.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 488041fe..d40279ae 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -152,8 +152,9 @@ setup_emerge_opts() {
then
emerge_opts+=(--fetchonly)
bootstrap_opts+=(-f)
- # if we have PKGCACHE, and either update_seed is empty or 'no', make and use binpkgs
- elif [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o "${clst_update_seed}" = "no" ]
+ fi
+
+ if [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o "${clst_update_seed}" = "no" ]
then
emerge_opts+=(--usepkg --buildpkg --binpkg-respect-use=y --newuse)
bootstrap_opts+=(-r)
--
2.26.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-catalyst] [PATCH 8/9] catalyst: Remove remnants of options="preserve_libs"
2020-05-16 6:53 [gentoo-catalyst] [PATCH 1/9] targets: Remove clst_my* prefix Matt Turner
` (5 preceding siblings ...)
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 7/9] targets: Decouple distfile fetching from binary packages Matt Turner
@ 2020-05-16 6:53 ` Matt Turner
2020-05-16 19:16 ` Brian Dolbec
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 9/9] catalyst: Remove fbsplash support Matt Turner
2020-05-16 19:01 ` [gentoo-catalyst] [PATCH 1/9] targets: Remove clst_my* prefix Brian Dolbec
8 siblings, 1 reply; 13+ messages in thread
From: Matt Turner @ 2020-05-16 6:53 UTC (permalink / raw
To: gentoo-catalyst; +Cc: Matt Turner
This option has been broken since commit e3114e65ffda (Some options
cleanup, unifying their use, reducing redundancy.) in 2013 which was
first in catalyst 3.0.0.
I think the feature was a kludge, and that if or when we find the need
for something similar that we instead just run emerge @preserved-rebuild
instead.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
etc/catalyst.conf | 2 --
targets/support/depclean.sh | 2 --
targets/support/unmerge.sh | 2 --
3 files changed, 6 deletions(-)
diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 5aa2b3fb..f64fe971 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -38,8 +38,6 @@ envscript="/etc/catalyst/catalystrc"
# 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
# sticky-config = enables the code that will keep any internal 'catalyst_use' flags
diff --git a/targets/support/depclean.sh b/targets/support/depclean.sh
index 56f9a669..f99134e0 100755
--- a/targets/support/depclean.sh
+++ b/targets/support/depclean.sh
@@ -2,8 +2,6 @@
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"
if [ "${clst_livecd_depclean}" = "keepbdeps" ]; then
run_merge --depclean --with-bdeps=y
else
diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
index 0c0c0374..9f112735 100755
--- a/targets/support/unmerge.sh
+++ b/targets/support/unmerge.sh
@@ -2,8 +2,6 @@
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 -C ${clst_packages}
exit 0
--
2.26.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [gentoo-catalyst] [PATCH 8/9] catalyst: Remove remnants of options="preserve_libs"
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 8/9] catalyst: Remove remnants of options="preserve_libs" Matt Turner
@ 2020-05-16 19:16 ` Brian Dolbec
0 siblings, 0 replies; 13+ messages in thread
From: Brian Dolbec @ 2020-05-16 19:16 UTC (permalink / raw
To: gentoo-catalyst
On Fri, 15 May 2020 23:53:16 -0700
Matt Turner <mattst88@gentoo.org> wrote:
> This option has been broken since commit e3114e65ffda (Some options
> cleanup, unifying their use, reducing redundancy.) in 2013 which was
> first in catalyst 3.0.0.
>
> I think the feature was a kludge, and that if or when we find the need
> for something similar that we instead just run emerge
> @preserved-rebuild instead.
>
> Signed-off-by: Matt Turner <mattst88@gentoo.org>
> ---
Yeah, time for this one to go
> etc/catalyst.conf | 2 --
> targets/support/depclean.sh | 2 --
> targets/support/unmerge.sh | 2 --
> 3 files changed, 6 deletions(-)
>
> diff --git a/etc/catalyst.conf b/etc/catalyst.conf
> index 5aa2b3fb..f64fe971 100644
> --- a/etc/catalyst.conf
> +++ b/etc/catalyst.conf
> @@ -38,8 +38,6 @@ envscript="/etc/catalyst/catalystrc"
> # 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
> # sticky-config = enables the code that will keep any internal
> 'catalyst_use' flags diff --git a/targets/support/depclean.sh
> b/targets/support/depclean.sh index 56f9a669..f99134e0 100755
> --- a/targets/support/depclean.sh
> +++ b/targets/support/depclean.sh
> @@ -2,8 +2,6 @@
>
> 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" if [
> "${clst_livecd_depclean}" = "keepbdeps" ]; then run_merge --depclean
> --with-bdeps=y else
> diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
> index 0c0c0374..9f112735 100755
> --- a/targets/support/unmerge.sh
> +++ b/targets/support/unmerge.sh
> @@ -2,8 +2,6 @@
>
> 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 -C
> ${clst_packages}
> exit 0
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-catalyst] [PATCH 9/9] catalyst: Remove fbsplash support
2020-05-16 6:53 [gentoo-catalyst] [PATCH 1/9] targets: Remove clst_my* prefix Matt Turner
` (6 preceding siblings ...)
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 8/9] catalyst: Remove remnants of options="preserve_libs" Matt Turner
@ 2020-05-16 6:53 ` Matt Turner
2020-05-16 19:20 ` Brian Dolbec
2020-05-16 19:01 ` [gentoo-catalyst] [PATCH 1/9] targets: Remove clst_my* prefix Brian Dolbec
8 siblings, 1 reply; 13+ messages in thread
From: Matt Turner @ 2020-05-16 6:53 UTC (permalink / raw
To: gentoo-catalyst; +Cc: Matt Turner
Depends on media-gfx/splashutils which was removed from Gentoo in
November 2018.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
This is speculative. I've asked Whissi on IRC if my understanding is
correct.
catalyst/targets/livecd_stage2.py | 1 -
catalyst/targets/stage4.py | 1 -
doc/catalyst-spec.5.txt | 6 ------
examples/livecd-stage2_template.spec | 10 ++--------
examples/stage4_template.spec | 10 ++--------
targets/support/bootloader-setup.sh | 1 -
targets/support/kmerge.sh | 15 ---------------
targets/support/livecdfs-update.sh | 17 -----------------
targets/support/rc-update.sh | 2 --
9 files changed, 4 insertions(+), 59 deletions(-)
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
index 22450645..88c0d95c 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -34,7 +34,6 @@ class livecd_stage2(StageBase):
"livecd/readme",
"livecd/rm",
"livecd/root_overlay",
- "livecd/splash_theme",
"livecd/type",
"livecd/unmerge",
"livecd/users",
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py
index 17719f0e..a9b3c936 100644
--- a/catalyst/targets/stage4.py
+++ b/catalyst/targets/stage4.py
@@ -16,7 +16,6 @@ class stage4(StageBase):
valid_values = required_values | frozenset([
"boot/kernel",
"portage_overlay",
- "splash_theme",
"stage4/empty",
"stage4/fsscript",
"stage4/gk_mainargs",
diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index 40453e0f..cf6b9cd7 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -200,12 +200,6 @@ include a small memory testing application, called memtest86+
Kernel and boot issues
~~~~~~~~~~~~~~~~~~~~~~
-*<target>/splash_theme*::
-This is where you set the splash theme (example: `livecd-2006.1`).
-This theme must be present in `/etc/splash`, before the kernel has
-completed building. This setting is supported by the `stage4` and
-`livecd` targets.
-
*boot/kernel*::
This option is used to specify the number of kernels to build and also
the labels that will be used by the CD bootloader to refer to each
diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec
index e9758909..a296cfa1 100644
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -118,12 +118,6 @@ livecd/iso:
# livecd/fsscript:
livecd/fsscript:
-# This is where you set the splash theme. This theme must be present in
-# /etc/splash, before the kernel has completed building.
-# example:
-# livecd/splash_theme: livecd-2006.1
-livecd/splash_theme:
-
# This is a set of arguments that get passed to the bootloader for your CD. It
# is used on the x86/amd64 release media to enable keymap selection.
# example:
@@ -334,11 +328,11 @@ livecd/unmerge:
# rid of files that don't belong to a particular package, or removing files from
# a package that you wish to keep, but won't need the full functionality.
# example:
-# livecd/empty: /var/tmp /var/cache /var/db /var/empty /var/lock /var/log /var/run /var/spool /var/state /tmp /var/db/repos/gentoo /usr/share/man /usr/share/info /usr/share/unimaps /usr/include /usr/share/zoneinfo /usr/share/dict /usr/share/doc /usr/share/ss /usr/share/state /usr/share/texinfo /usr/lib/python2.2 /usr/lib/portage /usr/share/gettext /usr/share/i18n /usr/share/rfc /usr/lib/X11/config /usr/lib/X11/etc /usr/lib/X11/doc /usr/src /usr/share/doc /usr/share/man /etc/cron.daily /etc/cron.hourly /etc/cron.monthly /etc/cron.weekly /etc/logrotate.d /etc/rsync /usr/lib/awk /usr/lib/ccache /usr/lib/gcc-config /usr/lib/nfs /usr/local /usr/diet/include /usr/diet/man /usr/share/consolefonts/partialfonts /usr/share/consoletrans /usr/share/emacs /usr/share/gcc-data /usr/share/genkernel /etc/bootsplash/gentoo /etc/bootsplash/gentoo-highquality /etc/splash/gentoo /etc/splash/emergence /usr/share/gnuconfig /usr/share/lcms /usr/share/locale /etc/skel
+# livecd/empty: /var/tmp /var/cache /var/db /var/empty /var/lock /var/log /var/run /var/spool /var/state /tmp /var/db/repos/gentoo /usr/share/man /usr/share/info /usr/share/unimaps /usr/include /usr/share/zoneinfo /usr/share/dict /usr/share/doc /usr/share/ss /usr/share/state /usr/share/texinfo /usr/lib/python2.2 /usr/lib/portage /usr/share/gettext /usr/share/i18n /usr/share/rfc /usr/lib/X11/config /usr/lib/X11/etc /usr/lib/X11/doc /usr/src /usr/share/doc /usr/share/man /etc/cron.daily /etc/cron.hourly /etc/cron.monthly /etc/cron.weekly /etc/logrotate.d /etc/rsync /usr/lib/awk /usr/lib/ccache /usr/lib/gcc-config /usr/lib/nfs /usr/local /usr/diet/include /usr/diet/man /usr/share/consolefonts/partialfonts /usr/share/consoletrans /usr/share/emacs /usr/share/gcc-data /usr/share/genkernel /usr/share/gnuconfig /usr/share/lcms /usr/share/locale /etc/skel
livecd/empty:
# This option tells catalyst to clean specific files from the filesystem and is
# very useful in cleaning up stray files in /etc left over after livecd/unmerge.
# example:
-# livecd/rm: /lib/*.a /usr/lib/*.a /usr/lib/gcc-lib/*/*/libgcj* /etc/dispatch-conf.conf /etc/etc-update.conf /etc/*- /etc/issue* /etc/portage/make.conf /etc/man.conf /etc/*.old /root/.viminfo /usr/sbin/bootsplash* /usr/sbin/fb* /usr/sbin/fsck.cramfs /usr/sbin/fsck.minix /usr/sbin/mkfs.minix /usr/sbin/mkfs.bfs /usr/sbin/mkfs.cramfs /lib/security/pam_access.so /lib/security/pam_chroot.so /lib/security/pam_debug.so /lib/security/pam_ftp.so /lib/security/pam_issue.so /lib/security/pam_mail.so /lib/security/pam_motd.so /lib/security/pam_mkhomedir.so /lib/security/pam_postgresok.so /lib/security/pam_rhosts_auth.so /lib/security/pam_userdb.so /usr/share/consolefonts/1* /usr/share/consolefonts/7* /usr/share/consolefonts/8* /usr/share/consolefonts/9* /usr/share/consolefonts/A* /usr/share/consolefonts/C* /usr/share/consolefonts/E* /usr/share/consolefonts/G* /usr/share/consolefonts/L* /usr/share/consolefonts/M* /usr/share/consolefonts/R* /usr/share/consolefonts/a* /usr/share/consolefonts/c* /usr/share/consolefonts/dr* /usr/share/consolefonts/g* /usr/share/consolefonts/i* /usr/share/consolefonts/k* /usr/share/consolefonts/l* /usr/share/consolefonts/r* /usr/share/consolefonts/s* /usr/share/consolefonts/t* /usr/share/consolefonts/v* /etc/splash/livecd-2006.1/16* /etc/splash/livecd-2006.1/12* /etc/splash/livecd-2006.1/6* /etc/splash/livecd-2006.1/8* /etc/splash/livecd-2006.1/images/silent-16* /etc/splash/livecd-2006.1/images/silent-12* /etc/splash/livecd-2006.1/images/silent-6* /etc/splash/livecd-2006.1/images/silent-8* /etc/splash/livecd-2006.1/images/verbose-16* /etc/splash/livecd-2006.1/images/verbose-12* /etc/splash/livecd-2006.1/images/verbose-6* /etc/splash/livecd-2006.1/images/verbose-8* /etc/portage/make.conf.example /etc/make.globals /etc/resolv.conf
+# livecd/rm: /lib/*.a /usr/lib/*.a /usr/lib/gcc-lib/*/*/libgcj* /etc/dispatch-conf.conf /etc/etc-update.conf /etc/*- /etc/issue* /etc/portage/make.conf /etc/man.conf /etc/*.old /root/.viminfo /usr/sbin/fb* /usr/sbin/fsck.cramfs /usr/sbin/fsck.minix /usr/sbin/mkfs.minix /usr/sbin/mkfs.bfs /usr/sbin/mkfs.cramfs /lib/security/pam_access.so /lib/security/pam_chroot.so /lib/security/pam_debug.so /lib/security/pam_ftp.so /lib/security/pam_issue.so /lib/security/pam_mail.so /lib/security/pam_motd.so /lib/security/pam_mkhomedir.so /lib/security/pam_postgresok.so /lib/security/pam_rhosts_auth.so /lib/security/pam_userdb.so /usr/share/consolefonts/1* /usr/share/consolefonts/7* /usr/share/consolefonts/8* /usr/share/consolefonts/9* /usr/share/consolefonts/A* /usr/share/consolefonts/C* /usr/share/consolefonts/E* /usr/share/consolefonts/G* /usr/share/consolefonts/L* /usr/share/consolefonts/M* /usr/share/consolefonts/R* /usr/share/consolefonts/a* /usr/share/consolefonts/c* /usr/share/consolefonts/dr* /usr/share/consolefonts/g* /usr/share/consolefonts/i* /usr/share/consolefonts/k* /usr/share/consolefonts/l* /usr/share/consolefonts/r* /usr/share/consolefonts/s* /usr/share/consolefonts/t* /usr/share/consolefonts/v* /etc/portage/make.conf.example /etc/make.globals /etc/resolv.conf
livecd/rm:
diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec
index 75e8669f..562bfaac 100644
--- a/examples/stage4_template.spec
+++ b/examples/stage4_template.spec
@@ -109,12 +109,6 @@ stage4/packages:
# stage4/fsscript:
stage4/fsscript:
-# This is where you set the splash theme. This theme must be present in
-# /etc/splash, before the kernel has completed building.
-# example:
-# stage4/splash_theme: livecd-2006.1
-stage4/splash_theme:
-
# This is a set of arguments that will be passed to genkernel for all kernels
# defined in this target. It is useful for passing arguments to genkernel that
# are not otherwise available via the stage4-stage2 spec file.
@@ -252,11 +246,11 @@ stage4/unmerge:
# rid of files that don't belong to a particular package, or removing files from
# a package that you wish to keep, but won't need the full functionality.
# example:
-# stage4/empty: /var/tmp /var/cache /var/db /var/empty /var/lock /var/log /var/run /var/spool /var/state /tmp /var/db/repos/gentoo /usr/share/man /usr/share/info /usr/share/unimaps /usr/include /usr/share/zoneinfo /usr/share/dict /usr/share/doc /usr/share/ss /usr/share/state /usr/share/texinfo /usr/lib/python2.2 /usr/lib/portage /usr/share/gettext /usr/share/i18n /usr/share/rfc /usr/lib/X11/config /usr/lib/X11/etc /usr/lib/X11/doc /usr/src /usr/share/doc /usr/share/man /etc/cron.daily /etc/cron.hourly /etc/cron.monthly /etc/cron.weekly /etc/logrotate.d /etc/rsync /usr/lib/awk /usr/lib/ccache /usr/lib/gcc-config /usr/lib/nfs /usr/local /usr/diet/include /usr/diet/man /usr/share/consolefonts/partialfonts /usr/share/consoletrans /usr/share/emacs /usr/share/gcc-data /usr/share/genkernel /etc/splash/gentoo /etc/splash/emergence /usr/share/gnuconfig /usr/share/lcms /usr/share/locale /etc/skel
+# stage4/empty: /var/tmp /var/cache /var/db /var/empty /var/lock /var/log /var/run /var/spool /var/state /tmp /var/db/repos/gentoo /usr/share/man /usr/share/info /usr/share/unimaps /usr/include /usr/share/zoneinfo /usr/share/dict /usr/share/doc /usr/share/ss /usr/share/state /usr/share/texinfo /usr/lib/python2.2 /usr/lib/portage /usr/share/gettext /usr/share/i18n /usr/share/rfc /usr/lib/X11/config /usr/lib/X11/etc /usr/lib/X11/doc /usr/src /usr/share/doc /usr/share/man /etc/cron.daily /etc/cron.hourly /etc/cron.monthly /etc/cron.weekly /etc/logrotate.d /etc/rsync /usr/lib/awk /usr/lib/ccache /usr/lib/gcc-config /usr/lib/nfs /usr/local /usr/diet/include /usr/diet/man /usr/share/consolefonts/partialfonts /usr/share/consoletrans /usr/share/emacs /usr/share/gcc-data /usr/share/genkernel /usr/share/gnuconfig /usr/share/lcms /usr/share/locale /etc/skel
stage4/empty:
# This option tells catalyst to clean specific files from the filesystem and is
# very usefu in cleaning up stray files in /etc left over after stage4/unmerge.
# example:
-# stage4/rm: /lib/*.a /usr/lib/*.a /usr/lib/gcc-lib/*/*/libgcj* /etc/dispatch-conf.conf /etc/etc-update.conf /etc/*- /etc/issue* /etc/portage/make.conf /etc/man.conf /etc/*.old /root/.viminfo /usr/sbin/fb* /usr/sbin/fsck.cramfs /usr/sbin/fsck.minix /usr/sbin/mkfs.minix /usr/sbin/mkfs.bfs /usr/sbin/mkfs.cramfs /lib/security/pam_access.so /lib/security/pam_chroot.so /lib/security/pam_debug.so /lib/security/pam_ftp.so /lib/security/pam_issue.so /lib/security/pam_mail.so /lib/security/pam_motd.so /lib/security/pam_mkhomedir.so /lib/security/pam_postgresok.so /lib/security/pam_rhosts_auth.so /lib/security/pam_userdb.so /usr/share/consolefonts/1* /usr/share/consolefonts/7* /usr/share/consolefonts/8* /usr/share/consolefonts/9* /usr/share/consolefonts/A* /usr/share/consolefonts/C* /usr/share/consolefonts/E* /usr/share/consolefonts/G* /usr/share/consolefonts/L* /usr/share/consolefonts/M* /usr/share/consolefonts/R* /usr/share/consolefonts/a* /usr/share/consolefonts/c* /usr/share/consolefonts/dr* /usr/share/consolefonts/g* /usr/share/consolefonts/i* /usr/share/consolefonts/k* /usr/share/consolefonts/l* /usr/share/consolefonts/r* /usr/share/consolefonts/s* /usr/share/consolefonts/t* /usr/share/consolefonts/v* /etc/splash/livecd-2006.1/16* /etc/splash/livecd-2006.1/12* /etc/splash/livecd-2006.1/6* /etc/splash/livecd-2006.1/8* /etc/splash/livecd-2006.1/images/silent-16* /etc/splash/livecd-2006.1/images/silent-12* /etc/splash/livecd-2006.1/images/silent-6* /etc/splash/livecd-2006.1/images/silent-8* /etc/splash/livecd-2006.1/images/verbose-16* /etc/splash/livecd-2006.1/images/verbose-12* /etc/splash/livecd-2006.1/images/verbose-6* /etc/splash/livecd-2006.1/images/verbose-8* /etc/portage/make.conf.example /etc/make.globals /etc/resolv.conf
+# stage4/rm: /lib/*.a /usr/lib/*.a /usr/lib/gcc-lib/*/*/libgcj* /etc/dispatch-conf.conf /etc/etc-update.conf /etc/*- /etc/issue* /etc/portage/make.conf /etc/man.conf /etc/*.old /root/.viminfo /usr/sbin/fb* /usr/sbin/fsck.cramfs /usr/sbin/fsck.minix /usr/sbin/mkfs.minix /usr/sbin/mkfs.bfs /usr/sbin/mkfs.cramfs /lib/security/pam_access.so /lib/security/pam_chroot.so /lib/security/pam_debug.so /lib/security/pam_ftp.so /lib/security/pam_issue.so /lib/security/pam_mail.so /lib/security/pam_motd.so /lib/security/pam_mkhomedir.so /lib/security/pam_postgresok.so /lib/security/pam_rhosts_auth.so /lib/security/pam_userdb.so /usr/share/consolefonts/1* /usr/share/consolefonts/7* /usr/share/consolefonts/8* /usr/share/consolefonts/9* /usr/share/consolefonts/A* /usr/share/consolefonts/C* /usr/share/consolefonts/E* /usr/share/consolefonts/G* /usr/share/consolefonts/L* /usr/share/consolefonts/M* /usr/share/consolefonts/R* /usr/share/consolefonts/a* /usr/share/consolefonts/c* /usr/share/consolefonts/dr* /usr/share/consolefonts/g* /usr/share/consolefonts/i* /usr/share/consolefonts/k* /usr/share/consolefonts/l* /usr/share/consolefonts/r* /usr/share/consolefonts/s* /usr/share/consolefonts/t* /usr/share/consolefonts/v* /etc/portage/make.conf.example /etc/make.globals /etc/resolv.conf
stage4/rm:
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index e3d8037c..71da0c40 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -42,7 +42,6 @@ esac
default_append_line=(root=/dev/ram0 init=/linuxrc ${cmdline_opts[@]} ${custom_kopts} cdroot)
-[ -n "${clst_splash_theme}" ] && default_append_line+=(splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet)
case ${clst_hostarch} in
alpha)
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 3629be57..1a432293 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -31,21 +31,6 @@ setup_gk_args() {
GK_ARGS+=(--kernel-config=/var/tmp/${clst_kname}.config)
fi
- if [ -n "${clst_splash_theme}" ]
- then
- GK_ARGS+=(--splash=${clst_splash_theme})
- # Setup case structure for livecd_type
- case ${clst_livecd_type} in
- gentoo-release-minimal|gentoo-release-universal)
- case ${clst_hostarch} in
- amd64|x86)
- GK_ARGS+=(--splash-res=1024x768)
- ;;
- esac
- ;;
- esac
- fi
-
if [ -d "/tmp/initramfs_overlay/${clst_initramfs_overlay}" ]
then
GK_ARGS+=(--initramfs-overlay=/tmp/initramfs_overlay/${clst_initramfs_overlay})
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index b1049671..53844d9f 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -174,23 +174,6 @@ esac
rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/livecd.motd.txt
-# Setup splash (if called for)
-if [ -n "${clst_livecd_splash_theme}" ]
-then
- if [ -d /etc/splash/${clst_livecd_splash_theme} ]
- then
- sed -i \
- -e "s:# SPLASH_THEME=\"gentoo\":SPLASH_THEME=\"${clst_livecd_splash_theme}\":" \
- -e "/^# SPLASH_TTYS=/ s/^#//" \
- /etc/conf.d/splash
- rm -f /etc/splash/default
- ln -s /etc/splash/${clst_livecd_splash_theme} /etc/splash/default
- else
- echo "Error, cannot setup splash theme ${clst_livecd_splash_theme}"
- exit 1
- fi
-fi
-
# Clear out locales
case ${clst_livecd_type} in
gentoo-release-minimal|gentoo-release-universal)
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
index 6e739966..0ebd9a48 100755
--- a/targets/support/rc-update.sh
+++ b/targets/support/rc-update.sh
@@ -9,8 +9,6 @@ then
rc-update --all del consolefont
# We need to add this one, unconditionally
rc-update add autoconfig default
- [[ -e /etc/init.d/splash ]] && rc-update add splash default
- [[ -e /etc/init.d/fbcondecor ]] && rc-update add fbcondecor default
[[ -e /etc/init.d/sysklogd ]] && rc-update add sysklogd default
[[ -e /etc/init.d/metalog ]] && rc-update add metalog default
[[ -e /etc/init.d/syslog-ng ]] && rc-update add syslog-ng default
--
2.26.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [gentoo-catalyst] [PATCH 1/9] targets: Remove clst_my* prefix
2020-05-16 6:53 [gentoo-catalyst] [PATCH 1/9] targets: Remove clst_my* prefix Matt Turner
` (7 preceding siblings ...)
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 9/9] catalyst: Remove fbsplash support Matt Turner
@ 2020-05-16 19:01 ` Brian Dolbec
8 siblings, 0 replies; 13+ messages in thread
From: Brian Dolbec @ 2020-05-16 19:01 UTC (permalink / raw
To: gentoo-catalyst
On Fri, 15 May 2020 23:53:09 -0700
Matt Turner <mattst88@gentoo.org> wrote:
> clst_* prefixed variables are created by setup_environment(), which
> these variables are not. Also, prefixing variable names with 'my' is
> an anti-pattern.
>
> Rename the functions that create these variables at the same time.
>
> Signed-off-by: Matt Turner <mattst88@gentoo.org>
> ---
Hmmmmm, I added the clst_ prefix to try and get a handle on the
variables exported by the python as part of the cleanup. So, I can only
surmize that myfeatures was originally exported by the python code at
one point.
If that is the case this one is no longer exported, then go for it...
I also don't like the my prefix tagged variables.
> targets/netboot/pkg.sh | 2 +-
> targets/stage1/chroot.sh | 4 ++--
> targets/stage2/chroot.sh | 2 +-
> targets/support/chroot-functions.sh | 34
> ++++++++++++++--------------- targets/support/kmerge.sh |
> 4 ++-- 5 files changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/targets/netboot/pkg.sh b/targets/netboot/pkg.sh
> index 29da7134..2ec27062 100755
> --- a/targets/netboot/pkg.sh
> +++ b/targets/netboot/pkg.sh
> @@ -4,7 +4,7 @@ source /tmp/chroot-functions.sh
>
> update_env_settings
>
> -setup_myfeatures
> +setup_features
>
> show_debug
>
> diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
> index 9c7ef6ca..a42afd19 100755
> --- a/targets/stage1/chroot.sh
> +++ b/targets/stage1/chroot.sh
> @@ -9,7 +9,7 @@ export clst_buildpkgs="$(/tmp/build.py)"
> [ -n "${clst_BINDIST}" ] && BINDIST="bindist"
> BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
>
> -FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
> +FEATURES="${features} nodoc noman noinfo -news"
>
> ## Sanity check profile
> if [ -z "${clst_buildpkgs}" ]
> @@ -39,7 +39,7 @@ if [ -n "${clst_update_seed}" ]; then
> fi
>
> # reset emerge options for the target
> - clst_update_seed=no setup_myemergeopts
> + clst_update_seed=no setup_emerge_opts
> else
> echo "Skipping seed stage update..."
> fi
> diff --git a/targets/stage2/chroot.sh b/targets/stage2/chroot.sh
> index bf98d328..e472fe16 100755
> --- a/targets/stage2/chroot.sh
> +++ b/targets/stage2/chroot.sh
> @@ -3,7 +3,7 @@
> source /tmp/chroot-functions.sh
>
> # Setup the environment
> -export FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
> +export FEATURES="${features} nodoc noman noinfo -news"
> export CONFIG_PROTECT="-* /etc/locale.gen"
>
> echo "$locales" > /etc/locale.gen
> diff --git a/targets/support/chroot-functions.sh
> b/targets/support/chroot-functions.sh index 993dc209..2eb90117 100755
> --- a/targets/support/chroot-functions.sh
> +++ b/targets/support/chroot-functions.sh
> @@ -76,19 +76,19 @@ get_libdir() {
> echo ${var}
> }
>
> -setup_myfeatures(){
> - setup_myemergeopts
> - export clst_myfeatures="-news binpkg-multi-instance
> clean-logs parallel-install"
> - export FEATURES="${clst_myfeatures}"
> +setup_features() {
> + setup_emerge_opts
> + export features="-news binpkg-multi-instance clean-logs
> parallel-install"
> + export FEATURES="${features}"
> if [ -n "${clst_CCACHE}" ]
> then
> - export clst_myfeatures="${clst_myfeatures} ccache"
> + export features="${features} ccache"
> clst_root_path=/ run_merge --oneshot --noreplace
> dev-util/ccache || exit 1 fi
>
> if [ -n "${clst_DISTCC}" ]
> then
> - export clst_myfeatures="${clst_myfeatures} distcc"
> + export features="${features} distcc"
> export DISTCC_HOSTS="${clst_distcc_hosts}"
> [ -e ${clst_make_conf} ] && \
> echo 'USE="${USE} -avahi -gtk -gnome"' >>
> ${clst_make_conf} @@ -133,26 +133,26 @@ setup_myfeatures(){
> export PATH="/usr/lib/icecc/bin:${PATH}"
> export PREROOTPATH="/usr/lib/icecc/bin"
> fi
> - export FEATURES="${clst_myfeatures}"
> + export FEATURES="${features}"
> }
>
> -setup_myemergeopts(){
> +setup_emerge_opts() {
> if [[ "${clst_VERBOSE}" == "true" ]]
> then
> - clst_myemergeopts="--verbose"
> + emerge_opts="--verbose"
> bootstrap_opts="${bootstrap_opts} -v"
> else
> - clst_myemergeopts="--quiet"
> + emerge_opts="--quiet"
> bootstrap_opts="${bootstrap_opts} -q"
> fi
> if [ -n "${clst_FETCH}" ]
> then
> export bootstrap_opts="${bootstrap_opts} -f"
> - export clst_myemergeopts="${clst_myemergeopts} -f"
> + export emerge_opts="${emerge_opts} -f"
> # if we have PKGCACHE, and either update_seed is empty or
> 'no', make and use binpkgs elif [ -n "${clst_PKGCACHE}" ] && [ -z
> "${clst_update_seed}" -o "${clst_update_seed}" = "no" ] then
> - export clst_myemergeopts="${clst_myemergeopts}
> --usepkg --buildpkg --binpkg-respect-use=y --newuse"
> + export emerge_opts="${emerge_opts} --usepkg
> --buildpkg --binpkg-respect-use=y --newuse" export
> bootstrap_opts="${bootstrap_opts} -r" fi
> }
> @@ -274,13 +274,13 @@ run_merge() {
>
> if [[ "${clst_VERBOSE}" == "true" ]]
> then
> - echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt
> $@" || exit 1
> - emerge ${clst_myemergeopts} -pt $@ || exit 3
> + echo "ROOT=${ROOT} emerge ${emerge_opts} -pt $@" ||
> exit 1
> + emerge ${emerge_opts} -pt $@ || exit 3
> fi
>
> - echo "emerge ${clst_myemergeopts} $@" || exit 1
> + echo "emerge ${emerge_opts} $@" || exit 1
>
> - emerge ${clst_myemergeopts} $@ || exit 1
> + emerge ${emerge_opts} $@ || exit 1
> }
>
> show_debug() {
> @@ -323,7 +323,7 @@ run_default_funcs() {
> if [ "${RUN_DEFAULT_FUNCS}" != "no" ]
> then
> update_env_settings
> - setup_myfeatures
> + setup_features
> show_debug
> fi
> }
> diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
> index 7a00059a..8a15fc04 100755
> --- a/targets/support/kmerge.sh
> +++ b/targets/support/kmerge.sh
> @@ -212,7 +212,7 @@ then
>
> # install dependencies of kernel sources ahead of time in
> case # package.provided generated below causes them not to be
> (re)installed
> - PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --usepkg
> --buildpkg --binpkg-respect-use=y --update --newuse --onlydeps"
> run_merge "${clst_ksource}" || exit 1
> + PKGDIR=${PKGDIR} emerge_opts="--quiet --usepkg --buildpkg
> --binpkg-respect-use=y --update --newuse --onlydeps" run_merge
> "${clst_ksource}" || exit 1 # Create the kerncache directory if it
> doesn't exists mkdir -p /tmp/kerncache/${clst_kname}
> @@ -236,7 +236,7 @@ then
>
> [ -L /usr/src/linux ] && rm -f /usr/src/linux
>
> - PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --update
> --newuse" run_merge "${clst_ksource}" || exit 1
> + PKGDIR=${PKGDIR} emerge_opts="--quiet --update --newuse"
> run_merge "${clst_ksource}" || exit 1
> SOURCESDIR="/tmp/kerncache/${clst_kname}/sources"
> if [ -L /usr/src/linux ]
^ permalink raw reply [flat|nested] 13+ messages in thread