@@ -10,11 +10,11 @@ Build-Depends:
kmod,
linux-firmware
Build-Depends-Arch:
- @KERNEL_SOURCE@-image-unsigned-@KERNEL_ABI_VERSION@-generic,
- @KERNEL_SOURCE@-modules-@KERNEL_ABI_VERSION@-generic,
- @KERNEL_SOURCE@-modules-extra-@KERNEL_ABI_VERSION@-generic,
- @KERNEL_SOURCE@-image-unsigned-@KERNEL_ABI_VERSION@-lowlatency,
- @KERNEL_SOURCE@-modules-@KERNEL_ABI_VERSION@-lowlatency,
+ linux-image-unsigned-@KERNEL_ABI_VERSION@-generic,
+ linux-modules-@KERNEL_ABI_VERSION@-generic,
+ linux-modules-extra-@KERNEL_ABI_VERSION@-generic,
+ linux-image-unsigned-@KERNEL_ABI_VERSION@-lowlatency,
+ linux-modules-@KERNEL_ABI_VERSION@-lowlatency,
Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-uc20/+git/@SERIES@
Package: @SRCPKGNAME@
@@ -6,7 +6,6 @@ DEBIAN=$(shell awk -F= '($$1 == "DEBIAN") { print $$2 }' <debian/debian.env)
SERIES=$(shell dpkg-parsechangelog -l$(DEBIAN)/changelog -SDistribution | sed -e 's/-\(security\|updates\|proposed\)$$//')
SOURCE=$(shell dpkg-parsechangelog -l$(DEBIAN)/changelog -SSource)
-KERNEL_SOURCE=$(shell echo "$(SOURCE)" | sed -e 's/-uc20-efi//')
VERSION=$(shell dpkg-parsechangelog -l$(DEBIAN)/changelog -SVersion)
KERNEL_ABI_VERSION=$(shell echo "$(VERSION)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[0-9]*\)\..*/\1/p')
@@ -25,8 +24,7 @@ debian/control:
sed <$(DEBIAN)/control.stub >debian/control \
-e 's/@SERIES@/$(SERIES)/g' \
-e 's/@KERNEL_ABI_VERSION@/$(KERNEL_ABI_VERSION)/g' \
- -e 's/@SRCPKGNAME@/$(SOURCE)/g' \
- -e 's/@KERNEL_SOURCE@/$(KERNEL_SOURCE)/g'
+ -e 's/@SRCPKGNAME@/$(SOURCE)/g'
cp $(DEBIAN)/changelog debian/changelog
.PHONY: debian/control
In creation of uc20-efi kernel.efi apps derivation of $(KERNEL_SOURCE) is not needed, because all dependencies are installed by $(ABI)-$(FLAVOUR). And all kernels share the same `linux-` prefix irrespective of which source package has built them. This change will make it easier to build kernel.efi apps for derivative kernels. BugLink: https://bugs.launchpad.net/bugs/1931242 Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> --- debian.uc20-efi/control.stub | 10 +++++----- debian/rules | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-)