[Buildroot] [PATCH 0 of 6] uclibc: fix handling of configuration file

[Buildroot] [PATCH 0 of 6] uclibc: fix handling of configuration file

[Thomas De Schampheleire]

This patch series (part of it poster earlier as RFC) has as main goal to
fix the uclibc kconfig handling with following requirements in mind:

- neither foo-menuconfig nor foo-update-config should have a dependency
  on the toolchain (which means we cannot depend on foo-configure)

- 'clean foo-menuconfig' should start from the specified (custom) config
  file

- 'foo-menuconfig foo-update-config' should preserve the changes made in
  the menuconfig step (this problem is reported for uclibc with bug #7154
  (https://bugs.busybox.net/show_bug.cgi?id=7154).

- 'make foo-menuconfig; make foo-menuconfig' should preserve the changes
  made in the menuconfig step.

- 'make clean foo-update-config' should copy the initial file, do any
  fixups, and then save the config


In the process, some smaller changes are done too.

Once this series is accepted, the plan is:
- to extract the kconfig-related bits to a kconfig-package infrastructure.
- to convert busybox, linux and barebox to this kconfig-package infra too.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

---
Thomas De Schampheleire (6):
    pkg-utils: kconfig helpers: add basic usage documentation
    pkg-utils: kconfig helpers: use single iso double quoting
    uclibc: replace custom kconfig helpers with those provided by pkg-utils
    uclibc: rename SETUP_DOT_CONFIG to FIXUP_DOT_CONFIG
    uclibc: menuconfig: take into account initial settings from config file
    uclibc: update-config: preserve freshly configured settings


 linux/linux.mk           |    2 +-
 package/pkg-utils.mk     |   12 +-
 package/uclibc/uclibc.mk |  230 ++++++++++++++++++--------------------
 3 files changed, 119 insertions(+), 125 deletions(-)

[Buildroot] [PATCH 1 of 6] pkg-utils: kconfig helpers: add basic usage documentation

[Thomas De Schampheleire]

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

---
 package/pkg-utils.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -r 7c17407eb26e -r 4a53bf323d8a package/pkg-utils.mk
--- a/package/pkg-utils.mk	Sat Jul 12 14:41:41 2014 -0300
+++ b/package/pkg-utils.mk	Wed Jul 09 20:27:38 2014 +0200
@@ -33,17 +33,17 @@
 # package, and more.
 #
 
-define KCONFIG_ENABLE_OPT
+define KCONFIG_ENABLE_OPT # (option, file)
 	$(SED) "/\\<$(1)\\>/d" $(2)
 	echo "$(1)=y" >> $(2)
 endef
 
-define KCONFIG_SET_OPT
+define KCONFIG_SET_OPT # (option, value, file)
 	$(SED) "/\\<$(1)\\>/d" $(3)
 	echo "$(1)=$(2)" >> $(3)
 endef
 
-define KCONFIG_DISABLE_OPT
+define KCONFIG_DISABLE_OPT # (option, file)
 	$(SED) "/\\<$(1)\\>/d" $(2)
 	echo "# $(1) is not set" >> $(2)
 endef

[Buildroot] [PATCH 2 of 6] pkg-utils: kconfig helpers: use single iso double quoting

[Thomas De Schampheleire]

The echo statements in the kconfig helpers are currently using double
quotes. For KCONFIG_SET_OPT this is problematic when the value argument
itself contains a double quote (a string value). In this case, the statement
    echo "$(1)=$(2)" >> $(3)
would become:
    echo "FOO="string value"" >> /some/path/.config
resulting in the string
    FOO=string value
in the config file, rather than the properly quoted
    FOO="string value"

The linux package worked around this by escaping the quote characters, but
a prettier solution is to use single quoting in the helpers (or
alternatively use no quoting at all).
A side effect of this change is that a $variable in the key or value would
no longer be interpreted by the shell, removing any unexpected behavior.

This change is only really necessary for KCONFIG_SET_OPT, but for symmetry
reasons the other helpers are updated too.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

---
 linux/linux.mk       |  2 +-
 package/pkg-utils.mk |  6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff -r 4a53bf323d8a -r 53e04c0bd837 linux/linux.mk
--- a/linux/linux.mk	Wed Jul 09 20:27:38 2014 +0200
+++ b/linux/linux.mk	Sun Jul 13 09:34:05 2014 +0200
@@ -180,7 +180,7 @@
 	# rebuilt using the linux26-rebuild-with-initramfs target.
 	$(if $(BR2_TARGET_ROOTFS_INITRAMFS),
 		touch $(BINARIES_DIR)/rootfs.cpio
-		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.cpio\",$(@D)/.config)
+		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,"$(BINARIES_DIR)/rootfs.cpio",$(@D)/.config)
 		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0,$(@D)/.config)
 		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config))
 	$(if $(BR2_ROOTFS_DEVICE_CREATION_STATIC),,
diff -r 4a53bf323d8a -r 53e04c0bd837 package/pkg-utils.mk
--- a/package/pkg-utils.mk	Wed Jul 09 20:27:38 2014 +0200
+++ b/package/pkg-utils.mk	Sun Jul 13 09:34:05 2014 +0200
@@ -35,17 +35,17 @@
 
 define KCONFIG_ENABLE_OPT # (option, file)
 	$(SED) "/\\<$(1)\\>/d" $(2)
-	echo "$(1)=y" >> $(2)
+	echo '$(1)=y' >> $(2)
 endef
 
 define KCONFIG_SET_OPT # (option, value, file)
 	$(SED) "/\\<$(1)\\>/d" $(3)
-	echo "$(1)=$(2)" >> $(3)
+	echo '$(1)=$(2)' >> $(3)
 endef
 
 define KCONFIG_DISABLE_OPT # (option, file)
 	$(SED) "/\\<$(1)\\>/d" $(2)
-	echo "# $(1) is not set" >> $(2)
+	echo '# $(1) is not set' >> $(2)
 endef
 
 # Helper functions to determine the name of a package and its

[Buildroot] [PATCH 3 of 6] uclibc: replace custom kconfig helpers with those provided by pkg-utils

[Thomas De Schampheleire]

This patch removes the custom kconfig helpers UCLIBC_OPT_SET and
UCLIBC_OPT_UNSET with the common KCONFIG_SET_OPT, KCONFIG_ENABLE_OPT and
KCONFIG_DISABLE_OPT.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

---
 package/uclibc/uclibc.mk |  208 ++++++++++++++++++--------------------
 1 files changed, 97 insertions(+), 111 deletions(-)

diff -r 53e04c0bd837 -r 0b5a6fcf97ef package/uclibc/uclibc.mk
--- a/package/uclibc/uclibc.mk	Sun Jul 13 09:34:05 2014 +0200
+++ b/package/uclibc/uclibc.mk	Wed Jul 09 20:45:46 2014 +0200
@@ -49,27 +49,13 @@
 endif
 
 #
-# Utility functions to manipulation the uClibc configuration file
-#
-
-define UCLIBC_OPT_SET
-	$(SED) '/$(1)/d' $(3)/.config
-	echo '$(1)=$(2)' >> $(3)/.config
-endef
-
-define UCLIBC_OPT_UNSET
-	$(SED) '/$(1)/d' $(2)/.config
-	echo '# $(1) is not set' >> $(2)/.config
-endef
-
-#
 # ARM definitions
 #
 
 ifeq ($(UCLIBC_TARGET_ARCH),arm)
 define UCLIBC_ARM_ABI_CONFIG
 	$(SED) '/CONFIG_ARM_.ABI/d' $(@D)/.config
-	$(call UCLIBC_OPT_SET,CONFIG_ARM_EABI,y,$(@D))
+	$(call KCONFIG_ENABLE_OPT,CONFIG_ARM_EABI,$(@D)/.config)
 endef
 
 # Thumb build is broken with threads, build in ARM mode
@@ -79,11 +65,11 @@
 
 ifeq ($(BR2_UCLIBC_ARM_BX),y)
 define UCLIBC_ARM_BX_CONFIG
-	$(call UCLIBC_OPT_SET,USE_BX,y,$(@D))
+	$(call KCONFIG_ENABLE_OPT,USE_BX,$(@D)/.config)
 endef
 else
 define UCLIBC_ARM_BX_CONFIG
-	$(call UCLIBC_OPT_UNSET,USE_BX,$(@D))
+	$(call KCONFIG_DISABLE_OPT,USE_BX,$(@D)/.config)
 endef
 endif
 
@@ -97,13 +83,13 @@
 UCLIBC_MIPS_ABI = CONFIG_MIPS_$(call qstrip,$(BR2_UCLIBC_MIPS_ABI))_ABI
 define UCLIBC_MIPS_ABI_CONFIG
 	$(SED) '/CONFIG_MIPS_[NO].._ABI/d' $(@D)/.config
-	$(call UCLIBC_OPT_SET,$(UCLIBC_MIPS_ABI),y,$(@D))
+	$(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_ABI),$(@D)/.config)
 endef
 
 UCLIBC_MIPS_ISA = CONFIG_MIPS_ISA_$(call qstrip,$(BR2_UCLIBC_MIPS_ISA))
 define UCLIBC_MIPS_ISA_CONFIG
 	$(SED) '/CONFIG_MIPS_ISA_.*/d' $(@D)/.config
-	$(call UCLIBC_OPT_SET,$(UCLIBC_MIPS_ISA),y,$(@D))
+	$(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_ISA),$(@D)/.config)
 endef
 endif # mips
 
@@ -115,7 +101,7 @@
 UCLIBC_SH_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_SH_TYPE))
 define UCLIBC_SH_TYPE_CONFIG
 	$(SED) '/CONFIG_SH[234A]*/d' $(@D)/.config
-	$(call UCLIBC_OPT_SET,$(UCLIBC_SH_TYPE),y,$(@D))
+	$(call KCONFIG_ENABLE_OPT,$(UCLIBC_SH_TYPE),$(@D)/.config)
 endef
 endif # sh
 
