konevsa/branding-alt-virtualization-one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop gfxboot for syslinux

Browse Source
This commit is contained in:
Алексей Шабалин 2024-10-11 17:04:52 +03:00
parent 850f62b284
commit d89a89461f
3 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Makefile.in
View File

@ -71,36 +71,6 @@ ahttpd:
cp -a ahttpd/images $(datadir)/alterator/design
cp -a ahttpd/styles/*.css $(datadir)/alterator/design/styles
ifeq (,$(filter-out i586 i686 x86_64,$(ARCH)))
# bootloader and bootsplash
boot-images:
cp -a /usr/src/design-bootloader-source ./
cp -a bootloader/config design-bootloader-source/
cp -a bootloader/gfxboot.cfg design-bootloader-source/data-install/
cp -a bootloader/gfxboot.cfg design-bootloader-source/data-boot/
convert -colorspace YCbCr -sampling-factor 2x2 images/boot.png JPEG:images/boot.jpg
if [ -n "$(STATUS)" ];then \
convert images/boot.jpg -resize "800x600!" -undercolor '#c62530' -fill white -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 30 -gravity northwest -draw 'text 0,55 " $(STATUS) "' design-bootloader-source/data-boot/back.jpg; \
else \
cp -al images/boot.jpg design-bootloader-source/data-boot/back.jpg; \
fi
cp -al design-bootloader-source/data-boot/back.jpg design-bootloader-source/data-install/back.jpg; \
mv design-bootloader-source/data-install/back{,.1}.jpg
convert -quality 97 -fill '#acdaf2' -draw 'rectangle 0,0,2,2' design-bootloader-source/data-install/back{.1,}.jpg
rm -f design-bootloader-source/data-install/back.*.jpg
#bootloader
boot-arch: boot-images
DEFAULT_LANG='--lang-to-subst--' PATH=$(PATH):/usr/sbin make -C design-bootloader-source
install -d -m 755 $(datadir)/gfxboot/$(THEME)
install -m 644 design-bootloader-source/bootlogo $(datadir)/gfxboot/$(THEME)
#install -m644 bootloader/bootlogo $(datadir)/gfxboot/$(THEME)
else
boot-arch: ; @:
boot-images:
convert -colorspace YCbCr -sampling-factor 2x2 images/boot.png JPEG:images/boot.jpg
endif
#bootsplash
boot-splash: boot-images
mkdir -p $(datadir)/plymouth/themes/$(THEME)
@ -113,7 +83,7 @@ boot-splash: boot-images
mkdir -p $(datadir)/pixmaps
mv $(datadir)/plymouth/themes/$(THEME)/system-logo.png $(datadir)/pixmaps
#bootloader
boot: boot-arch
boot:
convert -size 16x16 -define png:color-type=2 -depth 8 xc:'#001056' grub2/selected_blob_c.png
install -d -m 755 $(sysconfdir)/../boot/grub/themes/$(THEME)
cp -a grub2/* $(sysconfdir)/../boot/grub/themes/$(THEME)/

13
branding.spec
View File

@ -22,11 +22,6 @@ Version: 10.4
Release: alt1
Url: https://basealt.ru
%ifarch %ix86 x86_64
BuildRequires: gfxboot >= 4
BuildRequires: design-bootloader-source >= 5.0-alt2
BuildRequires: cpio
%endif
BuildRequires: fonts-ttf-dejavu fonts-ttf-google-droid-sans
BuildRequires(pre): rpm-macros-branding
@ -222,11 +217,6 @@ make
find %buildroot -name \*.in -delete
#bootloader
%pre bootloader
%ifarch %ix86 x86_64
[ -s /usr/share/gfxboot/%theme ] && rm -fr /usr/share/gfxboot/%theme ||:
%endif
%post bootloader
. shell-config
shell_config_set /etc/sysconfig/grub2 GRUB_THEME /boot/grub/themes/%theme/theme.txt
@ -238,9 +228,6 @@ shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high
%_sbindir/indexhtml-update
%files bootloader
%ifarch %ix86 x86_64
%_datadir/gfxboot/%theme
%endif
/boot/grub/themes/%theme
#bootsplash

1
configure.ac
View File

@ -47,7 +47,6 @@ AC_CONFIG_FILES([
bootsplash/theme.plymouth
browser-qt/design/design.ini
browser-qt/design/design.qss
bootloader/gfxboot.cfg
notes/release-notes.ru.html
notes/release-notes.all.html
notes/license.ru.html