From b34195d74f37d9408d4b4deb17d7b66580f3e35c Mon Sep 17 00:00:00 2001 From: Alexey Shabalin Date: Fri, 11 Oct 2024 16:39:38 +0300 Subject: [PATCH] drop old bootspalsh support --- Makefile.in | 2 -- branding.spec | 26 -------------------------- 2 files changed, 28 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6da9598..3053e66 100644 --- a/Makefile.in +++ b/Makefile.in @@ -92,9 +92,7 @@ boot-images: #bootloader boot-arch: boot-images DEFAULT_LANG='--lang-to-subst--' PATH=$(PATH):/usr/sbin make -C design-bootloader-source - install -d -m 755 $(sysconfdir)/../boot/splash/$(THEME) install -d -m 755 $(datadir)/gfxboot/$(THEME) - install -m 644 design-bootloader-source/message $(sysconfdir)/../boot/splash/$(THEME) install -m 644 design-bootloader-source/bootlogo $(datadir)/gfxboot/$(THEME) #install -m644 bootloader/bootlogo $(datadir)/gfxboot/$(THEME) else diff --git a/branding.spec b/branding.spec index 7a92c51..d04d4f6 100644 --- a/branding.spec +++ b/branding.spec @@ -225,38 +225,13 @@ find %buildroot -name \*.in -delete %ifarch %ix86 x86_64 [ -s /usr/share/gfxboot/%theme ] && rm -fr /usr/share/gfxboot/%theme ||: %endif -%ifarch %ix86 x86_64 aarch64 -[ -s /boot/splash/%theme ] && rm -fr /boot/splash/%theme ||: -%endif %post bootloader -%ifarch %ix86 x86_64 aarch64 -ln -snf %theme/message /boot/splash/message -LANG="C" -SYSTEMD_I18N="/etc/locale.conf" -SYSV_I18N="/etc/sysconfig/i18n" -if [ -f "$SYSTEMD_I18N" ] ; then - . $SYSTEMD_I18N -elif [ -f "$SYSV_I18N" ] ; then - . $SYSV_I18N -fi -lang=$(echo $LANG | cut -d. -f 1) -cd boot/splash/%theme/ -echo $lang > lang -[ "$lang" = "C" ] || echo lang | cpio -o --append -F message . shell-config shell_config_set /etc/sysconfig/grub2 GRUB_THEME /boot/grub/themes/%theme/theme.txt #shell_config_set /etc/sysconfig/grub2 GRUB_THEME /boot/grub/themes/%theme shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_NORMAL %grub_normal shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high -%endif - -%ifarch %ix86 x86_64 aarch64 -%preun bootloader -[ "$1" -eq 0 ] || exit 0 -[ "`readlink /boot/splash/message`" != "%theme/message" ] || - rm -f /boot/splash/message -%endif %post indexhtml %_sbindir/indexhtml-update @@ -264,7 +239,6 @@ shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high %files bootloader %ifarch %ix86 x86_64 %_datadir/gfxboot/%theme -/boot/splash/%theme %endif /boot/grub/themes/%theme