@@ -128,7 +114,7 @@
 define UCLIBC_SPARC_TYPE_CONFIG
 	$(SED) 's/^\(CONFIG_[^_]*[_]*SPARC[^=]*\)=.*/# \1 is not set/g' \
 		 $(@D)/.config
-	$(call UCLIBC_OPT_SET,$(UCLIBC_SPARC_TYPE),y,$(@D))
+	$(call KCONFIG_ENABLE_OPT,$(UCLIBC_SPARC_TYPE),$(@D)/.config)
 endef
 endif # sparc
 
@@ -139,9 +125,9 @@
 ifeq ($(UCLIBC_TARGET_ARCH),powerpc)
 UCLIBC_POWERPC_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_POWERPC_TYPE))
 define UCLIBC_POWERPC_TYPE_CONFIG
-	$(call UCLIBC_OPT_UNSET,CONFIG_GENERIC,$(@D))
-	$(call UCLIBC_OPT_UNSET,CONFIG_E500,$(@D))
-	$(call UCLIBC_OPT_SET,$(UCLIBC_POWERPC_TYPE),y,$(@D))
+	$(call KCONFIG_DISABLE_OPT,CONFIG_GENERIC,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,CONFIG_E500,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,$(UCLIBC_POWERPC_TYPE),$(@D)/.config)
 endef
 endif # powerpc
 
@@ -152,34 +138,34 @@
 ifeq ($(UCLIBC_TARGET_ARCH),bfin)
 ifeq ($(BR2_BINFMT_FDPIC),y)
 define UCLIBC_BFIN_CONFIG
-	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_FLAT,$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_SHARED_FLAT,$(@D))
-	$(call UCLIBC_OPT_SET,UCLIBC_FORMAT_FDPIC_ELF,y,$(@D))
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
 endef
 endif
 ifeq ($(BR2_BINFMT_FLAT_ONE),y)
 define UCLIBC_BFIN_CONFIG
-	$(call UCLIBC_OPT_SET,UCLIBC_FORMAT_FLAT,y,$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_SHARED_FLAT,$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_FDPIC_ELF,$(@D))
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
 endef
 endif
 ifeq ($(BR2_BINFMT_FLAT_SEP_DATA),y)
 define UCLIBC_BFIN_CONFIG
-	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_FLAT,$(@D))
-	$(call UCLIBC_OPT_SET,UCLIBC_FORMAT_FLAT_SEP_DATA,y,$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_SHARED_FLAT,$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_FDPIC_ELF,$(@D))
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
 endef
 endif
 ifeq ($(BR2_BINFMT_FLAT_SHARED),y)
 define UCLIBC_BFIN_CONFIG
-	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_FLAT,$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D))
-	$(call UCLIBC_OPT_SET,UCLIBC_FORMAT_SHARED_FLAT,y,$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_FORMAT_FDPIC_ELF,$(@D))
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
 endef
 endif
 endif # bfin
@@ -190,7 +176,7 @@
 
 ifeq ($(UCLIBC_TARGET_ARCH),avr32)
 define UCLIBC_AVR32_CONFIG
-	$(call UCLIBC_OPT_SET,LINKRELAX,y,$(@D))
+	$(call KCONFIG_ENABLE_OPT,LINKRELAX,$(@D)/.config)
 endef
 endif # avr32
 
@@ -200,7 +186,7 @@
 ifeq ($(UCLIBC_TARGET_ARCH),i386)
 UCLIBC_X86_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_X86_TYPE))
 define UCLIBC_X86_TYPE_CONFIG
-	$(call UCLIBC_OPT_SET,$(UCLIBC_X86_TYPE),y,$(@D))
+	$(call KCONFIG_ENABLE_OPT,$(UCLIBC_X86_TYPE),$(@D)/.config)
 endef
 endif
 
@@ -210,17 +196,17 @@
 
 ifeq ($(call qstrip,$(BR2_ENDIAN)),BIG)
 define UCLIBC_ENDIAN_CONFIG
-	$(call UCLIBC_OPT_SET,ARCH_BIG_ENDIAN,y,$(@D))
-	$(call UCLIBC_OPT_SET,ARCH_WANTS_BIG_ENDIAN,y,$(@D))
-	$(call UCLIBC_OPT_UNSET,ARCH_LITTLE_ENDIAN,$(@D))
-	$(call UCLIBC_OPT_UNSET,ARCH_WANTS_LITTLE_ENDIAN,$(@D))
+	$(call KCONFIG_ENABLE_OPT,ARCH_BIG_ENDIAN,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,ARCH_WANTS_BIG_ENDIAN,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,ARCH_LITTLE_ENDIAN,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,ARCH_WANTS_LITTLE_ENDIAN,$(@D)/.config)
 endef
 else
 define UCLIBC_ENDIAN_CONFIG
-	$(call UCLIBC_OPT_SET,ARCH_LITTLE_ENDIAN,y,$(@D))
-	$(call UCLIBC_OPT_SET,ARCH_WANTS_LITTLE_ENDIAN,y,$(@D))
-	$(call UCLIBC_OPT_UNSET,ARCH_BIG_ENDIAN,$(@D))
-	$(call UCLIBC_OPT_UNSET,ARCH_WANTS_BIG_ENDIAN,$(@D))
+	$(call KCONFIG_ENABLE_OPT,ARCH_LITTLE_ENDIAN,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,ARCH_WANTS_LITTLE_ENDIAN,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,ARCH_BIG_ENDIAN,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,ARCH_WANTS_BIG_ENDIAN,$(@D)/.config)
 endef
 endif
 
@@ -230,12 +216,12 @@
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT_LARGEFILE),y)
 define UCLIBC_LARGEFILE_CONFIG
-	$(call UCLIBC_OPT_SET,UCLIBC_HAS_LFS,y,$(@D))
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LFS,$(@D)/.config)
 endef
 else
 define UCLIBC_LARGEFILE_CONFIG
-	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_LFS,$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_FOPEN_LARGEFILE_MODE,$(@D))
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LFS,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_FOPEN_LARGEFILE_MODE,$(@D)/.config)
 endef
 endif
 
@@ -245,11 +231,11 @@
 
 ifeq ($(BR2_USE_MMU),y)
 define UCLIBC_MMU_CONFIG
-	$(call UCLIBC_OPT_SET,ARCH_USE_MMU,y,$(@D))
+	$(call KCONFIG_ENABLE_OPT,ARCH_USE_MMU,$(@D)/.config)
 endef
 else
 define UCLIBC_MMU_CONFIG
-	$(call UCLIBC_OPT_UNSET,ARCH_USE_MMU,$(@D))
+	$(call KCONFIG_DISABLE_OPT,ARCH_USE_MMU,$(@D)/.config)
 endef
 endif
 
@@ -258,9 +244,9 @@
 #
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT_INET_IPV6),y)
-UCLIBC_IPV6_CONFIG = $(call UCLIBC_OPT_SET,UCLIBC_HAS_IPV6,y,$(@D))
+UCLIBC_IPV6_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config)
 else
-UCLIBC_IPV6_CONFIG = $(call UCLIBC_OPT_UNSET,UCLIBC_HAS_IPV6,$(@D))
+UCLIBC_IPV6_CONFIG = $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config)
 endif
 
 #
@@ -269,15 +255,15 @@
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT_INET_RPC),y)
 define UCLIBC_RPC_CONFIG
-	$(call UCLIBC_OPT_SET,UCLIBC_HAS_RPC,y,$(@D))
-	$(call UCLIBC_OPT_SET,UCLIBC_HAS_FULL_RPC,y,$(@D))
-	$(call UCLIBC_OPT_SET,UCLIBC_HAS_REENTRANT_RPC,y,$(@D))
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_RPC,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FULL_RPC,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_REENTRANT_RPC,$(@D)/.config)
 endef
 else
 define UCLIBC_RPC_CONFIG
-	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_RPC,$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_FULL_RPC,$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_REENTRANT_RPC,$(@D))
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_RPC,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_FULL_RPC,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_REENTRANT_RPC,$(@D)/.config)
 endef
 endif
 
@@ -287,14 +273,14 @@
 
 ifeq ($(BR2_SOFT_FLOAT),y)
 define UCLIBC_FLOAT_CONFIG
-	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_FPU,$(@D))
-	$(call UCLIBC_OPT_SET,UCLIBC_HAS_FLOATS,y,$(@D))
-	$(call UCLIBC_OPT_SET,DO_C99_MATH,y,$(@D))
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_FPU,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FLOATS,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,DO_C99_MATH,$(@D)/.config)
 endef
 else
 define UCLIBC_FLOAT_CONFIG
-	$(call UCLIBC_OPT_SET,UCLIBC_HAS_FPU,y,$(@D))
-	$(call UCLIBC_OPT_SET,UCLIBC_HAS_FLOATS,y,$(@D))
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FPU,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FLOATS,$(@D)/.config)
 endef
 endif
 
@@ -303,13 +289,13 @@
 #
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y)
 define UCLIBC_SSP_CONFIG
-	$(call UCLIBC_OPT_SET,UCLIBC_HAS_SSP,y,$(@D))
-	$(call UCLIBC_OPT_SET,UCLIBC_BUILD_SSP,y,$(@D))
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_SSP,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_BUILD_SSP,$(@D)/.config)
 endef
 else
 define UCLIBC_SSP_CONFIG
-	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_SSP,$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_BUILD_SSP,$(@D))
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_SSP,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_BUILD_SSP,$(@D)/.config)
 endef
 endif
 
@@ -318,31 +304,31 @@
 #
 ifeq ($(BR2_PTHREADS_NONE),y)
 define UCLIBC_THREAD_CONFIG
-	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_THREADS,$(@D))
-	$(call UCLIBC_OPT_UNSET,LINUXTHREADS,$(@D))
-	$(call UCLIBC_OPT_UNSET,LINUXTHREADS_OLD,$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_THREADS_NATIVE,$(@D))
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,LINUXTHREADS,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,LINUXTHREADS_OLD,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config)
 endef
 else ifeq ($(BR2_PTHREADS),y)
 define UCLIBC_THREAD_CONFIG
