From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 5 of 6 v2] busybox: convert to kconfig-package infrastructure
Date: Wed, 30 Jul 2014 21:58:06 +0200 [thread overview]
Message-ID: <f995a8adfa241295acee.1406750286@localhost> (raw)
In-Reply-To: <patchbomb.1406750281@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>
---
v2: rebase after making kconfig-package a full infra
package/busybox/busybox.mk | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff -r 540167f28c2d -r f995a8adfa24 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
@@ -45,6 +45,10 @@
BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
endif
+BUSYBOX_KCONFIG_FILE = $(BUSYBOX_CONFIG_FILE)
+BUSYBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig
+BUSYBOX_KCONFIG_OPT = $(BUSYBOX_MAKE_OPTS)
+
define BUSYBOX_PERMISSIONS
/bin/busybox f 4755 0 0 - - - - -
/usr/share/udhcpc/default.script f 755 0 0 - - - - -
@@ -136,10 +140,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 +190,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 +202,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)
@@ -224,13 +226,4 @@
$(BUSYBOX_INSTALL_WATCHDOG_SCRIPT)
endef
-$(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-update-config: busybox-configure
- cp -f $(BUSYBOX_BUILD_CONFIG) $(BUSYBOX_CONFIG_FILE)
+$(eval $(kconfig-package))
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 ` [Buildroot] [PATCH 3 of 6 v2] uclibc: convert to kconfig-package infrastructure Thomas De Schampheleire
2014-07-31 21:07 ` 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 ` Thomas De Schampheleire [this message]
2014-07-31 21:53 ` [Buildroot] [PATCH 5 of 6 v2] busybox: convert to kconfig-package infrastructure 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=f995a8adfa241295acee.1406750286@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