Introduction of kconfig-package

package/pkg-kconfig.mk new file +10 -0

+# The .config file is obtained by copying it from the specified source
+# configuration file, after the package has been patched.
+
+$$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) | $(1)-patch
+	$$(INSTALL) -m 0644 $$($(2)_KCONFIG_FILE) $$($(2)_DIR)/.config
+
+# In order to get a usable, consistent configuration, some fixup may be needed.
+# The exact rules are specified by the package .mk file.
+
+$$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_DIR)/.config

package/pkg-kconfig.mk new file +17 -0

+	$$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
+		$$($(2)_KCONFIG_OPT) $$(subst $(1)-,,$$@)
+	rm -f $$($(2)_DIR)/.stamp_{kconfig_fixup_done,configured,built}
+	rm -f $$($(2)_DIR)/.stamp_{target,staging}_installed
+
+# Target to copy back the configuration to the source configuration file
+
+$(1)-update-config: $$($(2)_DIR)/.stamp_kconfig_fixup_done
+	cp -f $$($(2)_DIR)/.config $$($(2)_KCONFIG_FILE)
+
+endef # inner-kconfig-package
+
+################################################################################
+# kconfig-package -- the target generator macro for kconfig packages
+################################################################################
+
+kconfig-package = $(call inner-kconfig-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)))

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

This patch adds documentation for the new kconfig-package infrastructure to the manual.

Note that due to the simplicity of the infrastructure, the documentation is not split in a 'tutorial' and a 'reference', like for the other infrastructures. Instead, the usage is described in one section.

Signed-off-by Thomas De Schampheleire <[email protected]>

---
v2: update after move to a real infrastructure

 docs/manual/adding-packages-kconfig.txt |  56 +++++++++++++++++++++++++++++
 docs/manual/adding-packages.txt         |   2 +
 2 files changed, 58 insertions(+), 0 deletions(-)

diff -r 83a2e5f2641a -r 7e76c27202ec docs/manual/adding-packages-kconfig.txt

docs/manual/adding-packages-kconfig.txt new file +3 -0

@@ -0,0 +1,56 @@
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
+

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 <[email protected]>

---
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

package/uclibc/uclibc.mk +10 -24

@@ -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

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

In analogy of linux.mk, only enable its targets (in particular the kconfig targets (menuconfig, update-config, ...) when the uclibc package is actually enabled.

Signed-off-by Thomas De Schampheleire <[email protected]>

---
v2: rebase after making kconfig-package a full infra

Note: now that kconfig-package is a full package infra (inheriting from generic-package) this may seem a bit odd, as other packages do not do this. Nevertheless, it does not hurt and will slightly improve the parsing of the Makefiles when the package is not selected.

 package/uclibc/uclibc.mk |  2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff -r 083076145a2b -r 540167f28c2d package/uclibc/uclibc.mk

package/uclibc/uclibc.mk +2 -0

@@ -539,7 +539,9 @@
 	$(UCLIBC_INSTALL_UTILS_STAGING)
 endef
 
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_UCLIBC),y)
 $(eval $(kconfig-package))
+endif
 
 # Before uClibc is built, we must have the second stage cross-compiler
 $(UCLIBC_TARGET_BUILD): | host-gcc-intermediate

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

In analogy of linux.mk, only enable its targets, in particular the kconfig targets (menuconfig, update-config, ...) when the busybox package is actually enabled.

Signed-off-by Thomas De Schampheleire <[email protected]>

---
 package/busybox/busybox.mk |  2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff -r f995a8adfa24 -r 469e4493e128 package/busybox/busybox.mk

package/busybox/busybox.mk +2 -0

@@ -226,4 +226,6 @@
 	$(BUSYBOX_INSTALL_WATCHDOG_SCRIPT)
 endef
 
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 $(eval $(kconfig-package))
+endif

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

In analogy of linux.mk, only enable its targets (in particular the kconfig targets (menuconfig, update-config, ...) when the uclibc package is actually enabled.

Signed-off-by Thomas De Schampheleire <[email protected]>

---
v2: rebase after making kconfig-package a full infra

Note: now that kconfig-package is a full package infra (inheriting from generic-package) this may seem a bit odd, as other packages do not do this. Nevertheless, it does not hurt and will slightly improve the parsing of the Makefiles when the package is not selected.

 package/uclibc/uclibc.mk |  2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff -r 083076145a2b -r 540167f28c2d package/uclibc/uclibc.mk

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 <[email protected]>

---
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

package/busybox/busybox.mk +9 -16

@@ -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))

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Thomas, All,

On 2014-07-30 21:58 +0200, Thomas De Schampheleire spake thusly:
[--SNIP--]

package/pkg-kconfig.mk Mon Jun 30 21:08:13 2014 +0200

Quoted 4 lines

diff -r 4ee2201e6e6b -r 83a2e5f2641a package/pkg-kconfig.mk

package/pkg-kconfig.mk Mon Jun 30 21:08:13 2014 +0200 renamed from dev/null Thu Jan 01 00:00:00 1970 +0000 +0 -0

@@ -0,0 +1,82 @@

[--SNIP--]

Quoted 15 lines

package/pkg-kconfig.mk Mon Jun 30 21:08:13 2014 +0200 renamed from dev/null Thu Jan 01 00:00:00 1970 +0000 +15 -0

+# The .config file is obtained by copying it from the specified source
+# configuration file, after the package has been patched.
+
+$$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) | $(1)-patch
+     $$(INSTALL) -m 0644 $$($(2)_KCONFIG_FILE) $$($(2)_DIR)/.config
+
+# In order to get a usable, consistent configuration, some fixup may be needed.
+# The exact rules are specified by the package .mk file.
+
+$$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_DIR)/.config
+     $$($(2)_KCONFIG_FIXUP_CMDS)
+     $$(Q)touch $$@
+
+# Before running configure, the configuration file should be present and fixed
+

