]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
UBUNTU: [Packaging] build canonical-revoked-certs.pem from branch/arch certs
authorDimitri John Ledkov <dimitri.ledkov@canonical.com>
Tue, 15 Jun 2021 15:40:02 +0000 (16:40 +0100)
committerStefan Bader <stefan.bader@canonical.com>
Wed, 24 Nov 2021 14:28:35 +0000 (15:28 +0100)
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)
(xnox: cherry-pick is from impish:linux)
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
debian/rules

index f8d53afa289031a91f1ff1f1a1fb25d671454bda..b10128a11f0b4e1525d85b1f1db0edf2bda59298 100755 (executable)
@@ -137,7 +137,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
@@ -247,3 +247,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 >"$@"