Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Erico Nunes <nunes.erico@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/4] grub2: introduce BR2_TARGET_GRUB2_CFG
Date: Sun, 22 Oct 2017 11:38:40 +0200	[thread overview]
Message-ID: <20171022093842.21788-3-nunes.erico@gmail.com> (raw)
In-Reply-To: <20171022093842.21788-1-nunes.erico@gmail.com>

This config can be used to provide a custom Grub 2 configuration file
containing menu entries. Previously, this had to be always done by an
external script which would overwrite the default file.
This is backwards compatible for existing configs as the default value
is the previously hardcoded value.

Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/grub2/Config.in | 7 +++++++
 boot/grub2/grub2.mk  | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in
index 9a61b3b633..e560ec8324 100644
--- a/boot/grub2/Config.in
+++ b/boot/grub2/Config.in
@@ -76,6 +76,13 @@ config BR2_TARGET_GRUB2_BUILTIN_CONFIG
 	  device and other configuration parameters, but however menu
 	  entries cannot be described in this embedded configuration.
 
+config BR2_TARGET_GRUB2_CFG
+	string "grub2 menu entries config"
+	default "boot/grub2/grub.cfg"
+	help
+	  Path to a Grub 2 configuration file containing the grub2 menu
+	  entries.
+
 endif # BR2_TARGET_GRUB2
 
 comment "grub2 needs a toolchain w/ wchar"
diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
index 492cddf1a5..a801c2cda9 100644
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -95,8 +95,9 @@ define GRUB2_IMAGE_INSTALLATION
 		-p "$(GRUB2_PREFIX)" \
 		$(if $(GRUB2_BUILTIN_CONFIG),-c $(GRUB2_BUILTIN_CONFIG)) \
 		$(GRUB2_BUILTIN_MODULES)
-	mkdir -p $(dir $(GRUB2_CFG))
-	$(INSTALL) -D -m 0644 boot/grub2/grub.cfg $(GRUB2_CFG)
+	$(if $(BR2_TARGET_GRUB2_CFG), \
+		mkdir -p $(dir $(GRUB2_CFG)) && \
+		$(INSTALL) -D -m 0644 $(BR2_TARGET_GRUB2_CFG) $(GRUB2_CFG))
 	$(GRUB2_IMAGE_INSTALL_ELTORITO)
 endef
 GRUB2_POST_INSTALL_TARGET_HOOKS += GRUB2_IMAGE_INSTALLATION
-- 
2.13.6

  parent reply	other threads:[~2017-10-22  9:38 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-22  9:38 [Buildroot] [PATCH 0/4] Refactor in pc defconfigs Erico Nunes
2017-10-22  9:38 ` [Buildroot] [PATCH 1/4] configs/pc: bump kernel version Erico Nunes
2017-10-22 10:30   ` Thomas Petazzoni
2017-10-22  9:38 ` Erico Nunes [this message]
2017-10-22  9:59   ` [Buildroot] [PATCH 2/4] grub2: introduce BR2_TARGET_GRUB2_CFG Thomas Petazzoni
2017-10-22 10:43     ` Arnout Vandecappelle
2017-10-22  9:38 ` [Buildroot] [PATCH 3/4] configs/pc: refactor to use genimage and grub.cfg Erico Nunes
2017-10-22  9:38 ` [Buildroot] [PATCH 4/4] board/pc: add documentation for testing with qemu Erico Nunes

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171022093842.21788-3-nunes.erico@gmail.com \
    --to=nunes.erico@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox