Depends on media-gfx/splashutils which was removed from Gentoo in November 2018.
Signed-off-by: Matt Turner <[email protected]> --- 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
