From patchwork Mon Nov 11 16:47:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 290397 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 25DD72C0095 for ; Tue, 12 Nov 2013 03:48:42 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C5EB78C967; Mon, 11 Nov 2013 16:48:29 +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 c6XphXoZ58pG; Mon, 11 Nov 2013 16:48:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id D9CF58D4AE; Mon, 11 Nov 2013 16:47:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 129C11BF855 for ; Mon, 11 Nov 2013 16:47:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0E1AB8CB0E for ; Mon, 11 Nov 2013 16:47:48 +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 vcvkghRHPBig for ; Mon, 11 Nov 2013 16:47:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (top.free-electrons.com [176.31.233.9]) by whitealder.osuosl.org (Postfix) with ESMTP id 349D08CA52 for ; Mon, 11 Nov 2013 16:47:47 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 15900868; Mon, 11 Nov 2013 17:47:49 +0100 (CET) Received: from localhost (AToulouse-651-1-90-186.w90-16.abo.wanadoo.fr [90.16.209.186]) by mail.free-electrons.com (Postfix) with ESMTPSA id D03AC7CA for ; Mon, 11 Nov 2013 17:47:48 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Mon, 11 Nov 2013 17:47:32 +0100 Message-Id: <1384188459-1332-9-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1384188459-1332-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1384188459-1332-1-git-send-email-thomas.petazzoni@free-electrons.com> Subject: [Buildroot] [PATCH 08/15] grub: adjust splashimage in menu.lst depending on configuration X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net Make the splashimage line in menu.lst only active when splashimage support has really been enabled in the Grub configuration. Signed-off-by: Thomas Petazzoni --- boot/grub/grub.mk | 1 + boot/grub/menu.lst | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk index 0c2c035..f15d915 100644 --- a/boot/grub/grub.mk +++ b/boot/grub/grub.mk @@ -66,6 +66,7 @@ GRUB_CONF_OPT = \ ifeq ($(BR2_TARGET_GRUB_SPLASH),y) define GRUB_INSTALL_SPLASH cp boot/grub/splash.xpm.gz $(TARGET_DIR)/boot/grub/ + $(SED) 's/^#splashimage/splashimage/' $(TARGET_DIR)/boot/grub/menu.lst endef endif diff --git a/boot/grub/menu.lst b/boot/grub/menu.lst index 41e9b62..7845fee 100644 --- a/boot/grub/menu.lst +++ b/boot/grub/menu.lst @@ -1,6 +1,6 @@ default=0 timeout=5 -splashimage=(hd0,0)/boot/grub/splash.xpm.gz +#splashimage=(hd0,0)/boot/grub/splash.xpm.gz hiddenmenu title Buildroot root (hd0,0)