| Message ID | 1433802108-14351-7-git-send-email-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted |
| Headers | show |
Thomas, All, On 2015-06-09 00:21 +0200, Thomas Petazzoni spake thusly: > Instead of using directly the splash image from the Buildroot source > directory boot/grub, this commit changes the iso9660 logic to use the > splash image installed in $(TARGET_DIR)/boot/grub. > > This effectively allows a user to use a custom splash image by > installing it to $(TARGET_DIR) through a rootfs overlay or using a > post-build script. > > Suggested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Regards, Yann E. MORIN. > --- > fs/iso9660/iso9660.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk > index b3e6b9d..b313c65 100644 > --- a/fs/iso9660/iso9660.mk > +++ b/fs/iso9660/iso9660.mk > @@ -11,7 +11,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 \ > + $(INSTALL) -D -m 0644 $(TARGET_DIR)/boot/grub/splash.xpm.gz \ > $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/splash.xpm.gz > endef > else > -- > 2.1.0 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk index b3e6b9d..b313c65 100644 --- a/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk @@ -11,7 +11,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 \ + $(INSTALL) -D -m 0644 $(TARGET_DIR)/boot/grub/splash.xpm.gz \ $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/splash.xpm.gz endef else
Instead of using directly the splash image from the Buildroot source directory boot/grub, this commit changes the iso9660 logic to use the splash image installed in $(TARGET_DIR)/boot/grub. This effectively allows a user to use a custom splash image by installing it to $(TARGET_DIR) through a rootfs overlay or using a post-build script. Suggested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- fs/iso9660/iso9660.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)