[P/U] [PATCH v2 6/7] UBUNTU: [Packaging] remove unnecessary dependency on control.stub
Masahiro Yamada
masahiro.yamada at canonical.com
Thu Feb 20 06:33:40 UTC 2025
Comparing timestamps between the target and *.stub prerequisites is
unnecessary because this rule is always executed due to:
.PHONY: $(DEBIAN)/control.stub
All *.stub files are checked into the repository, so they are always
present. Even if they are accidentally deleted, the control-create
script would fail, making the issue immediately noticeable.
Signed-off-by: Masahiro Yamada <masahiro.yamada at canonical.com>
---
debian/rules | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/debian/rules b/debian/rules
index 39a4be4acb0a..c38eb2216dad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -161,28 +161,12 @@ include debian/rules.d/2-binary-arch.mk
# Builds the source and linux-headers indep packages
include debian/rules.d/3-binary-indep.mk
-control_files := $(DEBIAN)/control.stub.in
-ifeq ($(DEB_SOURCE),linux)
- control_files += debian/control.d/linux-libc-dev.stub
- control_files += debian/control.d/linux-tools-common.stub
- control_files += debian/control.d/linux-cloud-tools-common.stub
- control_files += debian/control.d/linux-tools-host.stub
- control_files += debian/control.d/linux-source.stub
- control_files += debian/control.d/linux-doc.stub
- control_files += debian/control.d/linux-bpf-dev.stub
-endif
-
# Calculate Ubuntu Compatible Signing levels
UBUNTU_COMPATIBLE_SIGNING=$(shell grep -qx ' *Subject: C = GB, ST = Isle of Man, O = Canonical Ltd., OU = Secure Boot, CN = Canonical Ltd. Secure Boot Signing (2021 v3)' debian/canonical-revoked-certs.pem && echo ubuntu/4 pro/3)
# Misc stuff
.PHONY: $(DEBIAN)/control.stub
-$(DEBIAN)/control.stub: \
- debian/scripts/control-create \
- $(control_files) \
- debian/canonical-revoked-certs.pem \
- debian/control.d/flavour-module.stub \
- $(DEBIAN)/changelog
+$(DEBIAN)/control.stub: debian/canonical-revoked-certs.pem $(DEBIAN)/changelog
debian/scripts/control-create $(DEB_SOURCE) > $(DEBIAN)/control.stub
sed -i -e 's/PKGVER/$(DEB_VERSION_UPSTREAM)/g' \
-e 's/ABINUM/$(abinum)/g' \
--
2.43.0
More information about the kernel-team
mailing list