[linux-uc20-efi][FOCAL][PATCH 1/2] UBUNTU: [Packaging] drop usage of KERNEL_SOURCE

Dimitri John Ledkov dimitri.ledkov at canonical.com
Tue Jun 8 11:56:13 UTC 2021


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 at canonical.com>
---
 debian.uc20-efi/control.stub | 10 +++++-----
 debian/rules                 |  4 +---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian.uc20-efi/control.stub b/debian.uc20-efi/control.stub
index 22999ab..bfe5555 100644
--- a/debian.uc20-efi/control.stub
+++ b/debian.uc20-efi/control.stub
@@ -10,11 +10,11 @@ Build-Depends:
  kmod,
  linux-firmware
 Build-Depends-Arch:
- @KERNEL_SOURCE at -image-unsigned-@KERNEL_ABI_VERSION at -generic,
- @KERNEL_SOURCE at -modules-@KERNEL_ABI_VERSION at -generic,
- @KERNEL_SOURCE at -modules-extra-@KERNEL_ABI_VERSION at -generic,
- @KERNEL_SOURCE at -image-unsigned-@KERNEL_ABI_VERSION at -lowlatency,
- @KERNEL_SOURCE at -modules-@KERNEL_ABI_VERSION at -lowlatency,
+ linux-image-unsigned- at KERNEL_ABI_VERSION@-generic,
+ linux-modules- at KERNEL_ABI_VERSION@-generic,
+ linux-modules-extra- at KERNEL_ABI_VERSION@-generic,
+ linux-image-unsigned- at KERNEL_ABI_VERSION@-lowlatency,
+ linux-modules- at KERNEL_ABI_VERSION@-lowlatency,
 Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-uc20/+git/@SERIES@
 
 Package: @SRCPKGNAME@
diff --git a/debian/rules b/debian/rules
index 1d85292..f6e6ec0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
-- 
2.27.0




More information about the kernel-team mailing list