[PATCH v3 2/2] sdk: unset BINARY_FOLDER and DOWNLOAD_FOLDER in final archives

[Sven Roederer]

Baptiste,

Am Donnerstag, 6. Mai 2021, 13:08:56 CEST schrieb Baptiste Jonglez:
> Hi,
> 
> > 
> >  target/sdk/Makefile          | 1 +
> >  target/sdk/convert-config.pl | 8 +++++++-
> >  2 files changed, 8 insertions(+), 1 deletion(-)
> > 
> > diff --git a/target/sdk/Makefile b/target/sdk/Makefile
> > index 0606621192..5330d14955 100644
> > --- a/target/sdk/Makefile
> > +++ b/target/sdk/Makefile
> > @@ -159,6 +159,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.xz: clean
> > 
> >  	$(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g'
> >  	$(SDK_BUILD_DIR)/include/version.mk $(SED) 's,^#
> >  	SOURCE_DATE_EPOCH:=.*,SOURCE_DATE_EPOCH:=$(SOURCE_DATE_EPOCH),g'
> >  	$(SDK_BUILD_DIR)/include/version.mk $(SED) '/LINUX_VERMAGIC:=/ {
> >  	s,unknown,$(LINUX_VERMAGIC),g }' $(SDK_BUILD_DIR)/include/kernel.mk> 
> > +	$(SED) 's,default "$(CONFIG_DOWNLOAD_FOLDER)",default "",'
> > $(SDK_BUILD_DIR)/Config.in
> This is unnecessary: as far as I can tell, this file is just copied
> verbatim from target/sdk/files/Config.in and does not contain any
> build-time setting.

Seems you are right ... Need to check again if this is just a forgotten change 
of the initial version or if it's really needed.
My initial chages did not use the changes of sdk/convert-config.pl ...

> > 
> > diff --git a/target/sdk/convert-config.pl b/target/sdk/convert-config.pl
> > index f73744af09..08189df95c 100755
> > --- a/target/sdk/convert-config.pl
> > +++ b/target/sdk/convert-config.pl
> > @@ -9,7 +9,13 @@ while (<>) {
> > 
> >  	chomp;
> >  	next if /^CONFIG_SIGNED_PACKAGES/;
> > 
> > -	if (/^CONFIG_([^=]+)=(.*)$/) {
> > +	if (/^CONFIG_((BINARY)|(DOWNLOAD))_FOLDER=(.*)$/) {
> > +		# We don't want to preserve the build setting of
> > +		# BINARY_FOLDER and DOWNLOAD_FOLDER.
> > +		$var = "$1_FOLDER";
> > +		$val = '""';
> > +		$type = "string";
> > +	} elsif (/^CONFIG_([^=]+)=(.*)$/) {
> > 
> >  		$var = $1;
> >  		$val = $2;

Sven