-	$(call UCLIBC_OPT_SET,UCLIBC_HAS_THREADS,y,$(@D))
-	$(call UCLIBC_OPT_SET,LINUXTHREADS_NEW,y,$(@D))
-	$(call UCLIBC_OPT_UNSET,LINUXTHREADS_OLD,$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_THREADS_NATIVE,$(@D))
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,LINUXTHREADS_NEW,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,LINUXTHREADS_OLD,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config)
 endef
 else ifeq ($(BR2_PTHREADS_OLD),y)
 define UCLIBC_THREAD_CONFIG
-	$(call UCLIBC_OPT_SET,UCLIBC_HAS_THREADS,y,$(@D))
-	$(call UCLIBC_OPT_UNSET,LINUXTHREADS_NEW,$(@D))
-	$(call UCLIBC_OPT_SET,LINUXTHREADS_OLD,y,$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_THREADS_NATIVE,$(@D))
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,LINUXTHREADS_NEW,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,LINUXTHREADS_OLD,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config)
 endef
 else ifeq ($(BR2_PTHREADS_NATIVE),y)
 define UCLIBC_THREAD_CONFIG
-	$(call UCLIBC_OPT_SET,UCLIBC_HAS_THREADS,y,$(@D))
-	$(call UCLIBC_OPT_UNSET,LINUXTHREADS_NEW,$(@D))
-	$(call UCLIBC_OPT_UNSET,LINUXTHREADS_OLD,$(@D))
-	$(call UCLIBC_OPT_SET,UCLIBC_HAS_THREADS_NATIVE,y,$(@D))
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,LINUXTHREADS_NEW,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,LINUXTHREADS_OLD,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config)
 endef
 endif
 
@@ -351,9 +337,9 @@
 #
 
 ifeq ($(BR2_PTHREAD_DEBUG),y)
-UCLIBC_THREAD_DEBUG_CONFIG = $(call UCLIBC_OPT_SET,PTHREADS_DEBUG_SUPPORT,y,$(@D))
+UCLIBC_THREAD_DEBUG_CONFIG = $(call KCONFIG_ENABLE_OPT,PTHREADS_DEBUG_SUPPORT,$(@D)/.config)
 else
-UCLIBC_THREAD_DEBUG_CONFIG = $(call UCLIBC_OPT_UNSET,PTHREADS_DEBUG_SUPPORT,$(@D))
+UCLIBC_THREAD_DEBUG_CONFIG = $(call KCONFIG_DISABLE_OPT,PTHREADS_DEBUG_SUPPORT,$(@D)/.config)
 endif
 
 #
@@ -362,18 +348,18 @@
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT_LOCALE),y)
 define UCLIBC_LOCALE_CONFIG
-	$(call UCLIBC_OPT_SET,UCLIBC_HAS_LOCALE,y,$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_BUILD_ALL_LOCALE,$(@D))
-	$(call UCLIBC_OPT_SET,UCLIBC_BUILD_MINIMAL_LOCALE,y,$(@D))
-	$(call UCLIBC_OPT_SET,UCLIBC_BUILD_MINIMAL_LOCALES,"$(UCLIBC_LOCALES)",$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_PREGENERATED_LOCALE_DATA,$(@D))
-	$(call UCLIBC_OPT_UNSET,DOWNLOAD_PREGENERATED_LOCALE_DATA,$(@D))
-	$(call UCLIBC_OPT_SET,UCLIBC_HAS_XLOCALE,y,$(@D))
-	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_GLIBC_DIGIT_GROUPING,$(@D))
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LOCALE,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_BUILD_ALL_LOCALE,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_BUILD_MINIMAL_LOCALE,$(@D)/.config)
+	$(call KCONFIG_SET_OPT,UCLIBC_BUILD_MINIMAL_LOCALES,"$(UCLIBC_LOCALES)",$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_PREGENERATED_LOCALE_DATA,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,DOWNLOAD_PREGENERATED_LOCALE_DATA,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_XLOCALE,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_GLIBC_DIGIT_GROUPING,$(@D)/.config)
 endef
 else
 define UCLIBC_LOCALE_CONFIG
-	$(call UCLIBC_OPT_UNSET,UCLIBC_HAS_LOCALE,$(@D))
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LOCALE,$(@D)/.config)
 endef
 endif
 
@@ -382,9 +368,9 @@
 #
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT_WCHAR),y)
-UCLIBC_WCHAR_CONFIG = $(call UCLIBC_OPT_SET,UCLIBC_HAS_WCHAR,y,$(@D))
+UCLIBC_WCHAR_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_WCHAR,$(@D)/.config)
 else
-UCLIBC_WCHAR_CONFIG = $(call UCLIBC_OPT_UNSET,UCLIBC_HAS_WCHAR,$(@D))
+UCLIBC_WCHAR_CONFIG = $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_WCHAR,$(@D)/.config)
 endif
 
 #
@@ -392,9 +378,9 @@
 #
 
 ifeq ($(BR2_STRIP_none),y)
-UCLIBC_STRIP_CONFIG = $(call UCLIBC_OPT_UNSET,DOSTRIP,$(@D))
+UCLIBC_STRIP_CONFIG = $(call KCONFIG_DISABLE_OPT,DOSTRIP,$(@D)/.config)
 else
-UCLIBC_STRIP_CONFIG = $(call UCLIBC_OPT_SET,DOSTRIP,y,$(@D))
+UCLIBC_STRIP_CONFIG = $(call KCONFIG_ENABLE_OPT,DOSTRIP,$(@D)/.config)
 endif
 
 #
