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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index 54b16530efbc9110b568c56616a59e6f26913cc4..b3e6b9dbaac2610b3b5e85084b68cc746ca6add1 100644 (file)
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -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

diff --git a/fs/iso9660/menu.lst b/fs/iso9660/menu.lst
index c0bbff6928d237d0c55a709234b5012ead3c10a2..fd5c76aec6a3405618e4f5b4fda59815c3309556 100644 (file)
--- a/fs/iso9660/menu.lst
+++ b/fs/iso9660/menu.lst
@@ -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