Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 3 of 7] uclibc: convert to kconfig-package infrastructure
Date: Thu, 24 Jul 2014 19:49:30 +0200	[thread overview]
Message-ID: <ec98df5449b08309c4e8.1406224170@localhost> (raw)
In-Reply-To: <patchbomb.1406224167@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>

---
 package/uclibc/uclibc.mk |  21 ++++-----------------
 1 files changed, 4 insertions(+), 17 deletions(-)

diff -r 7c00a2ad3724 -r ec98df5449b0 package/uclibc/uclibc.mk
--- a/package/uclibc/uclibc.mk	Wed Jul 23 21:12:48 2014 +0200
+++ b/package/uclibc/uclibc.mk	Tue Jul 22 20:35:36 2014 +0200
@@ -393,7 +393,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)
@@ -533,27 +533,14 @@
 
 $(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_KCONFIG_FILE = $(UCLIBC_CONFIG_FILE)
+UCLIBC_KCONFIG_OPT = \
 		$(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

  parent reply	other threads:[~2014-07-24 17:49 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-24 17:49 [Buildroot] [PATCH 0 of 7] Introduction of kconfig-package infrastructure Thomas De Schampheleire
2014-07-24 17:49 ` [Buildroot] [PATCH 1 of 7] infra: introduce a " Thomas De Schampheleire
2014-07-24 17:49 ` [Buildroot] [PATCH 2 of 7] uclibc: use $(MAKE) iso $(MAKE1) for menuconfig target Thomas De Schampheleire
2014-07-24 17:49 ` Thomas De Schampheleire [this message]
2014-07-24 17:49 ` [Buildroot] [PATCH 4 of 7] uclibc: only add kconfig targets if uclibc is enabled Thomas De Schampheleire
2014-07-24 17:49 ` [Buildroot] [PATCH 5 of 7] busybox: convert to kconfig-package infrastructure Thomas De Schampheleire
2014-07-24 17:49 ` [Buildroot] [PATCH 6 of 7] busybox: only add kconfig targets if uclibc is enabled Thomas De Schampheleire
2014-07-24 17:49 ` [Buildroot] [PATCH 7 of 7] linux: remove support of linux26-* targets Thomas De Schampheleire
2014-07-29 21:52 ` [Buildroot] [PATCH 0 of 7] Introduction of kconfig-package infrastructure Thomas Petazzoni
2014-07-30 17:58   ` Thomas De Schampheleire
2014-07-30 19:23     ` Thomas Petazzoni
2014-07-30 20:01       ` Thomas De Schampheleire
2014-07-31  6:57 ` Jeremy Rosen
2014-07-31  8:03   ` Thomas De Schampheleire
2014-07-31  8:20     ` Jeremy Rosen
2014-07-31 12:54       ` Matthew Weber

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=ec98df5449b08309c4e8.1406224170@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