[oe-commits] Saul Wold : nss: nss.pc is not target specific

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: f70efca58e9411feb251c9d00066f8631b167004
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f70efca58e9411feb251c9d00066f8631b167004

Author: Saul Wold <sgw at linux.intel.com>
Date:   Tue Sep 30 10:16:51 2014 -0700

nss: nss.pc is not target specific

RPM4 requires an nss-native component

Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-support/nss/nss.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc
index beb2cae..ce7bff4 100644
--- a/meta/recipes-support/nss/nss.inc
+++ b/meta/recipes-support/nss/nss.inc
@@ -24,7 +24,7 @@ SRC_URI = "\
     file://nss-CVE-2013-5606.patch \
     file://nss-CVE-2014-1544.patch \
 "
-SRC_URI_append_class-target = "\
+SRC_URI_append = "\
     file://nss.pc.in \
     file://signlibs.sh \
 "
@@ -153,7 +153,7 @@ do_install() {
     done
 }
 
-do_install_append_class-target() {
+do_install_append() {
     # Create empty .chk files for the NSS libraries at build time. They could
     # be regenerated at target's boot time.
     for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do
@@ -168,7 +168,9 @@ do_install_append_class-target() {
     sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc
     sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc
     sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc
+}
 
+do_install_append_class-target() {
     # Create a blank certificate
     mkdir -p ${D}${sysconfdir}/pki/nssdb/
     touch ./empty_password