diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-29 12:10:16 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-29 17:12:34 +0100 |
commit | ba6a568512d46d49173998a7fb15cd8ee3302551 (patch) | |
tree | 5727c102b274ee61f94c8a9ec6e836bf4cb38403 /meta/recipes-support/ca-certificates | |
parent | a91448bf731ef29a841a93e991e7b75efb5f1e28 (diff) | |
download | poky-ba6a568512d46d49173998a7fb15cd8ee3302551.tar.gz |
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.
(From OE-Core rev: c8f329fc562c9eecdcc1cb10d2c7661f44110fb4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/ca-certificates')
-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 efd9eaa71e..7d87da10bb 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 () { | |||
53 | echo "# Lines starting with ! will remove certificate on next update" | 53 | echo "# Lines starting with ! will remove certificate on next update" |
54 | echo "#" | 54 | echo "#" |
55 | find ${D}${datadir}/ca-certificates -type f -name '*.crt' | \ | 55 | find ${D}${datadir}/ca-certificates -type f -name '*.crt' | \ |
56 | sed 's,^${D}${datadir}/ca-certificates/,,' | 56 | sed 's,^${D}${datadir}/ca-certificates/,,' | sort |
57 | } >${D}${sysconfdir}/ca-certificates.conf | 57 | } >${D}${sysconfdir}/ca-certificates.conf |
58 | } | 58 | } |
59 | 59 | ||