From: Romain Izard <romain.izard.pro@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v4 1/3] core/pkg-kconfig: Factorize make commands
Date: Mon, 18 Apr 2016 11:23:01 +0200 [thread overview]
Message-ID: <1460971383-10595-2-git-send-email-romain.izard.pro@gmail.com> (raw)
In-Reply-To: <1460971383-10595-1-git-send-email-romain.izard.pro@gmail.com>
Use a variable to factorize the calls to make, as we use the same set
of options multiple times.
Signed-off-by: Romain Izard <romain.izard.pro@gmail.com>
---
Changelog:
v3: new
v4: fix commit message
package/pkg-kconfig.mk | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
index 94ec3cc..cb177bb 100644
--- a/package/pkg-kconfig.mk
+++ b/package/pkg-kconfig.mk
@@ -57,6 +57,9 @@ $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES): | $(1)-patch
fi; \
done
+$(2)_KCONFIG_MAKE = \
+ $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) $$($(2)_KCONFIG_OPTS)
+
# The specified source configuration file and any additional configuration file
# fragments are merged together to .config, after the package has been patched.
# Since the file could be a defconfig file it needs to be expanded to a
@@ -64,13 +67,11 @@ $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES): | $(1)-patch
# done even when the package does not support defconfigs.
$$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES)
$$(Q)$$(if $$($(2)_KCONFIG_DEFCONFIG), \
- $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
- $$($(2)_KCONFIG_OPTS) $$($(2)_KCONFIG_DEFCONFIG), \
+ $$($(2)_KCONFIG_MAKE) $$($(2)_KCONFIG_DEFCONFIG), \
cp $$($(2)_KCONFIG_FILE) $$(@))
$$(Q)support/kconfig/merge_config.sh -m -O $$(@D) \
$$(@) $$($(2)_KCONFIG_FRAGMENT_FILES)
- $$(Q)yes "" | $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
- $$($(2)_KCONFIG_OPTS) oldconfig
+ $$(Q)yes "" | $$($(2)_KCONFIG_MAKE) oldconfig
# If _KCONFIG_FILE or _KCONFIG_FRAGMENT_FILES exists, this dependency is
# already implied, but if we only have a _KCONFIG_DEFCONFIG we have to add
@@ -81,8 +82,7 @@ $$($(2)_DIR)/.config: | $(1)-patch
# The exact rules are specified by the package .mk file.
define $(2)_FIXUP_DOT_CONFIG
$$($(2)_KCONFIG_FIXUP_CMDS)
- $$(Q)yes "" | $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
- $$($(2)_KCONFIG_OPTS) oldconfig
+ $$(Q)yes "" | $$($(2)_KCONFIG_MAKE) oldconfig
$$(Q)touch $$($(2)_DIR)/.stamp_kconfig_fixup_done
endef
--
2.5.0
next prev parent reply other threads:[~2016-04-18 9:23 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-18 9:23 [Buildroot] [PATCH v4 0/3] core/pkg-kconfig: Fix .config generation Romain Izard
2016-04-18 9:23 ` Romain Izard [this message]
2016-04-18 20:32 ` [Buildroot] [PATCH v4 1/3] core/pkg-kconfig: Factorize make commands Yann E. MORIN
2016-04-18 21:17 ` Thomas Petazzoni
2016-04-18 9:23 ` [Buildroot] [PATCH v4 2/3] core/pkg-kconfig: Do not use $(call ...) without parameters Romain Izard
2016-04-18 20:33 ` Yann E. MORIN
2016-04-18 21:17 ` Thomas Petazzoni
2016-04-18 9:23 ` [Buildroot] [PATCH v4 3/3] core/pkg-kconfig: Use oldnoconfig when possible Romain Izard
2016-04-18 21:08 ` Yann E. MORIN
2016-04-18 21:16 ` Yann E. MORIN
2016-04-19 9:11 ` Romain Izard
2016-04-19 17:40 ` Yann E. MORIN
2016-04-19 17:58 ` Yann E. MORIN
2016-04-20 7:14 ` Romain Izard
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=1460971383-10595-2-git-send-email-romain.izard.pro@gmail.com \
--to=romain.izard.pro@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