@@ -409,13 +395,13 @@
 
 define UCLIBC_SETUP_DOT_CONFIG
 	$(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(@D)/.config
-	$(call UCLIBC_OPT_SET,CROSS_COMPILER_PREFIX,"$(TARGET_CROSS)",$(@D))
-	$(call UCLIBC_OPT_SET,TARGET_$(UCLIBC_TARGET_ARCH),y,$(@D))
-	$(call UCLIBC_OPT_SET,TARGET_ARCH,"$(UCLIBC_TARGET_ARCH)",$(@D))
-	$(call UCLIBC_OPT_SET,KERNEL_HEADERS,"$(LINUX_HEADERS_DIR)/usr/include",$(@D))
-	$(call UCLIBC_OPT_SET,RUNTIME_PREFIX,"/",$(@D))
-	$(call UCLIBC_OPT_SET,DEVEL_PREFIX,"/usr",$(@D))
-	$(call UCLIBC_OPT_SET,SHARED_LIB_LOADER_PREFIX,"/lib",$(@D))
+	$(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)
+	$(call KCONFIG_SET_OPT,KERNEL_HEADERS,"$(LINUX_HEADERS_DIR)/usr/include",$(@D)/.config)
+	$(call KCONFIG_SET_OPT,RUNTIME_PREFIX,"/",$(@D)/.config)
+	$(call KCONFIG_SET_OPT,DEVEL_PREFIX,"/usr",$(@D)/.config)
+	$(call KCONFIG_SET_OPT,SHARED_LIB_LOADER_PREFIX,"/lib",$(@D)/.config)
 	$(UCLIBC_MMU_CONFIG)
 	$(UCLIBC_ARM_ABI_CONFIG)
 	$(UCLIBC_ARM_BX_CONFIG)

[Buildroot] [PATCH 4 of 6] uclibc: rename SETUP_DOT_CONFIG to FIXUP_DOT_CONFIG

[Thomas De Schampheleire]

To better match the actual behavior, rename function UCLIBC_SETUP_DOT_CONFIG
to UCLIBC_FIXUP_DOT_CONFIG.

Suggested-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

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

diff -r 0b5a6fcf97ef -r 1f15cd84996d package/uclibc/uclibc.mk
--- a/package/uclibc/uclibc.mk	Wed Jul 09 20:45:46 2014 +0200
+++ b/package/uclibc/uclibc.mk	Wed Jul 02 21:31:07 2014 +0200
@@ -393,7 +393,7 @@
 	UCLIBC_EXTRA_CFLAGS="$(UCLIBC_EXTRA_CFLAGS) $(TARGET_ABI)" \
 	HOSTCC="$(HOSTCC)"
 
-define UCLIBC_SETUP_DOT_CONFIG
+define UCLIBC_FIXUP_DOT_CONFIG
 	$(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(@D)/.config
 	$(call KCONFIG_SET_OPT,CROSS_COMPILER_PREFIX,"$(TARGET_CROSS)",$(@D)/.config)
 	$(call KCONFIG_ENABLE_OPT,TARGET_$(UCLIBC_TARGET_ARCH),$(@D)/.config)
@@ -433,7 +433,7 @@
 endef
 
 define UCLIBC_CONFIGURE_CMDS
-	$(UCLIBC_SETUP_DOT_CONFIG)
+	$(UCLIBC_FIXUP_DOT_CONFIG)
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		$(UCLIBC_MAKE_FLAGS) \
 		PREFIX=$(STAGING_DIR) \

[Buildroot] [PATCH 5 of 6] uclibc: menuconfig: take into account initial settings from config file

[Thomas De Schampheleire]

When executing the sequence 'make clean uclibc-menuconfig', the configured
config file is not taken into account and one starts from the default
settings.

This patch adds an explicit target for the config file and lets the
configure and menuconfig steps depend on it, fixing the problem.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

---
rfc->patch:
- add target for .config to avoid menuconfig copying the config file
  every time (ThomasP, Arnout)
- move dependency on patch step from menuconfig to the .config target

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

diff -r 1f15cd84996d -r 34f3d55304ad package/uclibc/uclibc.mk
--- a/package/uclibc/uclibc.mk	Wed Jul 02 21:31:07 2014 +0200
+++ b/package/uclibc/uclibc.mk	Sun Jun 22 10:37:22 2014 +0200
@@ -394,7 +394,6 @@
 	HOSTCC="$(HOSTCC)"
 
 define UCLIBC_FIXUP_DOT_CONFIG
-	$(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(@D)/.config
 	$(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,7 +532,14 @@
 	$(UCLIBC_INSTALL_UTILS_STAGING)
 endef
 
-uclibc-menuconfig: uclibc-patch
+$(eval $(generic-package))
+
+$(UCLIBC_DIR)/.config: $(UCLIBC_CONFIG_FILE) | uclibc-patch
+	$(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.config
+
+$(UCLIBC_DIR)/.stamp_configured: $(UCLIBC_DIR)/.config
+
+uclibc-menuconfig: $(UCLIBC_DIR)/.config
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		$(UCLIBC_MAKE_FLAGS) \
 		PREFIX=$(STAGING_DIR) \
@@ -542,8 +548,6 @@
 		menuconfig
 	rm -f $(UCLIBC_DIR)/.stamp_{configured,built,target_installed,staging_installed}
 
-$(eval $(generic-package))
-
 uclibc-update-config: $(UCLIBC_DIR)/.stamp_configured
 	cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE)
 

[Buildroot] [PATCH 6 of 6] uclibc: update-config: preserve freshly configured settings

[Thomas De Schampheleire]

In the sequence:

make uclibc-menuconfig
make uclibc-update-config

the freshly configured settings from the menuconfig are lost during the
update-config step. This is because update-config depends on the configure
step, which starts by copying the config file to the build directory.

Instead, stop depending on the configure step from update-config, and
introduce a new stamp file .stamp_config_fixup_done, which applies any
fixups on the .config file.

This has the added bonus that 'uclibc-update-config' no longer needs the
toolchain to be available, which makes:
    make clean uclibc-menuconfig uclibc-update-config
much faster and user-friendly.

Additionally, make sure that 'make clean uclibc-update-config' works
properly, by depending on .stamp_config_fixup_done so that the config file
is present and fixed.

Fixes bug #7154 https://bugs.busybox.net/show_bug.cgi?id=7154

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

---
rfc->patch:
- rebase
- rename .stamp_config_file_fixed into .stamp_config_fixup_done
- add dependency on .config from .stamp_config_file_fixed (Arnout)
- remove explicit call to UCLIBC_FIXUP_DOT_CONFIG from configure commands,
  and instead depend on .stamp_config_fixup_done.

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

diff -r 34f3d55304ad -r 82c951fdcf48 package/uclibc/uclibc.mk
--- a/package/uclibc/uclibc.mk	Sun Jun 22 10:37:22 2014 +0200
+++ b/package/uclibc/uclibc.mk	Mon Jun 16 20:18:23 2014 +0200
@@ -432,7 +432,6 @@
 endef
 
 define UCLIBC_CONFIGURE_CMDS
-	$(UCLIBC_FIXUP_DOT_CONFIG)
 	$(MAKE1) -C $(UCLIBC_DIR) \
 		$(UCLIBC_MAKE_FLAGS) \
 		PREFIX=$(STAGING_DIR) \
@@ -537,7 +536,11 @@
 $(UCLIBC_DIR)/.config: $(UCLIBC_CONFIG_FILE) | uclibc-patch
 	$(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.config
 
-$(UCLIBC_DIR)/.stamp_configured: $(UCLIBC_DIR)/.config
+$(UCLIBC_DIR)/.stamp_config_fixup_done: $(UCLIBC_DIR)/.config
+	$(UCLIBC_FIXUP_DOT_CONFIG)
+	touch $@
+
+$(UCLIBC_DIR)/.stamp_configured: $(UCLIBC_DIR)/.stamp_config_fixup_done
 
 uclibc-menuconfig: $(UCLIBC_DIR)/.config
 	$(MAKE1) -C $(UCLIBC_DIR) \
@@ -546,9 +549,10 @@
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(STAGING_DIR)/ \
 		menuconfig
-	rm -f $(UCLIBC_DIR)/.stamp_{configured,built,target_installed,staging_installed}
+	rm -f $(UCLIBC_DIR)/.stamp_{config_fixup_done,configured,built}
+	rm -f $(UCLIBC_DIR)/.stamp_{target,staging}_installed
 
-uclibc-update-config: $(UCLIBC_DIR)/.stamp_configured
+uclibc-update-config: $(UCLIBC_DIR)/.stamp_config_fixup_done
 	cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE)
 
 # Before uClibc is built, we must have the second stage cross-compiler

[Buildroot] [PATCH 1 of 6] pkg-utils: kconfig helpers: add basic usage documentation

[Yann E. MORIN]

Thomas, All,

On 2014-07-14 13:50 +0200, Thomas De Schampheleire spake thusly:
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  package/pkg-utils.mk |  6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff -r 7c17407eb26e -r 4a53bf323d8a package/pkg-utils.mk
> --- a/package/pkg-utils.mk	Sat Jul 12 14:41:41 2014 -0300
> +++ b/package/pkg-utils.mk	Wed Jul 09 20:27:38 2014 +0200
> @@ -33,17 +33,17 @@
>  # package, and more.
>  #
>  
> -define KCONFIG_ENABLE_OPT
> +define KCONFIG_ENABLE_OPT # (option, file)
>  	$(SED) "/\\<$(1)\\>/d" $(2)
>  	echo "$(1)=y" >> $(2)
>  endef
>  
> -define KCONFIG_SET_OPT
> +define KCONFIG_SET_OPT # (option, value, file)
>  	$(SED) "/\\<$(1)\\>/d" $(3)
>  	echo "$(1)=$(2)" >> $(3)
>  endef
>  
> -define KCONFIG_DISABLE_OPT
> +define KCONFIG_DISABLE_OPT # (option, file)
>  	$(SED) "/\\<$(1)\\>/d" $(2)
>  	echo "# $(1) is not set" >> $(2)
>  endef

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 2 of 6] pkg-utils: kconfig helpers: use single iso double quoting

[Yann E. MORIN]

Thomas, All,

On 2014-07-14 13:50 +0200, Thomas De Schampheleire spake thusly:
> The echo statements in the kconfig helpers are currently using double
> quotes. For KCONFIG_SET_OPT this is problematic when the value argument
> itself contains a double quote (a string value). In this case, the statement
>     echo "$(1)=$(2)" >> $(3)
> would become:
>     echo "FOO="string value"" >> /some/path/.config
> resulting in the string
>     FOO=string value
> in the config file, rather than the properly quoted
>     FOO="string value"
> 
> The linux package worked around this by escaping the quote characters, but
> a prettier solution is to use single quoting in the helpers (or
> alternatively use no quoting at all).
> A side effect of this change is that a $variable in the key or value would
> no longer be interpreted by the shell, removing any unexpected behavior.
> 
> This change is only really necessary for KCONFIG_SET_OPT, but for symmetry
> reasons the other helpers are updated too.
> 
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  linux/linux.mk       |  2 +-
>  package/pkg-utils.mk |  6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff -r 4a53bf323d8a -r 53e04c0bd837 linux/linux.mk
> --- a/linux/linux.mk	Wed Jul 09 20:27:38 2014 +0200
> +++ b/linux/linux.mk	Sun Jul 13 09:34:05 2014 +0200
> @@ -180,7 +180,7 @@
>  	# rebuilt using the linux26-rebuild-with-initramfs target.
>  	$(if $(BR2_TARGET_ROOTFS_INITRAMFS),
>  		touch $(BINARIES_DIR)/rootfs.cpio
> -		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.cpio\",$(@D)/.config)
> +		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,"$(BINARIES_DIR)/rootfs.cpio",$(@D)/.config)
>  		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0,$(@D)/.config)
>  		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config))
>  	$(if $(BR2_ROOTFS_DEVICE_CREATION_STATIC),,
> diff -r 4a53bf323d8a -r 53e04c0bd837 package/pkg-utils.mk
> --- a/package/pkg-utils.mk	Wed Jul 09 20:27:38 2014 +0200
> +++ b/package/pkg-utils.mk	Sun Jul 13 09:34:05 2014 +0200
> @@ -35,17 +35,17 @@
>  
>  define KCONFIG_ENABLE_OPT # (option, file)
>  	$(SED) "/\\<$(1)\\>/d" $(2)
> -	echo "$(1)=y" >> $(2)
> +	echo '$(1)=y' >> $(2)
>  endef
>  
>  define KCONFIG_SET_OPT # (option, value, file)
>  	$(SED) "/\\<$(1)\\>/d" $(3)
> -	echo "$(1)=$(2)" >> $(3)
> +	echo '$(1)=$(2)' >> $(3)
>  endef
>  
>  define KCONFIG_DISABLE_OPT # (option, file)
>  	$(SED) "/\\<$(1)\\>/d" $(2)
> -	echo "# $(1) is not set" >> $(2)
> +	echo '# $(1) is not set' >> $(2)
>  endef
>  
>  # Helper functions to determine the name of a package and its

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 4 of 6] uclibc: rename SETUP_DOT_CONFIG to FIXUP_DOT_CONFIG

[Thomas Petazzoni]

Dear Thomas De Schampheleire,

On Mon, 14 Jul 2014 13:50:28 +0200, Thomas De Schampheleire wrote:

> -define UCLIBC_SETUP_DOT_CONFIG
> +define UCLIBC_FIXUP_DOT_CONFIG
>  	$(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(@D)/.config

This this variable is actually copying the configuration file, I
believe the current name of the variable is more correct than the one
you propose to use, no?

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 3 of 6] uclibc: replace custom kconfig helpers with those provided by pkg-utils

[Yann E. MORIN]

Thomas, All,

On 2014-07-14 13:50 +0200, Thomas De Schampheleire spake thusly:
> This patch removes the custom kconfig helpers UCLIBC_OPT_SET and
> UCLIBC_OPT_UNSET with the common KCONFIG_SET_OPT, KCONFIG_ENABLE_OPT and
> KCONFIG_DISABLE_OPT.
> 
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

But see below:

>  	$(SED) '/CONFIG_ARM_.ABI/d' $(@D)/.config
>  	$(SED) '/CONFIG_MIPS_[NO].._ABI/d' $(@D)/.config
>  	$(SED) '/CONFIG_MIPS_ISA_.*/d' $(@D)/.config
>  	$(SED) '/CONFIG_SH[234A]*/d' $(@D)/.config
>  	$(SED) 's/^\(CONFIG_[^_]*[_]*SPARC[^=]*\)=.*/# \1 is not set/g' \
>  		 $(@D)/.config

