[oe-commits] [openembedded-core] 01/02: ca-certificates: Fix reproducibilty and multilib issue

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 87db874263a0268820c6a250dc9b93be0facbf47
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Thu Aug 29 12:10:16 2019 +0100

    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 at linuxfoundation.org>
---
 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 efd9eaa..7d87da1 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
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.