Skip to contentSkip to conversation

Makefile: be careful what we remove from saved defconfig

PATCH New Yann E. MORIN 4 participants 6 messages Oct 21, 2020 – Oct 24, 2020 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Makefile: be careful what we remove from saved defconfig

When we savedefconfig, we remove BR2_DEFCONFIG (f71a621d91e, savedefconfig:
Remove BR2_DEFCONFIG from saved defconfig file) and BR2_DL_DIR (36edacce9c2,
Makefile: exclude BR2_DL_DIR from savedefconfig), because their meaning is only valid locally.

However, we were not careful to really match the exact variables, so we could match arbitrary options.

For example, these config options would all be dropped:

    BR2_DEFCONFIG="toto"
    BR2_DL_DIR="titi"
    BR2_PACKAGE_SABR2_DEFCONFIG="tutu"
    BR2_PACKAGE_SABR2_DL_DIR=y

While the first two are indeed the ones we want to drop, the last two are options (whatever their meaning or how poorly named they are) of the hypothetical 'sabr2' package, and we want to keep those in a defconfig.

When cleaning the just-saved defconfig, be sure to anchor the patterns to the beginning of the line.

Cc Sven Oliver Moll <[email protected]>
Cc Herve Codina <[email protected]>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Makefile +2 -2
index d1d19d8f40..d4751e278e 100644
@@ -1027,8 +1027,8 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
 	@$(COMMON_CONFIG_ENV) $< \
 		--savedefconfig=$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) \
 		$(CONFIG_CONFIG_IN)
-	@$(SED) '/BR2_DEFCONFIG=/d' \
-		-e '/BR2_DL_DIR=/d' \
+	@$(SED) '/^BR2_DEFCONFIG=/d' \
+		-e '/^BR2_DL_DIR=/d' \
 		$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig)
 
 .PHONY: defconfig savedefconfig update-defconfig
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 Makefile: be careful what we remove from saved defconfig

Quoted 19 lines · Yann E. MORIN

When we savedefconfig, we remove BR2_DEFCONFIG (f71a621d91e, savedefconfig:
Remove BR2_DEFCONFIG from saved defconfig file) and BR2_DL_DIR (36edacce9c2,
Makefile: exclude BR2_DL_DIR from savedefconfig), because their meaning is only valid locally.

However, we were not careful to really match the exact variables, so we could match arbitrary options.

For example, these config options would all be dropped:

     BR2_DEFCONFIG="toto"
     BR2_DL_DIR="titi"
     BR2_PACKAGE_SABR2_DEFCONFIG="tutu"
     BR2_PACKAGE_SABR2_DL_DIR=y

While the first two are indeed the ones we want to drop, the last two are options (whatever their meaning or how poorly named they are) of the hypothetical 'sabr2' package, and we want to keep those in a defconfig.

Quoted 6 lines

When cleaning the just-saved defconfig, be sure to anchor the patterns to the beginning of the line.

Cc Sven Oliver Moll <[email protected]>
Cc Herve Codina <[email protected]>

Oups, my bad.

Best regards,
Herve Codina

Quoted 19 lines
---
  Makefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
Makefile +2 -2
index d1d19d8f40..d4751e278e 100644
@@ -1027,8 +1027,8 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
  	@$(COMMON_CONFIG_ENV) $< \
  		--savedefconfig=$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) \
  		$(CONFIG_CONFIG_IN)
-	@$(SED) '/BR2_DEFCONFIG=/d' \
-		-e '/BR2_DL_DIR=/d' \
+	@$(SED) '/^BR2_DEFCONFIG=/d' \
+		-e '/^BR2_DL_DIR=/d' \
  		$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig)>   
  .PHONY: defconfig savedefconfig update-defconfig
 
#2 lore raw

PATCH 1/1 Makefile: be careful what we remove from saved defconfig

In reply to Yann E. MORIN
Quoted 34 lines · Yann E. MORIN

When we savedefconfig, we remove BR2_DEFCONFIG (f71a621d91e, savedefconfig:
Remove BR2_DEFCONFIG from saved defconfig file) and BR2_DL_DIR (36edacce9c2,
Makefile: exclude BR2_DL_DIR from savedefconfig), because their meaning is only valid locally.

However, we were not careful to really match the exact variables, so we could match arbitrary options.

For example, these config options would all be dropped:

     BR2_DEFCONFIG="toto"
     BR2_DL_DIR="titi"
     BR2_PACKAGE_SABR2_DEFCONFIG="tutu"
     BR2_PACKAGE_SABR2_DL_DIR=y

While the first two are indeed the ones we want to drop, the last two are options (whatever their meaning or how poorly named they are) of the hypothetical 'sabr2' package, and we want to keep those in a defconfig.

When cleaning the just-saved defconfig, be sure to anchor the patterns to the beginning of the line.

Cc Sven Oliver Moll <[email protected]>
Cc Herve Codina <[email protected]>
---
  Makefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