Ideally, we should have KCONFIG helpers for those, too.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 3 of 6] uclibc: replace custom kconfig helpers with those provided by pkg-utils

[Thomas De Schampheleire]

Hi Yann,

On Mon, Jul 14, 2014 at 4:36 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Thomas, All,
>
> On 2014-07-14 13:50 +0200, Thomas De Schampheleire spake thusly:
>> This patch removes the custom kconfig helpers UCLIBC_OPT_SET and
>> UCLIBC_OPT_UNSET with the common KCONFIG_SET_OPT, KCONFIG_ENABLE_OPT and
>> KCONFIG_DISABLE_OPT.
>>
>> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> But see below:
>
>>       $(SED) '/CONFIG_ARM_.ABI/d' $(@D)/.config
>>       $(SED) '/CONFIG_MIPS_[NO].._ABI/d' $(@D)/.config
>>       $(SED) '/CONFIG_MIPS_ISA_.*/d' $(@D)/.config
>>       $(SED) '/CONFIG_SH[234A]*/d' $(@D)/.config
>>       $(SED) 's/^\(CONFIG_[^_]*[_]*SPARC[^=]*\)=.*/# \1 is not set/g' \
>>                $(@D)/.config
>
> Ideally, we should have KCONFIG helpers for those, too.
>

Yes, but it has to be a new helper I think, because of the pattern matching.

Best regards,
Thomas

[Buildroot] [PATCH 4 of 6] uclibc: rename SETUP_DOT_CONFIG to FIXUP_DOT_CONFIG

[Yann E. MORIN]

Thomas?, All,

On 2014-07-14 16:33 +0200, Thomas Petazzoni spake thusly:
> On Mon, 14 Jul 2014 13:50:28 +0200, Thomas De Schampheleire wrote:
> 
> > -define UCLIBC_SETUP_DOT_CONFIG
> > +define UCLIBC_FIXUP_DOT_CONFIG
> >  	$(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(@D)/.config
> 
> This this variable is actually copying the configuration file, I
> believe the current name of the variable is more correct than the one
> you propose to use, no?

Thomas did the change, because in patch 5/6 it no longer does the copy,
it only does the fixup.

This should probably have been explained in the commit log that the
change was needed by a future patch.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 3 of 6] uclibc: replace custom kconfig helpers with those provided by pkg-utils

[Yann E. MORIN]

Thomas, All,

On 2014-07-14 16:39 +0200, Thomas De Schampheleire spake thusly:
> Hi Yann,
> 
> On Mon, Jul 14, 2014 at 4:36 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> > Thomas, All,
> >
> > On 2014-07-14 13:50 +0200, Thomas De Schampheleire spake thusly:
> >> This patch removes the custom kconfig helpers UCLIBC_OPT_SET and
> >> UCLIBC_OPT_UNSET with the common KCONFIG_SET_OPT, KCONFIG_ENABLE_OPT and
> >> KCONFIG_DISABLE_OPT.
> >>
> >> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> >
> > Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> >
> > But see below:
> >
> >>       $(SED) '/CONFIG_ARM_.ABI/d' $(@D)/.config
> >>       $(SED) '/CONFIG_MIPS_[NO].._ABI/d' $(@D)/.config
> >>       $(SED) '/CONFIG_MIPS_ISA_.*/d' $(@D)/.config
> >>       $(SED) '/CONFIG_SH[234A]*/d' $(@D)/.config
> >>       $(SED) 's/^\(CONFIG_[^_]*[_]*SPARC[^=]*\)=.*/# \1 is not set/g' \
> >>                $(@D)/.config
> >
> > Ideally, we should have KCONFIG helpers for those, too.
> >
> 
> Yes, but it has to be a new helper I think, because of the pattern matching.

Absolutely, yes. And it can come in a later patch.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 4 of 6] uclibc: rename SETUP_DOT_CONFIG to FIXUP_DOT_CONFIG

[Thomas De Schampheleire]

On Mon, Jul 14, 2014 at 4:39 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Thomas?, All,
>
> On 2014-07-14 16:33 +0200, Thomas Petazzoni spake thusly:
>> On Mon, 14 Jul 2014 13:50:28 +0200, Thomas De Schampheleire wrote:
>>
>> > -define UCLIBC_SETUP_DOT_CONFIG
>> > +define UCLIBC_FIXUP_DOT_CONFIG
>> >     $(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(@D)/.config
>>
>> This this variable is actually copying the configuration file, I
>> believe the current name of the variable is more correct than the one
>> you propose to use, no?
>
> Thomas did the change, because in patch 5/6 it no longer does the copy,
> it only does the fixup.
>
> This should probably have been explained in the commit log that the
> change was needed by a future patch.

Ok, I see. I split off the change to a separate patch for clarity, but
indeed at this moment it is not yet fully accurate. I can fold this
patch with the 5th patch, or otherwise update the commit msg as Yann
proposed, what do you prefer?

[Buildroot] [PATCH 4 of 6] uclibc: rename SETUP_DOT_CONFIG to FIXUP_DOT_CONFIG

[Yann E. MORIN]

Thomas?, All,

On 2014-07-14 16:43 +0200, Thomas De Schampheleire spake thusly:
> On Mon, Jul 14, 2014 at 4:39 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> > Thomas?, All,
> >
> > On 2014-07-14 16:33 +0200, Thomas Petazzoni spake thusly:
> >> On Mon, 14 Jul 2014 13:50:28 +0200, Thomas De Schampheleire wrote:
> >>
> >> > -define UCLIBC_SETUP_DOT_CONFIG
> >> > +define UCLIBC_FIXUP_DOT_CONFIG
> >> >     $(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(@D)/.config
> >>
> >> This this variable is actually copying the configuration file, I
> >> believe the current name of the variable is more correct than the one
> >> you propose to use, no?
> >
> > Thomas did the change, because in patch 5/6 it no longer does the copy,
> > it only does the fixup.
> >
> > This should probably have been explained in the commit log that the
> > change was needed by a future patch.
> 
> Ok, I see. I split off the change to a separate patch for clarity, but
> indeed at this moment it is not yet fully accurate. I can fold this
> patch with the 5th patch, or otherwise update the commit msg as Yann
> proposed, what do you prefer?

Well, I think a separate patch is better, since it is easier to review.
Just add a blurb in the commit log.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 0 of 6] uclibc: fix handling of configuration file

[Arnout Vandecappelle]

On 14/07/14 13:50, Thomas De Schampheleire wrote:
> 
> This patch series (part of it poster earlier as RFC) has as main goal to
> fix the uclibc kconfig handling with following requirements in mind:
> 
> - neither foo-menuconfig nor foo-update-config should have a dependency
>   on the toolchain (which means we cannot depend on foo-configure)
> 
> - 'clean foo-menuconfig' should start from the specified (custom) config
>   file
> 
> - 'foo-menuconfig foo-update-config' should preserve the changes made in
>   the menuconfig step (this problem is reported for uclibc with bug #7154
>   (https://bugs.busybox.net/show_bug.cgi?id=7154).
> 
> - 'make foo-menuconfig; make foo-menuconfig' should preserve the changes
>   made in the menuconfig step.
> 
> - 'make clean foo-update-config' should copy the initial file, do any
>   fixups, and then save the config
> 
> 
> In the process, some smaller changes are done too.
> 
> Once this series is accepted, the plan is:
> - to extract the kconfig-related bits to a kconfig-package infrastructure.
> - to convert busybox, linux and barebox to this kconfig-package infra too.

 For the record: I agree with this plan.

 I also agree with the plan to land this in 2014.08.


 Regards,
 Arnout

> 
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> 
> ---
> Thomas De Schampheleire (6):
>     pkg-utils: kconfig helpers: add basic usage documentation
>     pkg-utils: kconfig helpers: use single iso double quoting
>     uclibc: replace custom kconfig helpers with those provided by pkg-utils
>     uclibc: rename SETUP_DOT_CONFIG to FIXUP_DOT_CONFIG
>     uclibc: menuconfig: take into account initial settings from config file
>     uclibc: update-config: preserve freshly configured settings
> 
> 
>  linux/linux.mk           |    2 +-
>  package/pkg-utils.mk     |   12 +-
>  package/uclibc/uclibc.mk |  230 ++++++++++++++++++--------------------
>  3 files changed, 119 insertions(+), 125 deletions(-)
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 1 of 6] pkg-utils: kconfig helpers: add basic usage documentation

[Arnout Vandecappelle]

On 14/07/14 13:50, Thomas De Schampheleire wrote:
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> 
> ---
>  package/pkg-utils.mk |  6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff -r 7c17407eb26e -r 4a53bf323d8a package/pkg-utils.mk
> --- a/package/pkg-utils.mk	Sat Jul 12 14:41:41 2014 -0300
> +++ b/package/pkg-utils.mk	Wed Jul 09 20:27:38 2014 +0200
> @@ -33,17 +33,17 @@
>  # package, and more.
>  #
>  
> -define KCONFIG_ENABLE_OPT
> +define KCONFIG_ENABLE_OPT # (option, file)

 I like this pattern!

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>


 Regards,
 Arnout

>  	$(SED) "/\\<$(1)\\>/d" $(2)
>  	echo "$(1)=y" >> $(2)
>  endef
>  
> -define KCONFIG_SET_OPT
> +define KCONFIG_SET_OPT # (option, value, file)
>  	$(SED) "/\\<$(1)\\>/d" $(3)
>  	echo "$(1)=$(2)" >> $(3)
>  endef
>  
> -define KCONFIG_DISABLE_OPT
> +define KCONFIG_DISABLE_OPT # (option, file)
>  	$(SED) "/\\<$(1)\\>/d" $(2)
>  	echo "# $(1) is not set" >> $(2)
>  endef
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 2 of 6] pkg-utils: kconfig helpers: use single iso double quoting

[Arnout Vandecappelle]

On 14/07/14 13:50, Thomas De Schampheleire wrote:
> The echo statements in the kconfig helpers are currently using double
> quotes. For KCONFIG_SET_OPT this is problematic when the value argument
> itself contains a double quote (a string value). In this case, the statement
>     echo "$(1)=$(2)" >> $(3)
> would become:
>     echo "FOO="string value"" >> /some/path/.config
> resulting in the string
>     FOO=string value
> in the config file, rather than the properly quoted
>     FOO="string value"
> 
> The linux package worked around this by escaping the quote characters, but
> a prettier solution is to use single quoting in the helpers (or
> alternatively use no quoting at all).
> A side effect of this change is that a $variable in the key or value would
> no longer be interpreted by the shell, removing any unexpected behavior.
> 
> This change is only really necessary for KCONFIG_SET_OPT, but for symmetry
> reasons the other helpers are updated too.
> 
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 Regards,
 Arnout

> 
> ---
>  linux/linux.mk       |  2 +-
>  package/pkg-utils.mk |  6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff -r 4a53bf323d8a -r 53e04c0bd837 linux/linux.mk
> --- a/linux/linux.mk	Wed Jul 09 20:27:38 2014 +0200
> +++ b/linux/linux.mk	Sun Jul 13 09:34:05 2014 +0200
> @@ -180,7 +180,7 @@
>  	# rebuilt using the linux26-rebuild-with-initramfs target.
>  	$(if $(BR2_TARGET_ROOTFS_INITRAMFS),
>  		touch $(BINARIES_DIR)/rootfs.cpio
> -		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.cpio\",$(@D)/.config)
> +		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,"$(BINARIES_DIR)/rootfs.cpio",$(@D)/.config)
>  		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0,$(@D)/.config)
>  		$(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config))
>  	$(if $(BR2_ROOTFS_DEVICE_CREATION_STATIC),,
> diff -r 4a53bf323d8a -r 53e04c0bd837 package/pkg-utils.mk
> --- a/package/pkg-utils.mk	Wed Jul 09 20:27:38 2014 +0200
> +++ b/package/pkg-utils.mk	Sun Jul 13 09:34:05 2014 +0200
> @@ -35,17 +35,17 @@
>  
>  define KCONFIG_ENABLE_OPT # (option, file)
>  	$(SED) "/\\<$(1)\\>/d" $(2)
> -	echo "$(1)=y" >> $(2)
> +	echo '$(1)=y' >> $(2)
>  endef
>  
>  define KCONFIG_SET_OPT # (option, value, file)
>  	$(SED) "/\\<$(1)\\>/d" $(3)
> -	echo "$(1)=$(2)" >> $(3)
> +	echo '$(1)=$(2)' >> $(3)
>  endef
>  
>  define KCONFIG_DISABLE_OPT # (option, file)
>  	$(SED) "/\\<$(1)\\>/d" $(2)
> -	echo "# $(1) is not set" >> $(2)
> +	echo '# $(1) is not set' >> $(2)
>  endef
>  
>  # Helper functions to determine the name of a package and its
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 4 of 6] uclibc: rename SETUP_DOT_CONFIG to FIXUP_DOT_CONFIG

