From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 3 of 6 v2] uclibc: convert to kconfig-package infrastructure
Date: Wed, 30 Jul 2014 21:58:04 +0200 [thread overview]
Message-ID: <083076145a2b191e2b6a.1406750284@localhost> (raw)
In-Reply-To: <patchbomb.1406750281@localhost>
This patch converts the uclibc package to the new kconfig-package
infrastructure, thus removing code duplication and ensuring a consistent
behavior of kconfig packages.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: kconfig-package is now a real package infrastructure, so remove call
to generic-package
package/uclibc/uclibc.mk | 34 ++++++++++------------------------
1 files changed, 10 insertions(+), 24 deletions(-)
diff -r 7e76c27202ec -r 083076145a2b package/uclibc/uclibc.mk
--- a/package/uclibc/uclibc.mk Thu Jul 24 20:54:50 2014 +0200
+++ b/package/uclibc/uclibc.mk Tue Jul 22 20:35:36 2014 +0200
@@ -37,6 +37,14 @@
UCLIBC_CONFIG_FILE = $(call qstrip,$(BR2_UCLIBC_CONFIG))
endif
+UCLIBC_KCONFIG_FILE = $(UCLIBC_CONFIG_FILE)
+
+UCLIBC_KCONFIG_OPT = \
+ $(UCLIBC_MAKE_FLAGS) \
+ PREFIX=$(STAGING_DIR) \
+ DEVEL_PREFIX=/usr/ \
+ RUNTIME_PREFIX=$(STAGING_DIR)/ \
+
UCLIBC_TARGET_ARCH = $(call qstrip,$(BR2_UCLIBC_TARGET_ARCH))
ifeq ($(GENERATE_LOCALE),)
@@ -393,7 +401,7 @@
UCLIBC_EXTRA_CFLAGS="$(UCLIBC_EXTRA_CFLAGS) $(TARGET_ABI)" \
HOSTCC="$(HOSTCC)"
-define UCLIBC_FIXUP_DOT_CONFIG
+define UCLIBC_KCONFIG_FIXUP_CMDS
$(call KCONFIG_SET_OPT,CROSS_COMPILER_PREFIX,"$(TARGET_CROSS)",$(@D)/.config)
$(call KCONFIG_ENABLE_OPT,TARGET_$(UCLIBC_TARGET_ARCH),$(@D)/.config)
$(call KCONFIG_SET_OPT,TARGET_ARCH,"$(UCLIBC_TARGET_ARCH)",$(@D)/.config)
@@ -531,29 +539,7 @@
$(UCLIBC_INSTALL_UTILS_STAGING)
endef
-$(eval $(generic-package))
-
-$(UCLIBC_DIR)/.config: $(UCLIBC_CONFIG_FILE) | uclibc-patch
- $(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.config
-
-$(UCLIBC_DIR)/.stamp_config_fixup_done: $(UCLIBC_DIR)/.config
- $(UCLIBC_FIXUP_DOT_CONFIG)
- $(Q)touch $@
-
-$(UCLIBC_TARGET_CONFIGURE): $(UCLIBC_DIR)/.stamp_config_fixup_done
-
-uclibc-menuconfig: $(UCLIBC_DIR)/.config
- $(MAKE) -C $(UCLIBC_DIR) \
- $(UCLIBC_MAKE_FLAGS) \
- PREFIX=$(STAGING_DIR) \
- DEVEL_PREFIX=/usr/ \
- RUNTIME_PREFIX=$(STAGING_DIR)/ \
- menuconfig
- rm -f $(UCLIBC_DIR)/.stamp_{config_fixup_done,configured,built}
- rm -f $(UCLIBC_DIR)/.stamp_{target,staging}_installed
-
-uclibc-update-config: $(UCLIBC_DIR)/.stamp_config_fixup_done
- cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE)
+$(eval $(kconfig-package))
# Before uClibc is built, we must have the second stage cross-compiler
$(UCLIBC_TARGET_BUILD): | host-gcc-intermediate
next prev parent reply other threads:[~2014-07-30 19:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-30 19:58 [Buildroot] [PATCH 0 of 6 v2] Introduction of kconfig-package Thomas De Schampheleire
2014-07-30 19:58 ` [Buildroot] [PATCH 1 of 6 v2] infra: introduce a kconfig-package infrastructure Thomas De Schampheleire
2014-07-31 20:42 ` Yann E. MORIN
2014-08-01 19:22 ` Thomas De Schampheleire
2014-07-30 19:58 ` [Buildroot] [PATCH 2 of 6 v2] manual: add documentation for kconfig-package Thomas De Schampheleire
2014-07-31 21:03 ` Yann E. MORIN
2014-07-30 19:58 ` Thomas De Schampheleire [this message]
2014-07-31 21:07 ` [Buildroot] [PATCH 3 of 6 v2] uclibc: convert to kconfig-package infrastructure Yann E. MORIN
2014-08-01 19:42 ` Thomas De Schampheleire
2014-08-01 20:21 ` Yann E. MORIN
2014-07-30 19:58 ` [Buildroot] [PATCH 4 of 6 v2] uclibc: only add targets if uclibc is enabled Thomas De Schampheleire
2014-07-31 21:08 ` Yann E. MORIN
2014-07-31 21:13 ` Thomas Petazzoni
2014-08-01 19:37 ` Thomas De Schampheleire
2014-08-01 20:38 ` Yann E. MORIN
2014-07-30 19:58 ` [Buildroot] [PATCH 5 of 6 v2] busybox: convert to kconfig-package infrastructure Thomas De Schampheleire
2014-07-31 21:53 ` Yann E. MORIN
2014-07-30 19:58 ` [Buildroot] [PATCH 6 of 6 v2] busybox: only add kconfig targets if uclibc is enabled Thomas De Schampheleire
2014-07-31 21:12 ` Yann E. MORIN
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=083076145a2b191e2b6a.1406750284@localhost \
--to=patrickdepinguin@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