diff mbox series

[FOCAL,linux-oem-5.10,08/10] UBUNTU: [Packaging] build canonical-revoked-certs.pem from branch/arch certs

Message ID 20210823133353.37046-9-dimitri.ledkov@canonical.com
State Accepted
Headers show
Series Backport builtin revocation certs | expand

Commit Message

Dimitri John Ledkov Aug. 23, 2021, 1:33 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1932029
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
(cherry picked from commit 3e44f229eef829ee3044651975512569824c4e5f)
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
[KelseyS: SHA1 from cherry pick line is from Impish. Patch has been submitted
to upstream, though not yet reviewed/applied.]
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
---
 debian/rules | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/debian/rules b/debian/rules
index e6af4aa887..6f9f20d56b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -129,7 +129,7 @@  binary: binary-indep binary-arch
 
 build: build-arch build-indep
 
-clean: debian/control debian/canonical-certs.pem
+clean: debian/control debian/canonical-certs.pem debian/canonical-revoked-certs.pem
 	dh_testdir
 	dh_testroot
 	dh_clean
@@ -239,3 +239,15 @@  debian/canonical-certs.pem: $(wildcard $(DROOT)/certs/*-all.pem) $(wildcard $(DR
 			fi;							\
 		done;								\
 	done >"$@"
+
+debian/canonical-revoked-certs.pem: $(wildcard $(DROOT)/revoked-certs/*-all.pem) $(wildcard $(DROOT)/revoked-certs/*-$(arch).pem) $(wildcard $(DEBIAN)/revoked-certs/*-all.pem) $(wildcard $(DEBIAN)/revoked-certs/*-$(arch).pem)
+	for cert in $(sort $(notdir $^));					\
+	do									\
+		for dir in $(DEBIAN) $(DROOT);					\
+		do								\
+			if [ -f "$$dir/revoked-certs/$$cert" ]; then		\
+				cat "$$dir/revoked-certs/$$cert";		\
+				break;						\
+			fi;							\
+		done;								\
+	done >"$@"