[oe-commits] [openembedded-core] 10/17: ca-certificates: avoid using += with an over-ride

[git at git.openembedded.org]

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

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

commit c1f18efda0280644b4a4ce6f2988fb7ada71faf6
Author: Andre McCurdy <armccurdy at gmail.com>
AuthorDate: Thu Jul 5 22:07:02 2018 -0700

    ca-certificates: avoid using += with an over-ride
    
    Using += with an over-ride can be a source of confusion so try to
    avoid the construct in core recipes.
    
    In this case, the commit which added the over-ride seems to have been
    buggy - the commit message mentions "add to SYSROOT_DIRS" rather than
    a correct description of what the change actually did, ie "over-ride
    SYSROOT_DIRS":
    
      http://git.openembedded.org/openembedded-core/commit/?id=355e49e19abb3e729c82a6de46ada8da8a257f58
    
    The commit also appears to have been unnecessary as ${sysconfdir} is
    appended to SYSROOT_DIRS for -native recipes by default from within
    staging.bbclass.
    
    To workaround the bug introduced by the first commit, a subsequent
    commit later added ${datadir}/ca-certificates to the over-ride value
    (which would not normally be necessary as ${datadir} is included in
    the default value of SYSROOT_DIRS - ie the value which was lost due
    to being over-ridden):
    
      http://git.openembedded.org/openembedded-core/commit/?id=09bb7718d74573be9a5db4d0737fb14126f6489c
    
    Therefore the fix seem to be to remove the SYSROOT_DIRS over-ride
    entirely - the default value of SYSROOT_DIRS set by staging.bbclass
    includes both ${datadir} and ${sysconfdir} when building for -native.
    
    Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-support/ca-certificates/ca-certificates_20170717.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb b/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb
index 3502948..24d3a6e 100644
--- a/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb
+++ b/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb
@@ -26,7 +26,6 @@ SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \
            "
 
 S = "${WORKDIR}/git"
-SYSROOT_DIRS_class-native += "${sysconfdir} ${datadir}/ca-certificates"
 
 inherit allarch
 

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