From 2fdf3ac718285fc064a93af98c497198bd8b3426 Mon Sep 17 00:00:00 2001 From: Juerg Haefliger Date: Fri, 24 Nov 2023 14:28:32 +0100 Subject: [PATCH] UBUNTU: [Packaging] Remove obsolete config handling Remove hopefully the last remaining leftovers from the old pre-annotations-only config scheme. While at it, drop the duplicate/redundant 'sed' call. Or am I missing something? Signed-off-by: Juerg Haefliger Acked-by: Agathe Porte Acked-by: Tim Gardner Signed-off-by: Dimitri John Ledkov --- debian/rules.d/2-binary-arch.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 4a39f4b3c347..1fea47680ced 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -15,11 +15,7 @@ $(stampdir)/stamp-prepare-tree-%: debian/scripts/fix-filenames @echo Debug: $@ install -d $(builddir)/build-$* touch $(builddir)/build-$*/ubuntu-build - if [ -e $(commonconfdir)/config.common.ubuntu ]; then \ - cat $(commonconfdir)/config.common.ubuntu $(archconfdir)/config.common.$(arch) $(archconfdir)/config.flavour.$(target_flavour) > $(builddir)/build-$*/.config; \ - else \ - python3 debian/scripts/misc/annotations --export --arch $(arch) --flavour $(target_flavour) | sed -e 's/.*CONFIG_VERSION_SIGNATURE.*/CONFIG_VERSION_SIGNATURE="Ubuntu $(release)-$(revision)-$* $(raw_kernelversion)"/' > $(builddir)/build-$*/.config; \ - fi + python3 debian/scripts/misc/annotations --export --arch $(arch) --flavour $(target_flavour) > $(builddir)/build-$*/.config sed -i 's/.*CONFIG_VERSION_SIGNATURE.*/CONFIG_VERSION_SIGNATURE="Ubuntu $(release)-$(revision)-$* $(raw_kernelversion)"/' $(builddir)/build-$*/.config [ "$(do_odm_drivers)" = 'true' ] && true || \ sed -ie 's/.*CONFIG_UBUNTU_ODM_DRIVERS.*/# CONFIG_UBUNTU_ODM_DRIVERS is not set/' \