Skip to content

Commit 413d86c

Browse files
masahir0ypiso77
authored andcommitted
UBUNTU: [Packaging] avoid arch-specific certificate creation
Currently, the debian/canonical-(revoked-)certs.pem files are generated by the clean target and included in the source package. These files are created by concatenating *-all.pem and *-$(arch).pem files. When creating a source package, $(arch) expands to the architecture of the build machine. Although it is unclear whether arch-specific certificates have ever been used, if they were, canonical-(revoked-)certs.pem would become architecture-specific, resulting in an architecture-dependent source package. The source package should be consistent, regardless of the architecture of the build machine. This commit changes the build rules to concatenate all *.pem files, ensuring the output is independent of the build machine architecture. Signed-off-by: Masahiro Yamada <masahiro.yamada@canonical.com> Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
1 parent 01968e5 commit 413d86c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

debian/rules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ $(DEBIAN)/control.stub: \
213213
debian/control: $(DEBIAN)/control.stub
214214
cp $(DEBIAN)/control.stub debian/control
215215

216-
debian/canonical-certs.pem: $(wildcard debian/certs/*-all.pem) $(wildcard debian/certs/*-$(arch).pem) $(wildcard $(DEBIAN)/certs/*-all.pem) $(wildcard $(DEBIAN)/certs/*-$(arch).pem)
216+
debian/canonical-certs.pem: $(wildcard debian/certs/*.pem $(DEBIAN)/certs/*.pem)
217217
for cert in $(sort $(notdir $^)); \
218218
do \
219219
for dir in $(DEBIAN) debian; \
@@ -225,7 +225,7 @@ debian/canonical-certs.pem: $(wildcard debian/certs/*-all.pem) $(wildcard debian
225225
done; \
226226
done >"$@"
227227

228-
debian/canonical-revoked-certs.pem: $(wildcard debian/revoked-certs/*-all.pem) $(wildcard debian/revoked-certs/*-$(arch).pem) $(wildcard $(DEBIAN)/revoked-certs/*-all.pem) $(wildcard $(DEBIAN)/revoked-certs/*-$(arch).pem)
228+
debian/canonical-revoked-certs.pem: $(wildcard debian/revoked-certs/*.pem $(DEBIAN)/revoked-certs/*.pem)
229229
for cert in $(sort $(notdir $^)); \
230230
do \
231231
for dir in $(DEBIAN) debian; \

0 commit comments

Comments
 (0)