build: Install grub and plymouth themes on all arches

Makefile.in

@@ -7,7 +7,13 @@ PRODUCT_NAME=@PRODUCT_NAME@
 CODENAME=@CODENAME@
 ARCH=$(shell arch)
 
-.PHONY: graphics browser-qt ahttpd boot-images boot-splash boot indexhtml install browser-qt/design/bg.png
+.PHONY: graphics gfxboot-images browser-qt ahttpd boot-gfxboot 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
 
@@ -35,6 +41,8 @@ graphics:
 			rm -f $$i.png; \
 		done; \
 	fi
+	convert -size 16x16 -define png:color-type=2 -depth 8 xc:'#001056' grub2/selected_blob_c.png
+	convert -colorspace YCbCr -sampling-factor 2x2 images/boot.png JPEG:images/boot.jpg
 	cp -al images/boot.png images/grub.png; \
 # product logo for ahttpd
 	cp -al images/product-logo.png ahttpd/images/product-logo.png
@@ -69,14 +77,12 @@ 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:
+# 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/
-	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 \
@@ -86,9 +92,17 @@ boot-images:
 	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: boot-images
+boot-splash:
 	mkdir -p $(datadir)/plymouth/themes/$(THEME)
 	cp -al images/grub.jpg $(datadir)/plymouth/themes/$(THEME)/grub.jpg
 	# Put logo to background*x*.png
@@ -96,24 +110,18 @@ boot-splash: boot-images
 	cp -a bootsplash/* $(datadir)/plymouth/themes/$(THEME)
 	mv $(datadir)/plymouth/themes/$(THEME)/theme.plymouth $(datadir)/plymouth/themes/$(THEME)/$(THEME).plymouth
 	rm -f $(datadir)/plymouth/themes/$(THEME)/*.in
-#bootloader
-boot: 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)
+
 #grub2
-	convert -size 16x16 -define png:color-type=2 -depth 8 xc:'#001056' grub2/selected_blob_c.png
+boot-grub:
 	install -d -m 755  $(sysconfdir)/../boot/grub/themes/$(THEME)
 	cp -a grub2/* $(sysconfdir)/../boot/grub/themes/$(THEME)/
 	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-images: ; @:
+boot: boot-splash boot-grub
 endif
 
 INDEXHTML_DIR=$(datadir)/doc/indexhtml
@@ -128,9 +136,7 @@ indexhtml:
 	done
 	install -Dpm644 indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop
 
-all: graphics
-
-install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml
+install: browser-qt ahttpd boot indexhtml
 	# install product icon
 #	for size in 16 22 24 32 48 64 128; do \
 #	    install -Dm 0644 icons/alt-$(THEME)-$$size.png $(datadir)/icons/hicolor/$${size}x$${size}/apps/alt-$(THEME).png; \

branding.spec

@@ -205,15 +205,9 @@ Requires(post): indexhtml-common
 %prep
 %setup -n branding
 
-%ifnarch %arm
-%define x86 boot
-%else
-%define x86 %nil
-%endif
-
 %build
 autoconf
-THEME=%theme NAME='%Brand %Theme' BRAND_FNAME='%brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version PRODUCT_NAME_RU='%distro_name_ru' PRODUCT_NAME='%distro_name' CODENAME='%codename' X86='%x86' ./configure
+THEME=%theme NAME='%Brand %Theme' BRAND_FNAME='%brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version PRODUCT_NAME_RU='%distro_name_ru' PRODUCT_NAME='%distro_name' CODENAME='%codename' ./configure
 make
 
 %install

configure.ac

@@ -37,7 +37,6 @@ AC_SUBST(LIGHT_COLOR_DEC)
 AC_SUBST(MIDDLE_COLOR_DEC)
 AC_SUBST(DARK_COLOR_DEC)
 AC_SUBST(TITLE_COLOR)
-AC_SUBST(X86)
 
 AC_CONFIG_FILES([
 	 Makefile