[Arnout Vandecappelle]

On 14/07/14 16:43, Thomas De Schampheleire wrote:
> On Mon, Jul 14, 2014 at 4:39 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>> Thomas?, All,
>>
>> On 2014-07-14 16:33 +0200, Thomas Petazzoni spake thusly:
>>> On Mon, 14 Jul 2014 13:50:28 +0200, Thomas De Schampheleire wrote:
>>>
>>>> -define UCLIBC_SETUP_DOT_CONFIG
>>>> +define UCLIBC_FIXUP_DOT_CONFIG
>>>>     $(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(@D)/.config
>>>
>>> This this variable is actually copying the configuration file, I
>>> believe the current name of the variable is more correct than the one
>>> you propose to use, no?
>>
>> Thomas did the change, because in patch 5/6 it no longer does the copy,
>> it only does the fixup.
>>
>> This should probably have been explained in the commit log that the
>> change was needed by a future patch.
> 
> Ok, I see. I split off the change to a separate patch for clarity, but
> indeed at this moment it is not yet fully accurate. I can fold this
> patch with the 5th patch, or otherwise update the commit msg as Yann
> proposed, what do you prefer?

 I'd fold it.

 Regards,
 Arnout


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 5 of 6] uclibc: menuconfig: take into account initial settings from config file

[Arnout Vandecappelle]

On 14/07/14 13:50, Thomas De Schampheleire wrote:
> When executing the sequence 'make clean uclibc-menuconfig', the configured
> config file is not taken into account and one starts from the default
> settings.
> 
> This patch adds an explicit target for the config file and lets the
> configure and menuconfig steps depend on it, fixing the problem.
> 
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> 
> ---
> rfc->patch:
> - add target for .config to avoid menuconfig copying the config file
>   every time (ThomasP, Arnout)
> - move dependency on patch step from menuconfig to the .config target
> 
>  package/uclibc/uclibc.mk |  12 ++++++++----
>  1 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff -r 1f15cd84996d -r 34f3d55304ad package/uclibc/uclibc.mk
> --- a/package/uclibc/uclibc.mk	Wed Jul 02 21:31:07 2014 +0200
> +++ b/package/uclibc/uclibc.mk	Sun Jun 22 10:37:22 2014 +0200
> @@ -394,7 +394,6 @@
>  	HOSTCC="$(HOSTCC)"
>  
>  define UCLIBC_FIXUP_DOT_CONFIG
> -	$(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(@D)/.config
>  	$(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,7 +532,14 @@
>  	$(UCLIBC_INSTALL_UTILS_STAGING)
>  endef
>  
> -uclibc-menuconfig: uclibc-patch
> +$(eval $(generic-package))
> +
> +$(UCLIBC_DIR)/.config: $(UCLIBC_CONFIG_FILE) | uclibc-patch
> +	$(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.config
> +
> +$(UCLIBC_DIR)/.stamp_configured: $(UCLIBC_DIR)/.config

 This should be $(UCLIBC_TARGET_CONFIGURE) instead of
$(UCLIBC_DIR)/.stamp_configured.

 Actually, I'd prefer the FOO_TARGET_* variables to be removed completely.
However, as long as they exist, I guess they should be used.

 Other than that, looks good to me.

 Regards,
 Arnout

> +
> +uclibc-menuconfig: $(UCLIBC_DIR)/.config
>  	$(MAKE1) -C $(UCLIBC_DIR) \
>  		$(UCLIBC_MAKE_FLAGS) \
>  		PREFIX=$(STAGING_DIR) \
> @@ -542,8 +548,6 @@
>  		menuconfig
>  	rm -f $(UCLIBC_DIR)/.stamp_{configured,built,target_installed,staging_installed}
>  
> -$(eval $(generic-package))
> -
>  uclibc-update-config: $(UCLIBC_DIR)/.stamp_configured
>  	cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE)
>  
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 6 of 6] uclibc: update-config: preserve freshly configured settings

[Arnout Vandecappelle]

On 14/07/14 13:50, Thomas De Schampheleire wrote:
> In the sequence:
> 
> make uclibc-menuconfig
> make uclibc-update-config
> 
> the freshly configured settings from the menuconfig are lost during the
> update-config step. This is because update-config depends on the configure
> step, which starts by copying the config file to the build directory.
> 
> Instead, stop depending on the configure step from update-config, and
> introduce a new stamp file .stamp_config_fixup_done, which applies any
> fixups on the .config file.

 I think the commit message should explain why this stamp file is preferred over
repeating the fixup in each target.

> 
> This has the added bonus that 'uclibc-update-config' no longer needs the
> toolchain to be available, which makes:
>     make clean uclibc-menuconfig uclibc-update-config
> much faster and user-friendly.
> 
> Additionally, make sure that 'make clean uclibc-update-config' works
> properly, by depending on .stamp_config_fixup_done so that the config file
> is present and fixed.
> 
> Fixes bug #7154 https://bugs.busybox.net/show_bug.cgi?id=7154
> 
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
> 
> ---
> rfc->patch:
> - rebase
> - rename .stamp_config_file_fixed into .stamp_config_fixup_done
> - add dependency on .config from .stamp_config_file_fixed (Arnout)
> - remove explicit call to UCLIBC_FIXUP_DOT_CONFIG from configure commands,
>   and instead depend on .stamp_config_fixup_done.
> 
>  package/uclibc/uclibc.mk |  12 ++++++++----
>  1 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff -r 34f3d55304ad -r 82c951fdcf48 package/uclibc/uclibc.mk
> --- a/package/uclibc/uclibc.mk	Sun Jun 22 10:37:22 2014 +0200
> +++ b/package/uclibc/uclibc.mk	Mon Jun 16 20:18:23 2014 +0200
> @@ -432,7 +432,6 @@
>  endef
>  
>  define UCLIBC_CONFIGURE_CMDS
> -	$(UCLIBC_FIXUP_DOT_CONFIG)
>  	$(MAKE1) -C $(UCLIBC_DIR) \
>  		$(UCLIBC_MAKE_FLAGS) \
>  		PREFIX=$(STAGING_DIR) \
> @@ -537,7 +536,11 @@
>  $(UCLIBC_DIR)/.config: $(UCLIBC_CONFIG_FILE) | uclibc-patch
>  	$(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.config
>  
> -$(UCLIBC_DIR)/.stamp_configured: $(UCLIBC_DIR)/.config
> +$(UCLIBC_DIR)/.stamp_config_fixup_done: $(UCLIBC_DIR)/.config
> +	$(UCLIBC_FIXUP_DOT_CONFIG)
> +	touch $@

	$(@)touch $@

like the rest of pkg-generic.mk.

 Otherwise, looks good to me.


 Regards,
 Arnout

> +
> +$(UCLIBC_DIR)/.stamp_configured: $(UCLIBC_DIR)/.stamp_config_fixup_done
>  
>  uclibc-menuconfig: $(UCLIBC_DIR)/.config
>  	$(MAKE1) -C $(UCLIBC_DIR) \
> @@ -546,9 +549,10 @@
>  		DEVEL_PREFIX=/usr/ \
>  		RUNTIME_PREFIX=$(STAGING_DIR)/ \
>  		menuconfig
> -	rm -f $(UCLIBC_DIR)/.stamp_{configured,built,target_installed,staging_installed}
> +	rm -f $(UCLIBC_DIR)/.stamp_{config_fixup_done,configured,built}
> +	rm -f $(UCLIBC_DIR)/.stamp_{target,staging}_installed
>  
> -uclibc-update-config: $(UCLIBC_DIR)/.stamp_configured
> +uclibc-update-config: $(UCLIBC_DIR)/.stamp_config_fixup_done
>  	cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE)
>  
>  # Before uClibc is built, we must have the second stage cross-compiler
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 4 of 6] uclibc: rename SETUP_DOT_CONFIG to FIXUP_DOT_CONFIG

