]> code.ossystems Code Review - openembedded-core.git/commitdiff
nss: Fix nss-native so the checksum doesn't change with BUILD_ARCH
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 8 Feb 2017 21:29:43 +0000 (21:29 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 9 Feb 2017 10:50:54 +0000 (10:50 +0000)
Switching between 32 and 64 bit BUILD_ARCH shows:

$ bitbake-diffsigs tmp-sstatesamehash*/stamps/*/nss-native/3.27.1-r0.do_compile.sigdata.*
basehash changed from 944cc4554a823ba966aeda0ac3d33b79 to 2475db3659c248d81d0e4dadb3c1b4cd
Variable SITEINFO_BITS value changed from '32' to '64'

We shouldn't have this dependency and it would fail oe-selftest test_sstate_32_64_same_hash
if nss-native were included, therefore exclude it.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-support/nss/nss_3.27.1.bb

index 9aad5bd41c469d6daff51aecc9c245fd4bce2f34..c89470fb11c8add8e5f49b7bec0f8ca64ef58553 100644 (file)
@@ -107,6 +107,7 @@ do_compile() {
         OS_TEST=${OS_TEST} \
         RPATH="${RPATH}"
 }
+do_compile[vardepsexclude] += "SITEINFO_BITS"
 
 
 do_install_prepend_class-nativesdk() {
@@ -180,6 +181,7 @@ do_install() {
         install -m 755 -t ${D}/${bindir} $binary
     done
 }
+do_install[vardepsexclude] += "SITEINFO_BITS"
 
 do_install_append() {
     # Create empty .chk files for the NSS libraries at build time. They could