[Buildroot] [PATCH 0 of 2] Facilitate saving of configuration files for board developers

[Buildroot] [PATCH 0 of 2] Facilitate saving of configuration files for board developers

[Thomas De Schampheleire]

This patch series intends to make the development life of board developers
working with buildroot easier, by providing two extra -update build targets
that copy over configuration files to their version-controlled counterparts.
The new targets, linux-update and config-update have the same behavior as
the already existing uclibc-update and busybox-update.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
 linux/linux.mk |   7 +++++++
 Config.in      |  11 +++++++++++
 Makefile       |   9 +++++++++
 3 files changed, 27 insertions(+), 0 deletions(-)

[Buildroot] [PATCH 1 of 2] linux: add linux-update target to save configuration

[Thomas De Schampheleire]

In analogy to build targets uclibc-update and busybox-update, add linux-update
that copies the current configuration to the custom configuration file set in
buildroot.
This facilitates the work of developers adding support for a specific board
to buildroot.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
 linux/linux.mk |  7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -163,6 +163,13 @@
 	$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) \
 		$(subst linux-,,$(subst linux26-,,$@))
 
+ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)
+linux-update linux26-update: $(LINUX26_DIR)/.config
+	cp -f $(LINUX26_DIR)/.config $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)
+else
+linux-update linux26-update: ;
+endif
+
 # Support for rebuilding the kernel after the initramfs file list has
 # been generated in $(BINARIES_DIR)/rootfs.initramfs.
 $(LINUX26_DIR)/.stamp_initramfs_rebuilt: $(LINUX26_DIR)/.stamp_installed $(BINARIES_DIR)/rootfs.initramfs

[Buildroot] [PATCH 2 of 2] Add config-update target to save buildroot configuration, e.g. to defconfig

[Thomas De Schampheleire]

Add build target config-update that allows saving a buildroot configuration
to a backup location, e.g. the appropriate defconfig. The location to backup
to is specified with a new buildroot configuration option.
This facilitates the work of developers adding support for a specific board
to buildroot.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
 Config.in |  11 +++++++++++
 Makefile  |   9 +++++++++
 2 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/Config.in b/Config.in
--- a/Config.in
+++ b/Config.in
@@ -10,6 +10,17 @@
 	string
 	option env="BR2_VERSION_FULL"
 
+config BR2_BACKUP_CONFIG
+	string "Backup configuration file"
+	default ""
+	help
+	  If you set a configuration file here and run 'make config-update',
+	  the buildroot configuration will be copied to that file.
+	  This can be useful if you want to put the buildroot configuration
+	  under version control.
+	  If you are working on a specific board, it may be a good idea to
+	  specify the board_defconfig file here.
+
 source "target/Config.in.arch"
 
 menu "Build options"
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -598,6 +598,7 @@
 %_defconfig: $(BUILD_DIR)/buildroot-config/conf $(TOPDIR)/configs/%_defconfig outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
 	@$(COMMON_CONFIG_ENV) $< --defconfig=$(TOPDIR)/configs/$@ $(CONFIG_CONFIG_IN)
+	@sed -i 's,BR2_BACKUP_CONFIG.*,BR2_BACKUP_CONFIG="$(TOPDIR)/configs/$@",' $(CONFIG_DIR)/.config
 
 savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
@@ -609,6 +610,14 @@
 
 endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 
+ifneq ($(BR2_BACKUP_CONFIG),"")
+config-update: $(CONFIG_DIR)/.config
+	cp -f $(CONFIG_DIR)/.config $(BR2_BACKUP_CONFIG)
+else
+config-update: ;
+endif
+
+
 #############################################################
 #
 # Cleanup and misc junk

[Buildroot] [PATCH 0 of 2] Facilitate saving of configuration files for board developers

[Daniel Nyström]

2011/2/27 Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>:
> This patch series intends to make the development life of board developers
> working with buildroot easier, by providing two extra -update build targets
> that copy over configuration files to their version-controlled counterparts.
> The new targets, linux-update and config-update have the same behavior as
> the already existing uclibc-update and busybox-update.
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

Great contribution! My thumbs-up for this patchset. :)

[Buildroot] [PATCH 0 of 2] Facilitate saving of configuration files for board developers

[Thomas De Schampheleire]

2011/2/28 Daniel Nystr?m <daniel.nystrom@timeterminal.se>:
> 2011/2/27 Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>:
>> This patch series intends to make the development life of board developers
>> working with buildroot easier, by providing two extra -update build targets
>> that copy over configuration files to their version-controlled counterparts.
>> The new targets, linux-update and config-update have the same behavior as
>> the already existing uclibc-update and busybox-update.
>>
>> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
> Great contribution! My thumbs-up for this patchset. :)
>

Thanks Daniel!

Do others have any comments regarding this patch series? Could it be
included in buildroot?

Thanks, Thomas

[Buildroot] [PATCH 0 of 2] Facilitate saving of configuration files for board developers

[Thomas De Schampheleire]

2011/3/6 Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>:
> 2011/2/28 Daniel Nystr?m <daniel.nystrom@timeterminal.se>:
>> 2011/2/27 Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>:
>>> This patch series intends to make the development life of board developers
>>> working with buildroot easier, by providing two extra -update build targets
>>> that copy over configuration files to their version-controlled counterparts.
>>> The new targets, linux-update and config-update have the same behavior as
>>> the already existing uclibc-update and busybox-update.
>>>
>>> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>>
>> Great contribution! My thumbs-up for this patchset. :)
>>
>
> Thanks Daniel!
>
> Do others have any comments regarding this patch series? Could it be
> included in buildroot?

Thomas, Peter,

Any objections against these patches?

Thanks,
Thomas