package/pkg-kconfig.mk Mon Jun 30 21:08:13 2014 +0200 line 20

Quoted 5 lines

package/pkg-kconfig.mk Mon Jun 30 21:08:13 2014 +0200 renamed from dev/null Thu Jan 01 00:00:00 1970 +0000 +5 -0

+$$($(2)_TARGET_CONFIGURE): $$($(2)_DIR)/.stamp_kconfig_fixup_done
+
+# Configuration editors (menuconfig, ...)
+
+$$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $$($(2)_DIR)/.config

Should we not depend on .stamp_kconfig_fixup_done instead of .config, so we present to the user a .config that is already tweak to our needs?

Dear Thomas De Schampheleire,

Quoted 21 lines · Thomas De Schampheleire

In analogy of linux.mk, only enable its targets (in particular the kconfig targets (menuconfig, update-config, ...) when the uclibc package is actually enabled.

Signed-off-by Thomas De Schampheleire <[email protected]>

---
v2: rebase after making kconfig-package a full infra

Note: now that kconfig-package is a full package infra (inheriting from generic-package) this may seem a bit odd, as other packages do not do this. Nevertheless, it does not hurt and will slightly improve the parsing of the Makefiles when the package is not selected.

 package/uclibc/uclibc.mk |  2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff -r 083076145a2b -r 540167f28c2d package/uclibc/uclibc.mk

package/uclibc/uclibc.mk Wed Jul 23 20:12:32 2014 +0200 line 544

Quoted 6 lines

package/uclibc/uclibc.mk Wed Jul 23 20:12:32 2014 +0200 renamed from package/uclibc/uclibc.mk Tue Jul 22 20:35:36 2014 +0200 +2 -0

@@ -539,7 +539,9 @@
      $(UCLIBC_INSTALL_UTILS_STAGING)
 endef
 
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_UCLIBC),y)
 $(eval $(kconfig-package))
+endif

I actually don't like this that much, because I like a lot the fact that I can do "make <foo>-source" "make <foo>-extract", "make <foo>-patch" or even "make <foo>" (though this last case, for the specific situation of uClibc doesn't seem really possible).

Though it's true it can be considered a bit strange to allow "make <foo>-patch" but not "make <foo>-menuconfig".

Thomas, All,

On 2014-07-30 21:58 +0200, Thomas De Schampheleire spake thusly:

Quoted 4 lines

This patch converts the uclibc package to the new kconfig-package infrastructure, thus removing code duplication and ensuring a consistent behavior of kconfig packages.

Quoted 1 line

Signed-off-by Thomas De Schampheleire <[email protected]>

Reviewed-by "Yann E. MORIN" <[email protected]>

However, I'd suggest a small enhancement (for a future patch):
UCLIBC_KCONFIG_EDITORS = menuconfig nconfig

Quoted 7 lines

On 2014-07-30 21:58 +0200, Thomas De Schampheleire spake thusly:

Quoted 5 lines

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 <[email protected]>

Quoted 4 lines

Reviewed-by "Yann E. MORIN" <[email protected]>

However, I'd suggest a small enhancement (for a future patch):
UCLIBC_KCONFIG_EDITORS = menuconfig nconfig

Unless I'm missing something, this is not possible without patching uclibc, because their makefiles do not define any other config editor than menuconfig...

Quoted 37 lines · Thomas Petazzoni

Dear Thomas De Schampheleire,

Quoted 21 lines · Thomas De Schampheleire

In analogy of linux.mk, only enable its targets (in particular the kconfig targets (menuconfig, update-config, ...) when the uclibc package is actually enabled.

Signed-off-by Thomas De Schampheleire <[email protected]>

---
v2: rebase after making kconfig-package a full infra

Note: now that kconfig-package is a full package infra (inheriting from generic-package) this may seem a bit odd, as other packages do not do this. Nevertheless, it does not hurt and will slightly improve the parsing of the Makefiles when the package is not selected.

 package/uclibc/uclibc.mk |  2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff -r 083076145a2b -r 540167f28c2d package/uclibc/uclibc.mk

package/uclibc/uclibc.mk Wed Jul 23 20:12:32 2014 +0200 line 544

Quoted 6 lines

package/uclibc/uclibc.mk Wed Jul 23 20:12:32 2014 +0200 renamed from package/uclibc/uclibc.mk Tue Jul 22 20:35:36 2014 +0200 +2 -0

@@ -539,7 +539,9 @@
      $(UCLIBC_INSTALL_UTILS_STAGING)
 endef
 
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_UCLIBC),y)
 $(eval $(kconfig-package))
+endif

I actually don't like this that much, because I like a lot the fact that I can do "make <foo>-source" "make <foo>-extract", "make <foo>-patch" or even "make <foo>" (though this last case, for the specific situation of uClibc doesn't seem really possible).

Quoted 2 lines

Though it's true it can be considered a bit strange to allow "make <foo>-patch" but not "make <foo>-menuconfig".

I fully understand what you say. I also use that feature a lot. Given that linux added such a check around its menuconfig target (which you added by the way) and the fact that we are extracting everything in a kconfig-package infrastructure, there are three ways to proceed:
- introduce the check in each of the kconfig-based packages
- remove the check from each of the kconfig-based packages
- introduce another way in kconfig-package to only allow menuconfig when the package is selected

What is your preference here?