drop gfxboot for syslinux

Makefile.in

@@ -7,13 +7,9 @@ PRODUCT_NAME=@PRODUCT_NAME@
 CODENAME=@CODENAME@
 ARCH=$(shell arch)
 
-.PHONY: graphics gfxboot-images browser-qt ahttpd boot-gfxboot boot-grub boot-splash boot indexhtml install browser-qt/design/bg.png
+.PHONY: graphics browser-qt ahttpd boot-grub boot-splash boot indexhtml install browser-qt/design/bg.png
 
-ifeq (,$(filter-out i586 i686 x86_64,$(ARCH)))
-all: graphics gfxboot-images
-else
 all: graphics
-endif
 
 # graphics
 
@@ -25,7 +21,7 @@ graphics:
 	cp -al images/product-logo.png backgrounds/product-logo.png
 	cp -al images/wallpaper.png backgrounds/default.png
 	cp -al images/wallpaper.png backgrounds/xdm.png
-# make wallpapers for gfxboot and grub2
+# make wallpapers for grub2
 #       convert images/background4x3.png -resize 800x600 images/small.png
 # display status
 #       convert images/small.png images/product-logo.png -geometry +30+30 -composite images/grub.png
@@ -77,30 +73,6 @@ ahttpd:
 	cp -a ahttpd/images $(datadir)/alterator/design
 	cp -a ahttpd/styles/*.css $(datadir)/alterator/design/styles
 
-# gfxboot
-gfxboot-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/
-	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
-	DEFAULT_LANG='--lang-to-subst--' PATH=$(PATH):/usr/sbin make -C design-bootloader-source
-
-boot-gfxboot:
-	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)
-
 #bootsplash
 boot-splash:
 	mkdir -p $(datadir)/plymouth/themes/$(THEME)
@@ -120,11 +92,7 @@ boot-grub:
 	install -m 644 images/boot.png $(sysconfdir)/../boot/grub/themes/$(THEME)/boot.png
 	install -m 644 images/boot.jpg $(sysconfdir)/../boot/grub/themes/$(THEME)/grub.jpg
 
-ifeq (,$(filter-out i586 i686 x86_64,$(ARCH)))
-boot: boot-gfxboot boot-splash boot-grub
-else
 boot: boot-splash boot-grub
-endif
 
 INDEXHTML_DIR=$(datadir)/doc/indexhtml
 indexhtml:

bootloader/gfxboot.cfg.in

-; Sections are read in the order given in base::layout, with section 'base'
-; implicitly added at the end. If a config value is given more than once,
-; the first entry wins.
-;
-; If a screen resolution can't be set, 640x480 is used as fallback (and
-; section '640x480' added to the layout list).
-;
-; If the penguin screen is active, section 'penguin' is automatically added
-; to the layout list.
-;
-; Color values: 24 bit RGB (e.g. 0xff0000 = red).
-;
-
-[base]
-; theme name
-theme=ALTLinux
-; other sections to read
-layout=800x600,install
-; penguin theme likelihood (in percent, -1 = auto)
-penguin=0
-; activate speech output
-talk=0
-; sound volume (0..100)
-volume=70
-; menu background transparency (0..255)
-menu.transparency=0x20
-; default font
-font.normal=drs16.fnt
-; main menu font
-font.large=drs16.fnt
-; bold main menu font
-font.large.bold=drs16b.fnt
-; background image
-background=back.jpg
-; max. visible main menu items
-mainmenu.entries=8
-; minimal main menu selection bar width
-mainmenu.bar.minwidth=294
-; main menu selection bar transparency (0..255)
-mainmenu.bar.transparency=0
-; main menu colors
-mainmenu.bar.color=0x3d3a43
-mainmenu.normal.fg=0xfddc7d
-mainmenu.selected.fg=0xffffff
-; boot option colors
-bootopt.label.fg=0xffffff
-bootopt.text.fg=0xf8e97c
-; progress bar color
-progress.bar.color=0x001056
-; menu colors
-menu.normal.bg=0xe9e8e7
-menu.normal.fg=0x000000
-menu.selected.bg=0xc9c8c8
-menu.selected.fg=0x000000
-; window colors
-window.bg=0xd8deed
-window.fg=0x000000
-window.title.bg=0x@TITLE_COLOR@
-window.title.fg=0x@DARK_LABELS_HEX@
-window.title.error.bg=0xc00000
-; help system colors
-help.link.fg=0x185da0
-help.link.selected.fg=0xffffff
-help.link.selected.bg=0x185da
-help.highlight.fg=0x@DARK_COLOR_HEX@
-; panel colors
-panel.fg=0x000000
-panel.title.fg=0xffffff
-panel.normal.fg=0xf8e97c
-panel.f-key.fg=0xf8e97c
-; default keymap (e.g. de_DE, czech)
-keymap=
-
-[800x600]
-; screen size
-screen.size=800,600
-; upper left corner
-mainmenu.pos=253,210
-; boot option input field position
-bootopt.pos=200,480
-
-[640x480]
-; screen size
-screen.size=640,480
-; upper left corner
-mainmenu.pos=130,122
-; boot option input field position
-bootopt.pos=263,380
-
-
-[install]
-; show welcome animation
-welcome=0
-; beep when menu is ready
-beep=0
-; main menu item shown only if iso is tagged for media check
-mediacheck=mediachk
-; main menu items where user can't add boot options
-nobootoptions=harddisk,memtest
-; main menu items that are not passed an 'install' parameter
-noinstallopt=harddisk,firmware,memtest
-; default install method (one of: cdrom, slp, ftp, http, nfs, smb, hd; default: cdrom)
-install=
-; default repo location
-install.http.server=
-install.http.path=
-install.nfs.server=
-install.nfs.path=
-install.ftp.server=
-install.ftp.path=
-install.ftp.user=
-install.ftp.password=
-install.smb.server=
-install.smb.share=
-install.smb.path=
-install.smb.domain=
-install.smb.user=
-install.smb.password=
-install.hd.device=
-install.hd.path=
-; default driver update (one of: yes, no, file, url; default: no)
-dud=
-; if 'dud=file': file name on DVD
-dud.file=
-; if 'dud=url': URL
-dud.url=
-; if 'dud=url': menu item name (default = 'URL')
-dud.url.name=
-; serial line setup (up to four lines)
-; format: port,baud,dev
-;   - port: 0-3: first four BIOS serial lines (COM1-COM4); >=4: I/O port (0x3f8)
-;   - baud: baud rate (e.g. 115200); 0 = autodetect (considers baud rates >= 9600)
-;   - dev: linux device name (e.g. ttyS0)
-; - all lines are set up with 8 bits, no parity, 1 stop bit
-; - if the bootloader also has a serial line setup, the port is
-;   automatically used
-serial.line0=0,0,ttyS0
-serial.line1=1,0,ttyS1
-serial.line2=
-serial.line3=
-; show keymap menu as submenu in lang dialog
-keymap.submenu=0
-; show keymap in main menu
-keymap.mainmenu=0
-
-[boot]
-; show welcome animation
-welcome=0
-; beep when menu is ready
-beep=0
-; show keymap menu as submenu in lang dialog
-keymap.submenu=0
-; show keymap in main menu
-keymap.mainmenu=0
-

branding.spec

@@ -22,7 +22,6 @@ Release: alt1
 Url: https://ximperlinux.ru
 
 %ifarch %ix86 x86_64
-BuildRequires: gfxboot >= 4
 BuildRequires: cpio fonts-ttf-dejavu fonts-otf-abattis-cantarell
 BuildRequires: design-bootloader-source >= 5.0-alt2 fribidi
 %endif
@@ -279,7 +278,6 @@ mv %buildroot%_datadir/wallpapers/ximper/ximper.xml %buildroot%_datadir/gnome-ba
 #bootloader
 %ifarch %ix86 x86_64
 %pre bootloader
-[ -s /usr/share/gfxboot/%theme ] && rm -fr  /usr/share/gfxboot/%theme ||:
 [ -s /boot/splash/%theme ] && rm -fr  /boot/splash/%theme ||:
 %endif
 
@@ -311,7 +309,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

configure.ac

@@ -46,7 +46,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