From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 5 of 7] busybox: convert to kconfig-package infrastructure
Date: Thu, 24 Jul 2014 19:49:32 +0200 [thread overview]
Message-ID: <a850aa264c3d0ae5c61f.1406224172@localhost> (raw)
In-Reply-To: <patchbomb.1406224167@localhost>
This patch converts the busybox 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/busybox/busybox.mk | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff -r 80c907c0dfca -r a850aa264c3d package/busybox/busybox.mk
--- a/package/busybox/busybox.mk Wed Jul 23 20:12:32 2014 +0200
+++ b/package/busybox/busybox.mk Tue Jul 22 20:43:10 2014 +0200
@@ -136,10 +136,6 @@
endef
endif
-define BUSYBOX_COPY_CONFIG
- $(INSTALL) -D -m 0644 $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_BUILD_CONFIG)
-endef
-
# Disable shadow passwords support if unsupported by the C library
ifeq ($(BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS),)
define BUSYBOX_INTERNAL_SHADOW_PASSWORDS
@@ -190,8 +186,7 @@
$(SED) 's/^noclobber="0"$$/noclobber="1"/' $(@D)/applets/install.sh
endef
-define BUSYBOX_CONFIGURE_CMDS
- $(BUSYBOX_COPY_CONFIG)
+define BUSYBOX_KCONFIG_FIXUP_CMDS
$(BUSYBOX_SET_MMU)
$(BUSYBOX_SET_LARGEFILE)
$(BUSYBOX_SET_IPV6)
@@ -203,6 +198,9 @@
$(BUSYBOX_INTERNAL_SHADOW_PASSWORDS)
$(BUSYBOX_SET_INIT)
$(BUSYBOX_SET_WATCHDOG)
+endef
+
+define BUSYBOX_CONFIGURE_CMDS
@yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \
-C $(@D) oldconfig
$(BUSYBOX_NOCLOBBER_INSTALL)
@@ -226,11 +224,8 @@
$(eval $(generic-package))
-busybox-menuconfig busybox-xconfig busybox-gconfig: busybox-patch
- $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(BUSYBOX_DIR) \
- $(subst busybox-,,$@)
- rm -f $(BUSYBOX_DIR)/.stamp_built
- rm -f $(BUSYBOX_DIR)/.stamp_target_installed
+BUSYBOX_KCONFIG_FILE = $(BUSYBOX_CONFIG_FILE)
+BUSYBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig
+BUSYBOX_KCONFIG_OPT = $(BUSYBOX_MAKE_OPTS)
-busybox-update-config: busybox-configure
- cp -f $(BUSYBOX_BUILD_CONFIG) $(BUSYBOX_CONFIG_FILE)
+$(eval $(kconfig-package))
next prev 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 ` [Buildroot] [PATCH 3 of 7] uclibc: convert to kconfig-package infrastructure Thomas De Schampheleire
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 ` Thomas De Schampheleire [this message]
2014-07-24 17:49 ` [Buildroot] [PATCH 6 of 7] busybox: " 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=a850aa264c3d0ae5c61f.1406224172@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.