[Thomas De Schampheleire]

Arnout Vandecappelle <arnout@mind.be> schreef:
>On 14/07/14 16:43, Thomas De Schampheleire wrote:
>> On Mon, Jul 14, 2014 at 4:39 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>>> Thomas?, All,
>>>
>>> On 2014-07-14 16:33 +0200, Thomas Petazzoni spake thusly:
>>>> On Mon, 14 Jul 2014 13:50:28 +0200, Thomas De Schampheleire wrote:
>>>>
>>>>> -define UCLIBC_SETUP_DOT_CONFIG
>>>>> +define UCLIBC_FIXUP_DOT_CONFIG
>>>>>     $(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(@D)/.config
>>>>
>>>> This this variable is actually copying the configuration file, I
>>>> believe the current name of the variable is more correct than the one
>>>> you propose to use, no?
>>>
>>> Thomas did the change, because in patch 5/6 it no longer does the copy,
>>> it only does the fixup.
>>>
>>> This should probably have been explained in the commit log that the
>>> change was needed by a future patch.
>> 
>> Ok, I see. I split off the change to a separate patch for clarity, but
>> indeed at this moment it is not yet fully accurate. I can fold this
>> patch with the 5th patch, or otherwise update the commit msg as Yann
>> proposed, what do you prefer?
>
> I'd fold it.

Since Yann says split it, I need a third opinion...

[Buildroot] [PATCH 5 of 6] uclibc: menuconfig: take into account initial settings from config file

[Thomas De Schampheleire]

Arnout Vandecappelle <arnout@mind.be> schreef:
>On 14/07/14 13:50, Thomas De Schampheleire wrote:
>> When executing the sequence 'make clean uclibc-menuconfig', the configured
>> config file is not taken into account and one starts from the default
>> settings.
>> 
>> This patch adds an explicit target for the config file and lets the
>> configure and menuconfig steps depend on it, fixing the problem.
>> 
>> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>> 
>> ---
>> rfc->patch:
>> - add target for .config to avoid menuconfig copying the config file
>>   every time (ThomasP, Arnout)
>> - move dependency on patch step from menuconfig to the .config target
>> 
>>  package/uclibc/uclibc.mk |  12 ++++++++----
>>  1 files changed, 8 insertions(+), 4 deletions(-)
>> 
>> diff -r 1f15cd84996d -r 34f3d55304ad package/uclibc/uclibc.mk
>> --- a/package/uclibc/uclibc.mk	Wed Jul 02 21:31:07 2014 +0200
>> +++ b/package/uclibc/uclibc.mk	Sun Jun 22 10:37:22 2014 +0200
>> @@ -394,7 +394,6 @@
>>  	HOSTCC="$(HOSTCC)"
>>  
>>  define UCLIBC_FIXUP_DOT_CONFIG
>> -	$(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(@D)/.config
>>  	$(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,7 +532,14 @@
>>  	$(UCLIBC_INSTALL_UTILS_STAGING)
>>  endef
>>  
>> -uclibc-menuconfig: uclibc-patch
>> +$(eval $(generic-package))
>> +
>> +$(UCLIBC_DIR)/.config: $(UCLIBC_CONFIG_FILE) | uclibc-patch
>> +	$(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.config
>> +
>> +$(UCLIBC_DIR)/.stamp_configured: $(UCLIBC_DIR)/.config
>
> This should be $(UCLIBC_TARGET_CONFIGURE) instead of
>$(UCLIBC_DIR)/.stamp_configured.

Indeed, will fix.

>
> Actually, I'd prefer the FOO_TARGET_* variables to be removed completely.

I guess Thomas P can provide his input here?

[Buildroot] [PATCH 4 of 6] uclibc: rename SETUP_DOT_CONFIG to FIXUP_DOT_CONFIG

[Arnout Vandecappelle]

On 07/14/14 21:51, Thomas De Schampheleire wrote:
> Arnout Vandecappelle <arnout@mind.be> schreef:
>> On 14/07/14 16:43, Thomas De Schampheleire wrote:
>>> On Mon, Jul 14, 2014 at 4:39 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>>>> Thomas?, All,
>>>>
>>>> On 2014-07-14 16:33 +0200, Thomas Petazzoni spake thusly:
>>>>> On Mon, 14 Jul 2014 13:50:28 +0200, Thomas De Schampheleire wrote:
>>>>>
>>>>>> -define UCLIBC_SETUP_DOT_CONFIG
>>>>>> +define UCLIBC_FIXUP_DOT_CONFIG
>>>>>>     $(INSTALL) -m 0644 $(UCLIBC_CONFIG_FILE) $(@D)/.config
>>>>>
>>>>> This this variable is actually copying the configuration file, I
>>>>> believe the current name of the variable is more correct than the one
>>>>> you propose to use, no?
>>>>
>>>> Thomas did the change, because in patch 5/6 it no longer does the copy,
>>>> it only does the fixup.
>>>>
>>>> This should probably have been explained in the commit log that the
>>>> change was needed by a future patch.
>>>
>>> Ok, I see. I split off the change to a separate patch for clarity, but
>>> indeed at this moment it is not yet fully accurate. I can fold this
>>> patch with the 5th patch, or otherwise update the commit msg as Yann
>>> proposed, what do you prefer?
>>
>> I'd fold it.
> 
> Since Yann says split it, I need a third opinion...

 Your own opinion counts as the third opinion, so split it.

 Regards,
 Arnout


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 5 of 6] uclibc: menuconfig: take into account initial settings from config file

[Arnout Vandecappelle]

On 07/14/14 21:54, Thomas De Schampheleire wrote:
>> Actually, I'd prefer the FOO_TARGET_* variables to be removed completely.
> I guess Thomas P can provide his input here?

 That removal would be completely independent of this series, of course...

 Regards,
 Arnout


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 0 of 6] uclibc: fix handling of configuration file

[Thomas Petazzoni]

Dear Thomas De Schampheleire,

On Mon, 14 Jul 2014 13:50:24 +0200, Thomas De Schampheleire wrote:

> Thomas De Schampheleire (6):
>     pkg-utils: kconfig helpers: add basic usage documentation
>     pkg-utils: kconfig helpers: use single iso double quoting
>     uclibc: replace custom kconfig helpers with those provided by pkg-utils
>     uclibc: rename SETUP_DOT_CONFIG to FIXUP_DOT_CONFIG
>     uclibc: menuconfig: take into account initial settings from config file
>     uclibc: update-config: preserve freshly configured settings

Patches 1 to 3 applied. The others are still in discussion.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 6 of 6] uclibc: update-config: preserve freshly configured settings

[Thomas De Schampheleire]

Hi Arnout,

On Mon, Jul 14, 2014 at 7:05 PM, Arnout Vandecappelle <arnout@mind.be> wrote:
> On 14/07/14 13:50, Thomas De Schampheleire wrote:
>> In the sequence:
>>
>> make uclibc-menuconfig
>> make uclibc-update-config
>>
>> the freshly configured settings from the menuconfig are lost during the
>> update-config step. This is because update-config depends on the configure
>> step, which starts by copying the config file to the build directory.
>>
>> Instead, stop depending on the configure step from update-config, and
>> introduce a new stamp file .stamp_config_fixup_done, which applies any
>> fixups on the .config file.
>
>  I think the commit message should explain why this stamp file is preferred over
> repeating the fixup in each target.
>

I'm trying to come up with good reasons here, but the only real one I
can find is to avoid duplicating code and avoid redoing the fixup
unnecessarily.

Did you have anything else in mind?

Best regards,
Thomas

[Buildroot] [PATCH 0 of 6] uclibc: fix handling of configuration file

[Thomas De Schampheleire]

Hi Thomas,

On Tue, Jul 15, 2014 at 7:36 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Thomas De Schampheleire,
>
> On Mon, 14 Jul 2014 13:50:24 +0200, Thomas De Schampheleire wrote:
>
>> Thomas De Schampheleire (6):
>>     pkg-utils: kconfig helpers: add basic usage documentation
>>     pkg-utils: kconfig helpers: use single iso double quoting
>>     uclibc: replace custom kconfig helpers with those provided by pkg-utils
>>     uclibc: rename SETUP_DOT_CONFIG to FIXUP_DOT_CONFIG
>>     uclibc: menuconfig: take into account initial settings from config file
>>     uclibc: update-config: preserve freshly configured settings
>
> Patches 1 to 3 applied. The others are still in discussion.
>

Thanks, updated patches 4-6 coming up...

[Buildroot] [PATCH 6 of 6] uclibc: update-config: preserve freshly configured settings

[Arnout Vandecappelle]

On 15/07/14 20:33, Thomas De Schampheleire wrote:
> Hi Arnout,
> 
> On Mon, Jul 14, 2014 at 7:05 PM, Arnout Vandecappelle <arnout@mind.be> wrote:
>> On 14/07/14 13:50, Thomas De Schampheleire wrote:
>>> In the sequence:
>>>
>>> make uclibc-menuconfig
>>> make uclibc-update-config
>>>
>>> the freshly configured settings from the menuconfig are lost during the
>>> update-config step. This is because update-config depends on the configure
>>> step, which starts by copying the config file to the build directory.
>>>
>>> Instead, stop depending on the configure step from update-config, and
>>> introduce a new stamp file .stamp_config_fixup_done, which applies any
>>> fixups on the .config file.
>>
>>  I think the commit message should explain why this stamp file is preferred over
>> repeating the fixup in each target.
>>
> 
> I'm trying to come up with good reasons here, but the only real one I
> can find is to avoid duplicating code and avoid redoing the fixup
> unnecessarily.
> 
> Did you have anything else in mind?

 Well, I never proposed to introduce an extra stamp file, did I? :-)

 The reasons you put forward are OK, they should just be mentioned in the commit
