From patchwork Mon Jun 8 22:21:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 482028 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 8DEE414031F for ; Tue, 9 Jun 2015 08:22:16 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 981F9948D4; Mon, 8 Jun 2015 22:22:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GPOxfXLI8NRd; Mon, 8 Jun 2015 22:22:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3A8D6920AE; Mon, 8 Jun 2015 22:22:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 56DF51C0A5C for ; Mon, 8 Jun 2015 22:21:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5368F8C54A for ; Mon, 8 Jun 2015 22:21:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id d3d8W9nzzFv8 for ; Mon, 8 Jun 2015 22:21:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by whitealder.osuosl.org (Postfix) with ESMTP id D08EE8C53C for ; Mon, 8 Jun 2015 22:21:58 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 8FC682044; Tue, 9 Jun 2015 00:22:05 +0200 (CEST) Received: from localhost (AToulouse-657-1-1012-185.w83-200.abo.wanadoo.fr [83.200.214.185]) by mail.free-electrons.com (Postfix) with ESMTPSA id 5706B871; Tue, 9 Jun 2015 00:22:05 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Tue, 9 Jun 2015 00:21:39 +0200 Message-Id: <1433802108-14351-7-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1433802108-14351-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1433802108-14351-1-git-send-email-thomas.petazzoni@free-electrons.com> Cc: Thomas Petazzoni Subject: [Buildroot] [PATCHv2 06/15] fs/iso9660: get grub splash from $(TARGET_DIR) X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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" Signed-off-by: Thomas Petazzoni Acked-by: "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