APPLIED[B/D/E]: [SRU][B/D/E/F - ALL TREES][PATCH] UBUNTU: [Packaging] Fix config file assembly

[Kleber Souza]

On 22.01.20 08:32, Juerg Haefliger wrote:
> Commit 'UBUNTU: [Packaging] dkms -- switch to a consistent build prefix
> length and strip' introduced a helper tool fix-filenames which was added as
> a prerequisite to the $(stampdir)/stamp-prepare-tree-% rule. This rule
> generates the config file by concatenating all prereqs together
> (cat $^ ...) including the fix-filenames binary blob which results in
> warnings like:
> 
> scripts/kconfig/conf  --silentoldconfig Kconfig
> .config:8536:warning: unexpected data: ^?ELF^B^A^A
> .config:8073:warning: unexpected data:
> .config:8537:warning: unexpected data:
> .config:8538:warning: unexpected data:
> .config:8539:warning: unexpected data:
> 
> This is certainly not what we want, fix it.
> 
> Ignore: yes
> Signed-off-by: Juerg Haefliger <juergh at canonical.com>
> ---
>  debian/rules.d/2-binary-arch.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
> index a15d7921a682..684eaa55d40c 100644
> --- a/debian/rules.d/2-binary-arch.mk
> +++ b/debian/rules.d/2-binary-arch.mk
> @@ -30,7 +30,7 @@ $(stampdir)/stamp-prepare-tree-%: $(commonconfdir)/config.common.$(family) $(arc
>  	touch $(builddir)/build-$*/ubuntu-build
>  	[ "$(do_full_source)" != 'true' ] && true || \
>  		rsync -a --exclude debian --exclude debian.master --exclude $(DEBIAN) * $(builddir)/build-$*
> -	cat $^ | sed -e 's/.*CONFIG_VERSION_SIGNATURE.*/CONFIG_VERSION_SIGNATURE="Ubuntu $(release)-$(revision)-$* $(raw_kernelversion)"/' > $(builddir)/build-$*/.config
> +	cat $(wordlist 1,3,$^) | sed -e 's/.*CONFIG_VERSION_SIGNATURE.*/CONFIG_VERSION_SIGNATURE="Ubuntu $(release)-$(revision)-$* $(raw_kernelversion)"/' > $(builddir)/build-$*/.config
>  	find $(builddir)/build-$* -name "*.ko" | xargs rm -f
>  	$(build_cd) $(kmake) $(build_O) -j1 syncconfig prepare scripts
>  	touch $@
> 

Applied to bionic/linux, disco/linux and eoan/linux.

Thanks,
Kleber