message because it's a change from how things are currently done, and this
should be motivated. That way, if someone later on finds a reason to revert to
repeating the fixup, they can see why it was done this way to begin with.

 BTW, it doesn't really avoid duplication of code. Now we have repetitions of

$(UCLIBC_DIR)/.stamp_configured: $(UCLIBC_DIR)/.stamp_config_fixup_done

and otherwise we'd have repetitions of

define UCLIBC_CONFIGURE_CMDS
	$(UCLIBC_FIXUP_DOT_CONFIG)


 Regards,
 Arnout


> 
> Best regards,
> Thomas
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 6 of 6] uclibc: update-config: preserve freshly configured settings

[Thomas De Schampheleire]

Hi Arnout,

On Wed, Jul 16, 2014 at 7:43 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
> On 15/07/14 20:33, Thomas De Schampheleire wrote:
>> Hi Arnout,
>>
>> On Mon, Jul 14, 2014 at 7:05 PM, Arnout Vandecappelle <arnout@mind.be> wrote:
>>> On 14/07/14 13:50, Thomas De Schampheleire wrote:
>>>> In the sequence:
>>>>
>>>> make uclibc-menuconfig
>>>> make uclibc-update-config
>>>>
>>>> the freshly configured settings from the menuconfig are lost during the
>>>> update-config step. This is because update-config depends on the configure
>>>> step, which starts by copying the config file to the build directory.
>>>>
>>>> Instead, stop depending on the configure step from update-config, and
>>>> introduce a new stamp file .stamp_config_fixup_done, which applies any
>>>> fixups on the .config file.
>>>
>>>  I think the commit message should explain why this stamp file is preferred over
>>> repeating the fixup in each target.
>>>
>>
>> I'm trying to come up with good reasons here, but the only real one I
>> can find is to avoid duplicating code and avoid redoing the fixup
>> unnecessarily.
>>
>> Did you have anything else in mind?
>
>  Well, I never proposed to introduce an extra stamp file, did I? :-)
>
>  The reasons you put forward are OK, they should just be mentioned in the commit
> message because it's a change from how things are currently done, and this
> should be motivated. That way, if someone later on finds a reason to revert to
> repeating the fixup, they can see why it was done this way to begin with.

Is the commit message of v2 sufficient for you or should I add something?

>
>  BTW, it doesn't really avoid duplication of code. Now we have repetitions of
>
> $(UCLIBC_DIR)/.stamp_configured: $(UCLIBC_DIR)/.stamp_config_fixup_done
>
> and otherwise we'd have repetitions of
>
> define UCLIBC_CONFIGURE_CMDS
>         $(UCLIBC_FIXUP_DOT_CONFIG)

Yes true.
If others also prefer the repeating of FIXUP_DOT_CONFIG over the stamp
file solution I can change that, of course.

Best regards,
thomas

[Buildroot] [PATCH 6 of 6] uclibc: update-config: preserve freshly configured settings

[Arnout Vandecappelle]

On 17/07/14 19:57, Thomas De Schampheleire wrote:
> Hi Arnout,
> 
> On Wed, Jul 16, 2014 at 7:43 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
>> On 15/07/14 20:33, Thomas De Schampheleire wrote:
>>> Hi Arnout,
>>>
>>> On Mon, Jul 14, 2014 at 7:05 PM, Arnout Vandecappelle <arnout@mind.be> wrote:
>>>> On 14/07/14 13:50, Thomas De Schampheleire wrote:
>>>>> In the sequence:
>>>>>
>>>>> make uclibc-menuconfig
>>>>> make uclibc-update-config
>>>>>
>>>>> the freshly configured settings from the menuconfig are lost during the
>>>>> update-config step. This is because update-config depends on the configure
>>>>> step, which starts by copying the config file to the build directory.
>>>>>
>>>>> Instead, stop depending on the configure step from update-config, and
>>>>> introduce a new stamp file .stamp_config_fixup_done, which applies any
>>>>> fixups on the .config file.
>>>>
>>>>  I think the commit message should explain why this stamp file is preferred over
>>>> repeating the fixup in each target.
>>>>
>>>
>>> I'm trying to come up with good reasons here, but the only real one I
>>> can find is to avoid duplicating code and avoid redoing the fixup
>>> unnecessarily.
>>>
>>> Did you have anything else in mind?
>>
>>  Well, I never proposed to introduce an extra stamp file, did I? :-)
>>
>>  The reasons you put forward are OK, they should just be mentioned in the commit
>> message because it's a change from how things are currently done, and this
>> should be motivated. That way, if someone later on finds a reason to revert to
>> repeating the fixup, they can see why it was done this way to begin with.
> 
> Is the commit message of v2 sufficient for you or should I add something?

 How about: "With the extra stamp file, we avoid redoing the fixup unnecessarily."

 (I don't have time now to look at v2 in detail.)

> 
>>
>>  BTW, it doesn't really avoid duplication of code. Now we have repetitions of
>>
>> $(UCLIBC_DIR)/.stamp_configured: $(UCLIBC_DIR)/.stamp_config_fixup_done
>>
>> and otherwise we'd have repetitions of
>>
>> define UCLIBC_CONFIGURE_CMDS
>>         $(UCLIBC_FIXUP_DOT_CONFIG)
> 
> Yes true.
> If others also prefer the repeating of FIXUP_DOT_CONFIG over the stamp
> file solution I can change that, of course.

 I'm OK with either way.

 I'm not really a big fan of adding an extra stamp file. However, I can imagine
that we'll evolve towards a new generic step between patch and configure (also
for e.g. autoreconf); then this approach will match nicely with the generic
infrastructure.

 Actually, this is probably one for Peter to rule upon.


 Regards,
 Arnout


> 
> Best regards,
> thomas
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 6 of 6] uclibc: update-config: preserve freshly configured settings

[Thomas De Schampheleire]

Hi Arnout, all,

On Fri, Jul 18, 2014 at 1:28 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
> On 17/07/14 19:57, Thomas De Schampheleire wrote:
>> Hi Arnout,
>>
>> On Wed, Jul 16, 2014 at 7:43 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
>>> On 15/07/14 20:33, Thomas De Schampheleire wrote:
>>>> Hi Arnout,
>>>>
>>>> On Mon, Jul 14, 2014 at 7:05 PM, Arnout Vandecappelle <arnout@mind.be> wrote:
>>>>> On 14/07/14 13:50, Thomas De Schampheleire wrote:
>>>>>> In the sequence:
>>>>>>
>>>>>> make uclibc-menuconfig
>>>>>> make uclibc-update-config
>>>>>>
>>>>>> the freshly configured settings from the menuconfig are lost during the
>>>>>> update-config step. This is because update-config depends on the configure
>>>>>> step, which starts by copying the config file to the build directory.
>>>>>>
>>>>>> Instead, stop depending on the configure step from update-config, and
>>>>>> introduce a new stamp file .stamp_config_fixup_done, which applies any
>>>>>> fixups on the .config file.
>>>>>
>>>>>  I think the commit message should explain why this stamp file is preferred over
>>>>> repeating the fixup in each target.
>>>>>
>>>>
>>>> I'm trying to come up with good reasons here, but the only real one I
>>>> can find is to avoid duplicating code and avoid redoing the fixup
>>>> unnecessarily.
>>>>
>>>> Did you have anything else in mind?
>>>
>>>  Well, I never proposed to introduce an extra stamp file, did I? :-)
>>>
>>>  The reasons you put forward are OK, they should just be mentioned in the commit
>>> message because it's a change from how things are currently done, and this
>>> should be motivated. That way, if someone later on finds a reason to revert to
>>> repeating the fixup, they can see why it was done this way to begin with.
>>
>> Is the commit message of v2 sufficient for you or should I add something?
>
>  How about: "With the extra stamp file, we avoid redoing the fixup unnecessarily."
>
>  (I don't have time now to look at v2 in detail.)
>
>>
>>>
>>>  BTW, it doesn't really avoid duplication of code. Now we have repetitions of
>>>
>>> $(UCLIBC_DIR)/.stamp_configured: $(UCLIBC_DIR)/.stamp_config_fixup_done
>>>
>>> and otherwise we'd have repetitions of
>>>
>>> define UCLIBC_CONFIGURE_CMDS
>>>         $(UCLIBC_FIXUP_DOT_CONFIG)
>>
>> Yes true.
>> If others also prefer the repeating of FIXUP_DOT_CONFIG over the stamp
>> file solution I can change that, of course.
>
>  I'm OK with either way.
>
>  I'm not really a big fan of adding an extra stamp file. However, I can imagine
> that we'll evolve towards a new generic step between patch and configure (also
> for e.g. autoreconf); then this approach will match nicely with the generic
> infrastructure.
>
>  Actually, this is probably one for Peter to rule upon.
>

I now found a pretty good reason why the stamp file is better: when
extracting the kconfig logic to a common kconfig-package
infrastructure, the stamp file rules and the dependency expressions
can entirely be placed
in that infrastructure. The package itself only has to provide a
FIXUP_DOT_CONFIG define.
If we do not use stamp files and let the CONFIGURE_CMDS actually
contain FIXUP_DOT_CONFIG, then it's the responsibility of the package
to actually add this, it is not under control of the kconfig-package,
so more fragile.

I will also add this to the commit message.

Best regards,
Thomas