diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-29 12:10:16 +0100 |
---|---|---|
committer | Andreas Oberritter <obi@opendreambox.org> | 2020-06-01 15:21:41 +0200 |
commit | 5eb2cd8c2235e79b56034e26de34fc6b724fa8f8 (patch) | |
tree | 8b2ac215eada7d4699b1a10066b7fcd0ef308a10 /meta/recipes-support/ca-certificates/ca-certificates_20190110.bb | |
parent | 52dae775c2e8d58ff7ab12eff209692f47b040f7 (diff) | |
download | openembedded-core-contrib-5eb2cd8c2235e79b56034e26de34fc6b724fa8f8.tar.gz |
ca-certificates: Fix reproducibilty and multilib issueobi/pyro
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>
Diffstat (limited to 'meta/recipes-support/ca-certificates/ca-certificates_20190110.bb')
-rw-r--r-- | meta/recipes-support/ca-certificates/ca-certificates_20190110.bb | 2 |
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 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 } |