diff options
author | Saul Wold <sgw@linux.intel.com> | 2014-09-30 10:16:51 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-30 21:36:13 +0100 |
commit | c1b5dc2a99f51c903055982897f262ffad2b81a3 (patch) | |
tree | 3489ad2283c72efb793e96d8dd3d3dc0f5c2c111 /meta/recipes-support | |
parent | 576b8f44c94940b5868035006527d055f777be52 (diff) | |
download | poky-c1b5dc2a99f51c903055982897f262ffad2b81a3.tar.gz |
nss: nss.pc is not target specific
RPM4 requires an nss-native component
(From OE-Core rev: f70efca58e9411feb251c9d00066f8631b167004)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/nss/nss.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc index beb2cae3da..ce7bff4e5d 100644 --- a/meta/recipes-support/nss/nss.inc +++ b/meta/recipes-support/nss/nss.inc | |||
@@ -24,7 +24,7 @@ SRC_URI = "\ | |||
24 | file://nss-CVE-2013-5606.patch \ | 24 | file://nss-CVE-2013-5606.patch \ |
25 | file://nss-CVE-2014-1544.patch \ | 25 | file://nss-CVE-2014-1544.patch \ |
26 | " | 26 | " |
27 | SRC_URI_append_class-target = "\ | 27 | SRC_URI_append = "\ |
28 | file://nss.pc.in \ | 28 | file://nss.pc.in \ |
29 | file://signlibs.sh \ | 29 | file://signlibs.sh \ |
30 | " | 30 | " |
@@ -153,7 +153,7 @@ do_install() { | |||
153 | done | 153 | done |
154 | } | 154 | } |
155 | 155 | ||
156 | do_install_append_class-target() { | 156 | do_install_append() { |
157 | # Create empty .chk files for the NSS libraries at build time. They could | 157 | # Create empty .chk files for the NSS libraries at build time. They could |
158 | # be regenerated at target's boot time. | 158 | # be regenerated at target's boot time. |
159 | for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do | 159 | for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do |
@@ -168,7 +168,9 @@ do_install_append_class-target() { | |||
168 | sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc | 168 | sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc |
169 | sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc | 169 | sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc |
170 | sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc | 170 | sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc |
171 | } | ||
171 | 172 | ||
173 | do_install_append_class-target() { | ||
172 | # Create a blank certificate | 174 | # Create a blank certificate |
173 | mkdir -p ${D}${sysconfdir}/pki/nssdb/ | 175 | mkdir -p ${D}${sysconfdir}/pki/nssdb/ |
174 | touch ./empty_password | 176 | touch ./empty_password |