randconfig, allyesconfig: fix handling of legacy options

Currently, randconfig is completely unusable. Instead, we use randpackageconfig, with two use cases: in the autobuilders, and when doing manual testing of the validity of depends/select chains. In both cases, we actually want the possibility to explicitly select some packages or to set a string value or to randomise between a choice or to test bootloaders and kernels - all of this is currently impossible.

This patch adds a BR2_RAND_PRESEED_CONFIG_FILES environment variable that can be set to a (set of) files with config options that should be set or unset. randconfig and randpackageconfig will force these values.

Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Cc "Yann E. MORIN" <[email protected]>

Cc Thomas Petazzoni <[email protected]>

---
v3:
- use 'cat' instead of 'cp', to support multiple files. [Yann]

v2:
- split off the fix for legacy
- apply to both randconfig and randpackageconfig
- rename to BR2_RAND_PRESEED_CONFIG_FILES because it supports multiple files

Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
 Makefile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Makefile +10 -2

index 5bcaa77..070c2e8 100644
@@ -732,6 +732,9 @@ oldconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 randconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
 	@rm -f $(CONFIG_DIR)/.config.nopkg
+ifneq ($(BR2_RAND_PRESEED_CONFIG_FILES),)
+	@cat $(BR2_RAND_PRESEED_CONFIG_FILES) > $(CONFIG_DIR)/.config.nopkg
+endif
 	@grep '^config ' Config.in.legacy | \
 		while read config pkg; do \
 		echo "# $$pkg is not set" >> $(CONFIG_DIR)/.config.nopkg; done

@@ -758,6 +761,9 @@ allnoconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 randpackageconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
 	@grep -v BR2_PACKAGE_ $(BR2_CONFIG) > $(CONFIG_DIR)/.config.nopkg
+ifneq ($(BR2_RAND_PRESEED_CONFIG_FILES),)
+	@grep BR2_PACKAGE_ $(BR2_RAND_PRESEED_CONFIG_FILES) >> $(CONFIG_DIR)/.config.nopkg
+endif
 	@grep '^config BR2_PACKAGE_' Config.in.legacy | \
 		while read config pkg; do \
 		echo "# $$pkg is not set" >> $(CONFIG_DIR)/.config.nopkg; done

@@ -870,13 +876,15 @@ help:
 	@echo '  oldconfig              - resolve any unresolved symbols in .config'
 	@echo '  silentoldconfig        - Same as oldconfig, but quietly, additionally update deps'
 	@echo '  olddefconfig           - Same as silentoldconfig but sets new symbols to their default value'
-	@echo '  randconfig             - New config with random answer to all options'
+	@echo '  randconfig             - New config with random answer to all options -'
+	@echo '                             options can be forced by setting BR2_RAND_PRESEED_CONFIG_FILES'
 	@echo '  defconfig              - New config with default answer to all options'
 	@echo '                             BR2_DEFCONFIG, if set, is used as input'
 	@echo '  savedefconfig          - Save current config as ./defconfig (minimal config)'
 	@echo '  allyesconfig           - New config where all options are accepted with yes'
 	@echo '  allnoconfig            - New config where all options are answered with no'
-	@echo '  randpackageconfig      - New config with random answer to package options'
+	@echo '  randpackageconfig      - New config with random answer to package options -'
+	@echo '                             options can be forced by setting BR2_RAND_PRESEED_CONFIG_FILES'
 	@echo '  allyespackageconfig    - New config where pkg options are accepted with yes'
 	@echo '  allnopackageconfig     - New config where package options are answered with no'
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)

Signature · 1 line

2.1.1

Randconfig and allyesconfig should never select legacy options, so use the same trick as allpackageyesconfig and randpackageconfig to remove them.

Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

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

---
 Makefile | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

Makefile +9 -2

index 907a0fc..5bcaa77 100644
@@ -731,11 +731,25 @@ oldconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 
 randconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
-	@$(COMMON_CONFIG_ENV) $< --randconfig $(CONFIG_CONFIG_IN)
+	@rm -f $(CONFIG_DIR)/.config.nopkg
+	@grep '^config ' Config.in.legacy | \
+		while read config pkg; do \
+		echo "# $$pkg is not set" >> $(CONFIG_DIR)/.config.nopkg; done
+	@$(COMMON_CONFIG_ENV) \
+		KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \
+		$< --randconfig $(CONFIG_CONFIG_IN)
+	@rm -f $(CONFIG_DIR)/.config.nopkg
 
 allyesconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@mkdir -p $(BUILD_DIR)/buildroot-config
-	@$(COMMON_CONFIG_ENV) $< --allyesconfig $(CONFIG_CONFIG_IN)
+	@rm -f $(CONFIG_DIR)/.config.nopkg

I was going to apply this, and then I tested it, to discover that it then causes the same problem as the one we have with randpackageconfig
today: none of the choice options get randomized anymore. So before this patch, if you do "randconfig", you get proper randomization. After this patch, if you do "randconfig", it only generates i386 configurations.

I admit it's not really an issue introduced by the patch as the issue already exists for randpackageconfig. But it's very annoying :/

Hello,

Quoted 7 lines · Thomas Petazzoni

I was going to apply this, and then I tested it, to discover that it then causes the same problem as the one we have with randpackageconfig
today: none of the choice options get randomized anymore. So before this patch, if you do "randconfig", you get proper randomization. After this patch, if you do "randconfig", it only generates i386 configurations.

Quoted 2 lines

I admit it's not really an issue introduced by the patch as the issue already exists for randpackageconfig. But it's very annoying :/

Any comment about this?

Quoted 4 lines

Quoted 2 lines

I admit it's not really an issue introduced by the patch as the issue already exists for randpackageconfig. But it's very annoying :/

Any comment about this?

Well, as you explained to me in Dusseldorf, the main reason to use randconfig
is to test against buggy Config.in depends/select chains. If the choices wouldn't get properly randomized anymore, that would really kill this use case. So I guess that's a no go.

Dear Arnout Vandecappelle,

Quoted 9 lines · Arnout Vandecappelle

Quoted 4 lines

Quoted 2 lines

I admit it's not really an issue introduced by the patch as the issue already exists for randpackageconfig. But it's very annoying :/

Any comment about this?

Well, as you explained to me in Dusseldorf, the main reason to use randconfig
is to test against buggy Config.in depends/select chains. If the choices wouldn't get properly randomized anymore, that would really kill this use case. So I guess that's a no go.

Well, the other day, I actually attempted to use randconfig to really have random configurations, and see how broken they are. But randconfig is unusable today, since it selects a bunch of legacy options, which prevents the build from starting.