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 <juerg.haefliger@canonical.com> Acked-by: Agathe Porte <agathe.porte@canonical.com> Acked-by: Tim Gardner <tim.gardner@canonical.com> Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
This commit is contained in:
committed by
Paolo Pisati
parent
1aebdd48f3
commit
2fdf3ac718
Vendored
+1
-5
@@ -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/' \
|
||||
|
||||
Reference in New Issue
Block a user