summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-29 12:10:16 +0100
committerAndreas Oberritter <obi@opendreambox.org>2020-06-01 16:40:52 +0200
commitac82863292019706771541993afe1a0c5a5184ca (patch)
treecc1d5291155a0e8f813f4090b44313a18e11ce57
parent7aa080b79eb032ab06e0c3aff9c2a9033c0c197b (diff)
downloadopenembedded-core-contrib-obi/krogoth.tar.gz
openembedded-core-contrib-obi/krogoth.tar.bz2
openembedded-core-contrib-obi/krogoth.zip
ca-certificates: Fix reproducibilty and multilib issueobi/krogoth
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 <richard.purdie@linuxfoundation.org> (cherry picked from commit c8f329fc562c9eecdcc1cb10d2c7661f44110fb4) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r--meta/recipes-support/ca-certificates/ca-certificates_20190110.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb b/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb
index 87c0b0e03a..4152fe12a9 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
}