From 5eb2cd8c2235e79b56034e26de34fc6b724fa8f8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 29 Aug 2019 12:10:16 +0100 Subject: ca-certificates: Fix reproducibilty and multilib issue This command was dependent on the order of files on the disk and for multilib builds could result in: Error: Transaction check error: file /etc/ca-certificates.conf conflicts between attempted installs of ca-certificates-20190110-r0.core2_32 and lib64-ca-certificates-20190110-r0.x86_64 Sorting the file makes things deterministic. Signed-off-by: Richard Purdie (cherry picked from commit c8f329fc562c9eecdcc1cb10d2c7661f44110fb4) Signed-off-by: Andreas Oberritter --- meta/recipes-support/ca-certificates/ca-certificates_20190110.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb b/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb index b9f57900c8..775d69e2ee 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb +++ b/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb @@ -53,7 +53,7 @@ do_install () { echo "# Lines starting with ! will remove certificate on next update" echo "#" find ${D}${datadir}/ca-certificates -type f -name '*.crt' | \ - sed 's,^${D}${datadir}/ca-certificates/,,' + sed 's,^${D}${datadir}/ca-certificates/,,' | sort } >${D}${sysconfdir}/ca-certificates.conf } -- cgit 1.2.3-korg