Commit 61db081c authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

fs/iso9660: change the location of the splash image 



In order to simplify the introduction of the support for using ISO9660
as the real root filesystem, this commit changes the location of the
grub splash image. This makes it match where the splash image is
located in $(TARGET_DIR), so that regardless of whether the
initrd/initramfs solution or the real iso9660 filesystem solution are
used, the splash image is installed at the same location.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarSamuel Martin <s.martin49@gmail.com>
Acked-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
parent 0cfc57a8

fs/iso9660/iso9660.mk

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ ROOTFS_ISO9660_DEPENDENCIES = grub host-cdrkit host-fakeroot linux rootfs-cpio 
ifeq ($(BR2_TARGET_GRUB_SPLASH),y)

define ROOTFS_ISO9660_SPLASHSCREEN

	$(INSTALL) -D -m 0644 boot/grub/splash.xpm.gz \

		$(ROOTFS_ISO9660_TARGET_DIR)/splash.xpm.gz

		$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/splash.xpm.gz

endef

else

define ROOTFS_ISO9660_SPLASHSCREEN

fs/iso9660/menu.lst

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ timeout 10 
color 		cyan/blue white/blue



# Gets enabled/disabled depending on Grub support for splashimage

splashimage	/splash.xpm.gz

splashimage	/boot/grub/splash.xpm.gz



# Used when a splashimage is enabled

foreground 	000000