| 1 |
Depends on media-gfx/splashutils which was removed from Gentoo in |
| 2 |
November 2018. |
| 3 |
|
| 4 |
Signed-off-by: Matt Turner <mattst88@g.o> |
| 5 |
--- |
| 6 |
This is speculative. I've asked Whissi on IRC if my understanding is |
| 7 |
correct. |
| 8 |
|
| 9 |
catalyst/targets/livecd_stage2.py | 1 - |
| 10 |
catalyst/targets/stage4.py | 1 - |
| 11 |
doc/catalyst-spec.5.txt | 6 ------ |
| 12 |
examples/livecd-stage2_template.spec | 10 ++-------- |
| 13 |
examples/stage4_template.spec | 10 ++-------- |
| 14 |
targets/support/bootloader-setup.sh | 1 - |
| 15 |
targets/support/kmerge.sh | 15 --------------- |
| 16 |
targets/support/livecdfs-update.sh | 17 ----------------- |
| 17 |
targets/support/rc-update.sh | 2 -- |
| 18 |
9 files changed, 4 insertions(+), 59 deletions(-) |
| 19 |
|
| 20 |
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py |
| 21 |
index 22450645..88c0d95c 100644 |
| 22 |
--- a/catalyst/targets/livecd_stage2.py |
| 23 |
+++ b/catalyst/targets/livecd_stage2.py |
| 24 |
@@ -34,7 +34,6 @@ class livecd_stage2(StageBase): |
| 25 |
"livecd/readme", |
| 26 |
"livecd/rm", |
| 27 |
"livecd/root_overlay", |
| 28 |
- "livecd/splash_theme", |
| 29 |
"livecd/type", |
| 30 |
"livecd/unmerge", |
| 31 |
"livecd/users", |
| 32 |
diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py |
| 33 |
index 17719f0e..a9b3c936 100644 |
| 34 |
--- a/catalyst/targets/stage4.py |
| 35 |
+++ b/catalyst/targets/stage4.py |
| 36 |
@@ -16,7 +16,6 @@ class stage4(StageBase): |
| 37 |
valid_values = required_values | frozenset([ |
| 38 |
"boot/kernel", |
| 39 |
"portage_overlay", |
| 40 |
- "splash_theme", |
| 41 |
"stage4/empty", |
| 42 |
"stage4/fsscript", |
| 43 |
"stage4/gk_mainargs", |
| 44 |
diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt |
| 45 |
index 40453e0f..cf6b9cd7 100644 |
| 46 |
--- a/doc/catalyst-spec.5.txt |
| 47 |
+++ b/doc/catalyst-spec.5.txt |
| 48 |
@@ -200,12 +200,6 @@ include a small memory testing application, called memtest86+ |
| 49 |
Kernel and boot issues |
| 50 |
~~~~~~~~~~~~~~~~~~~~~~ |
| 51 |
|
| 52 |
-*<target>/splash_theme*:: |
| 53 |
-This is where you set the splash theme (example: `livecd-2006.1`). |
| 54 |
-This theme must be present in `/etc/splash`, before the kernel has |
| 55 |
-completed building. This setting is supported by the `stage4` and |
| 56 |
-`livecd` targets. |
| 57 |
- |
| 58 |
*boot/kernel*:: |
| 59 |
This option is used to specify the number of kernels to build and also |
| 60 |
the labels that will be used by the CD bootloader to refer to each |
| 61 |
diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec |
| 62 |
index e9758909..a296cfa1 100644 |
| 63 |
--- a/examples/livecd-stage2_template.spec |
| 64 |
+++ b/examples/livecd-stage2_template.spec |
| 65 |
@@ -118,12 +118,6 @@ livecd/iso: |
| 66 |
# livecd/fsscript: |
| 67 |
livecd/fsscript: |
| 68 |
|
| 69 |
-# This is where you set the splash theme. This theme must be present in |
| 70 |
-# /etc/splash, before the kernel has completed building. |
| 71 |
-# example: |
| 72 |
-# livecd/splash_theme: livecd-2006.1 |
| 73 |
-livecd/splash_theme: |
| 74 |
- |
| 75 |
# This is a set of arguments that get passed to the bootloader for your CD. It |
| 76 |
# is used on the x86/amd64 release media to enable keymap selection. |
| 77 |
# example: |
| 78 |
@@ -334,11 +328,11 @@ livecd/unmerge: |
| 79 |
# rid of files that don't belong to a particular package, or removing files from |
| 80 |
# a package that you wish to keep, but won't need the full functionality. |
| 81 |
# example: |
| 82 |
-# 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 |
| 83 |
+# 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 |
| 84 |
livecd/empty: |
| 85 |
|
| 86 |
# This option tells catalyst to clean specific files from the filesystem and is |
| 87 |
# very useful in cleaning up stray files in /etc left over after livecd/unmerge. |
| 88 |
# example: |
| 89 |
-# 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 |
| 90 |
+# 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 |
| 91 |
livecd/rm: |
| 92 |
diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec |
| 93 |
index 75e8669f..562bfaac 100644 |
| 94 |
--- a/examples/stage4_template.spec |
| 95 |
+++ b/examples/stage4_template.spec |
| 96 |
@@ -109,12 +109,6 @@ stage4/packages: |
| 97 |
# stage4/fsscript: |
| 98 |
stage4/fsscript: |
| 99 |
|
| 100 |
-# This is where you set the splash theme. This theme must be present in |
| 101 |
-# /etc/splash, before the kernel has completed building. |
| 102 |
-# example: |
| 103 |
-# stage4/splash_theme: livecd-2006.1 |
| 104 |
-stage4/splash_theme: |
| 105 |
- |
| 106 |
# This is a set of arguments that will be passed to genkernel for all kernels |
| 107 |
# defined in this target. It is useful for passing arguments to genkernel that |
| 108 |
# are not otherwise available via the stage4-stage2 spec file. |
| 109 |
@@ -252,11 +246,11 @@ stage4/unmerge: |
| 110 |
# rid of files that don't belong to a particular package, or removing files from |
| 111 |
# a package that you wish to keep, but won't need the full functionality. |
| 112 |
# example: |
| 113 |
-# 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 |
| 114 |
+# 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 |
| 115 |
stage4/empty: |
| 116 |
|
| 117 |
# This option tells catalyst to clean specific files from the filesystem and is |
| 118 |
# very usefu in cleaning up stray files in /etc left over after stage4/unmerge. |
| 119 |
# example: |
| 120 |
-# 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 |
| 121 |
+# 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 |
| 122 |
stage4/rm: |
| 123 |
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh |
| 124 |
index e3d8037c..71da0c40 100755 |
| 125 |
--- a/targets/support/bootloader-setup.sh |
| 126 |
+++ b/targets/support/bootloader-setup.sh |
| 127 |
@@ -42,7 +42,6 @@ esac |
| 128 |
|
| 129 |
|
| 130 |
default_append_line=(root=/dev/ram0 init=/linuxrc ${cmdline_opts[@]} ${custom_kopts} cdroot) |
| 131 |
-[ -n "${clst_splash_theme}" ] && default_append_line+=(splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet) |
| 132 |
|
| 133 |
case ${clst_hostarch} in |
| 134 |
alpha) |
| 135 |
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh |
| 136 |
index 3629be57..1a432293 100755 |
| 137 |
--- a/targets/support/kmerge.sh |
| 138 |
+++ b/targets/support/kmerge.sh |
| 139 |
@@ -31,21 +31,6 @@ setup_gk_args() { |
| 140 |
GK_ARGS+=(--kernel-config=/var/tmp/${clst_kname}.config) |
| 141 |
fi |
| 142 |
|
| 143 |
- if [ -n "${clst_splash_theme}" ] |
| 144 |
- then |
| 145 |
- GK_ARGS+=(--splash=${clst_splash_theme}) |
| 146 |
- # Setup case structure for livecd_type |
| 147 |
- case ${clst_livecd_type} in |
| 148 |
- gentoo-release-minimal|gentoo-release-universal) |
| 149 |
- case ${clst_hostarch} in |
| 150 |
- amd64|x86) |
| 151 |
- GK_ARGS+=(--splash-res=1024x768) |
| 152 |
- ;; |
| 153 |
- esac |
| 154 |
- ;; |
| 155 |
- esac |
| 156 |
- fi |
| 157 |
- |
| 158 |
if [ -d "/tmp/initramfs_overlay/${clst_initramfs_overlay}" ] |
| 159 |
then |
| 160 |
GK_ARGS+=(--initramfs-overlay=/tmp/initramfs_overlay/${clst_initramfs_overlay}) |
| 161 |
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh |
| 162 |
index b1049671..53844d9f 100755 |
| 163 |
--- a/targets/support/livecdfs-update.sh |
| 164 |
+++ b/targets/support/livecdfs-update.sh |
| 165 |
@@ -174,23 +174,6 @@ esac |
| 166 |
|
| 167 |
rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/livecd.motd.txt |
| 168 |
|
| 169 |
-# Setup splash (if called for) |
| 170 |
-if [ -n "${clst_livecd_splash_theme}" ] |
| 171 |
-then |
| 172 |
- if [ -d /etc/splash/${clst_livecd_splash_theme} ] |
| 173 |
- then |
| 174 |
- sed -i \ |
| 175 |
- -e "s:# SPLASH_THEME=\"gentoo\":SPLASH_THEME=\"${clst_livecd_splash_theme}\":" \ |
| 176 |
- -e "/^# SPLASH_TTYS=/ s/^#//" \ |
| 177 |
- /etc/conf.d/splash |
| 178 |
- rm -f /etc/splash/default |
| 179 |
- ln -s /etc/splash/${clst_livecd_splash_theme} /etc/splash/default |
| 180 |
- else |
| 181 |
- echo "Error, cannot setup splash theme ${clst_livecd_splash_theme}" |
| 182 |
- exit 1 |
| 183 |
- fi |
| 184 |
-fi |
| 185 |
- |
| 186 |
# Clear out locales |
| 187 |
case ${clst_livecd_type} in |
| 188 |
gentoo-release-minimal|gentoo-release-universal) |
| 189 |
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh |
| 190 |
index 6e739966..0ebd9a48 100755 |
| 191 |
--- a/targets/support/rc-update.sh |
| 192 |
+++ b/targets/support/rc-update.sh |
| 193 |
@@ -9,8 +9,6 @@ then |
| 194 |
rc-update --all del consolefont |
| 195 |
# We need to add this one, unconditionally |
| 196 |
rc-update add autoconfig default |
| 197 |
- [[ -e /etc/init.d/splash ]] && rc-update add splash default |
| 198 |
- [[ -e /etc/init.d/fbcondecor ]] && rc-update add fbcondecor default |
| 199 |
[[ -e /etc/init.d/sysklogd ]] && rc-update add sysklogd default |
| 200 |
[[ -e /etc/init.d/metalog ]] && rc-update add metalog default |
| 201 |
[[ -e /etc/init.d/syslog-ng ]] && rc-update add syslog-ng default |
| 202 |
-- |
| 203 |
2.26.2 |
Archives