From: Juerg Haefliger Date: Wed, 22 Jan 2020 07:32:00 +0000 (+0100) Subject: UBUNTU: [Packaging] Fix config file assembly X-Git-Tag: Ubuntu-5.3.0-41.33~18 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d2f735f43991f96cdafa90a041c96822e5c71a7f;p=mirror_ubuntu-eoan-kernel.git UBUNTU: [Packaging] Fix config file assembly 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 Acked-by: Stefan Bader Acked-by: Seth Forshee Signed-off-by: Kleber Sacilotto de Souza --- diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 45c46cab912c..08c5978bf678 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 $@