Makefile +0 -0
index d1d19d8f40..d4751e278e 100644

Makefile savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile · line 1032

Quoted 8 lines
Makefile +2 -2
@@ -1027,8 +1027,8 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile
  	@$(COMMON_CONFIG_ENV) $< \
  		--savedefconfig=$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) \
  		$(CONFIG_CONFIG_IN)
-	@$(SED) '/BR2_DEFCONFIG=/d' \
-		-e '/BR2_DL_DIR=/d' \
+	@$(SED) '/^BR2_DEFCONFIG=/d' \
+		-e '/^BR2_DL_DIR=/d' \
  		$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig)

Maybe I acked too quickly ...

What do you think about this pattern
@$(SED) '/^BR2_DEFCONFIG=/d' -e '/^# BR2_DEFCONFIG /
in order to match "BR2_DEFCONFIG=xxxxxxxx" and "# BR2_DEFCONFIG is not set" ?

Of course, same pattern for BR2_DL_DIR.

I am not sure that BR2_DEFCONFIG nor BR2_DL_DIR can be commented (ie can be not set) but this will prevent any traces of BR2_DEFCONFIG or BR2_DL_DIR even if commented.

Herve Codina

Quoted 3 lines
Makefile +0 -0
  .PHONY: defconfig savedefconfig update-defconfig
 
#3 lore raw

PATCH 1/1 Makefile: be careful what we remove from saved defconfig

Quoted 5 lines · Herv? CODINA

Maybe I acked too quickly ...

What do you think about this pattern
@$(SED) '/^BR2_DEFCONFIG=/d' -e '/^# BR2_DEFCONFIG /
in order to match "BR2_DEFCONFIG=xxxxxxxx" and "# BR2_DEFCONFIG is not set" ?

[...]

I don't think that this is necessary, because savedefconfig only saves the ones that are different from preset. So:
- BR2_DEFCONFIG is the name to save to, so an unset instance does not exist (a bit like chicken and egg)
- BR2_DL_DIR, when unset, will not appear as "# BR2_DL_DIR is unset" in the saved *_defconfig
...or am I missing something?

Greetings,
SvOlli

Signature · 4 lines
|  _______       |
| (  /\          |
|__)v\/lli a.k.a.| Be good, but not TOO good.
|Sven Oliver Moll|   -- Frumpy The Clown by Judd Winick (Final: June, 7th 1998)
#4 lore raw

PATCH 1/1 Makefile: be careful what we remove from saved defconfig

Quoted 17 lines · Sven Oliver Moll
Quoted 5 lines · Herv? CODINA

Maybe I acked too quickly ...

What do you think about this pattern
@$(SED) '/^BR2_DEFCONFIG=/d' -e '/^# BR2_DEFCONFIG /
in order to match "BR2_DEFCONFIG=xxxxxxxx" and "# BR2_DEFCONFIG is not set" ?

[...]

I don't think that this is necessary, because savedefconfig only saves the ones that are different from preset. So:
- BR2_DEFCONFIG is the name to save to, so an unset instance does not exist
? (a bit like chicken and egg)
- BR2_DL_DIR, when unset, will not appear as "# BR2_DL_DIR is unset" in the
? saved *_defconfig
...or am I missing something?

Quoted 2 lines

Greetings,
SvOlli

I didn't fully check if BR2_DEFCONFIG and BR2_DL_DIR can appear commented. As some commented 'symbols' are present in defconfig files in /configs directory, my remark was just a kind of belt and suspenders approach :-)

If BR2_DEFCONFIG and BR2_DL_DIR cannot appear commented, using just '/^BR2_DEFCONFIG=/d' and '/^BR2_DL_DIR=/d' is ok for me.

Herve

#5 lore raw

PATCH 1/1 Makefile: be careful what we remove from saved defconfig

In reply to Yann E. MORIN
Quoted 22 lines · On Wed, 21 Oct 2020 22:08:28 +0200 "Yann E. MORIN" <[email protected]>…

When we savedefconfig, we remove BR2_DEFCONFIG (f71a621d91e, savedefconfig:
Remove BR2_DEFCONFIG from saved defconfig file) and BR2_DL_DIR (36edacce9c2,
Makefile: exclude BR2_DL_DIR from savedefconfig), because their meaning is only valid locally.

However, we were not careful to really match the exact variables, so we could match arbitrary options.

For example, these config options would all be dropped:

    BR2_DEFCONFIG="toto"
    BR2_DL_DIR="titi"
    BR2_PACKAGE_SABR2_DEFCONFIG="tutu"
    BR2_PACKAGE_SABR2_DL_DIR=y

While the first two are indeed the ones we want to drop, the last two are options (whatever their meaning or how poorly named they are) of the hypothetical 'sabr2' package, and we want to keep those in a defconfig.

When cleaning the just-saved defconfig, be sure to anchor the patterns to the beginning of the line.

Quoted 6 lines
Cc Sven Oliver Moll <[email protected]>
Cc Herve Codina <[email protected]>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com