summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-29 12:10:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-29 17:12:27 +0100
commitc8f329fc562c9eecdcc1cb10d2c7661f44110fb4 (patch)
tree9f5e2721b4c55b200c96b123654c80d76fb42f02 /meta/recipes-support
parentfb064356af615d67d85b65942103bf943d84d290 (diff)
downloadopenembedded-core-c8f329fc562c9eecdcc1cb10d2c7661f44110fb4.tar.gz
openembedded-core-c8f329fc562c9eecdcc1cb10d2c7661f44110fb4.tar.bz2
openembedded-core-c8f329fc562c9eecdcc1cb10d2c7661f44110fb4.zip
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-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 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 () {
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
}