Build bootloader and bootsplash for all supported ARCHs

Makefile.in

@@ -5,6 +5,7 @@ NAME=@NAME@
 VERSION=@VERSION@
 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 hidden-menu-entries
 
@@ -68,6 +69,7 @@ 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 ./
@@ -108,6 +110,11 @@ boot: boot-images
 	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
+else
+boot: ; @:
+boot-splash: ; @:
+boot-images: ; @:
+endif
 
 INDEXHTML_DIR=$(datadir)/doc/indexhtml
 indexhtml:

branding.spec

@@ -21,10 +21,11 @@
 Name: branding-%flavour
 Version: 8.90
 Release: alt1
-BuildArch: noarch
-ExclusiveArch: %ix86 x86_64
 
-BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu fonts-ttf-google-droid-sans
+%ifarch %ix86 x86_64
+BuildRequires: gfxboot >= 4
+%endif
+BuildRequires: cpio fonts-ttf-dejavu fonts-ttf-google-droid-sans
 BuildRequires: design-bootloader-source >= 5.0-alt2
 
 BuildRequires(pre): rpm-macros-branding
@@ -70,7 +71,6 @@ Suitable for both lilo and syslinux.
 для дистрибутива %distro_name_ru.
 
 %package bootsplash
-BuildArch: noarch
 Summary:  Theme for splash animations during bootup
 Summary(ru_RU.UTF-8): Тема для экрана загрузки для дистрибутива %distro_name_ru
 License:  Distributable
@@ -94,6 +94,7 @@ Summary: Design for alterator for %distro_name
 Summary(ru_RU.UTF-8): Тема для "Центра управления системой" и QT для дистрибутива %distro_name_ru
 License: GPL
 Group: System/Configuration/Other
+BuildArch: noarch
 Provides: design-alterator-browser-%theme  branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt
 Provides: alterator-icons design-alterator design-alterator-%theme
 Obsoletes:  branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt 
@@ -114,7 +115,7 @@ Summary: Design for %distro_name
 Summary(ru_RU.UTF-8): Тема для дистрибутива %distro_name_ru
 License: Different licenses
 Group: Graphics
-
+BuildArch: noarch
 Provides: design-graphics-%theme  branding-alt-%theme-graphics
 Obsoletes:  branding-alt-%theme-graphics design-graphics-%theme
 Provides: design-graphics = %design_graphics_abi_major.%design_graphics_abi_minor.%design_graphics_abi_bugfix
@@ -133,6 +134,7 @@ This package contains some graphics for %distro_name design.
 %define obsolete_list altlinux-release fedora-release redhat-release
 
 %package release
+BuildArch: noarch
 Summary:  %distro_name release file
 Summary(ru_RU.UTF-8): Описание дистрибутива %distro_name_ru
 License:  GPL
@@ -184,6 +186,7 @@ Obsoletes: branding-%flavour-kde4-settings < %version-%release
 KDE settings for %distro_name (for KDE4 and KF5)
 
 %package xfce-settings
+BuildArch: noarch
 Summary: Default settings for XFCE for %distro_name
 License: Distributable
 Group: Graphical desktop/XFce
@@ -245,9 +248,8 @@ Summary: Slideshow for %distro_name installer
 Summary(ru_RU.UTF-8): Изображения для организации "слайдшоу" в установщике дистрибутива %distro_name_ru
 License: Distributable
 Group: System/Configuration/Other 
-%branding_add_conflicts %flavour slideshow
-
 BuildArch: noarch
+%branding_add_conflicts %flavour slideshow
 
 %description slideshow
 Slideshow for %distro_name installer.
@@ -279,6 +281,7 @@ Requires(post): indexhtml-common
 %distro_name_ru.
 
 %package menu
+BuildArch: noarch
 Summary: Menu for %distro_name
 License: Distributable
 Group: Graphical desktop/Other
@@ -290,6 +293,7 @@ Requires: altlinux-freedesktop-menu-common
 Menu for %distro_name
 
 %package system-settings
+BuildArch: noarch
 Summary: Some system settings for Simply Linux
 License: GPLv2+
 Group: System/Base
@@ -319,11 +323,14 @@ make
 find %buildroot -name \*.in -delete
 
 #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
 
 %post bootloader
+%ifarch %ix86 x86_64
 %__ln_s -nf %theme/message /boot/splash/message
 . /etc/sysconfig/i18n
 lang=$(echo $LANG | cut -d. -f 1)
@@ -335,11 +342,14 @@ shell_config_set /etc/sysconfig/grub2 GRUB_THEME /boot/grub/themes/%theme/theme.
 #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
 %preun bootloader
 [ $1 = 0 ] || exit 0
 [ "`readlink /boot/splash/message`" != "%theme/message" ] ||
     %__rm -f /boot/splash/message
+%endif
 
 %post indexhtml
 %_sbindir/indexhtml-update
@@ -352,16 +362,20 @@ sed -i '/pam_env\.so/ {
 ' %_sysconfdir/pam.d/lightdm-greeter
 
 %files bootloader
+%ifarch %ix86 x86_64
 %_datadir/gfxboot/%theme
 /boot/splash/%theme
 /boot/grub/themes/%theme
+%endif
 
 #bootsplash
 %post bootsplash
+%ifarch %ix86 x86_64
 subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 [ -f /etc/sysconfig/grub2 ] && \
       subst "s|GRUB_WALLPAPER=.*|GRUB_WALLPAPER=/usr/share/plymouth/themes/%theme/grub.jpg|" \
              /etc/sysconfig/grub2 ||:
+%endif
 
 %post mate-settings
 subst 's/^#\?theme-name=.*/theme-name=%gtk_theme/' /etc/lightdm/lightdm-gtk-greeter.conf ||:
@@ -385,7 +399,9 @@ subst 's/^#\?icon-theme-name=.*/icon-theme-name=%icon_theme/' /etc/lightdm/light
 %endif
 
 %files bootsplash
+%ifarch %ix86 x86_64
 %_datadir/plymouth/themes/%theme/*
+%endif
 
 %files release
 %_sysconfdir/*-release