diff options
author | Armin Kuster <akuster808@gmail.com> | 2019-05-05 19:19:54 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-08 12:15:17 +0100 |
commit | 5beb8138332ebf27d25161b8247343289d7a5bd1 (patch) | |
tree | ae8cf7ceec7a224b18bffd645dcf189653e29ab0 | |
parent | 59f95aaae45e3b9f6c6a2d3f2acc387ea49add07 (diff) | |
download | poky-5beb8138332ebf27d25161b8247343289d7a5bd1.tar.gz |
nss: cleanup recipe to match OE style
(From OE-Core rev: 878e8986de6f269fd5f221d949dd2848bd00e9af)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/nss/nss_3.43.bb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/meta/recipes-support/nss/nss_3.43.bb b/meta/recipes-support/nss/nss_3.43.bb index 14a17335a2..f8cf5a46af 100644 --- a/meta/recipes-support/nss/nss_3.43.bb +++ b/meta/recipes-support/nss/nss_3.43.bb | |||
@@ -8,6 +8,9 @@ v3 certificates, and other security standards." | |||
8 | HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" | 8 | HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" |
9 | SECTION = "libs" | 9 | SECTION = "libs" |
10 | 10 | ||
11 | DEPENDS = "sqlite3 nspr zlib nss-native" | ||
12 | DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" | ||
13 | |||
11 | LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" | 14 | LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" |
12 | 15 | ||
13 | LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ | 16 | LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ |
@@ -38,10 +41,6 @@ UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" | |||
38 | 41 | ||
39 | inherit siteinfo | 42 | inherit siteinfo |
40 | 43 | ||
41 | DEPENDS = "sqlite3 nspr zlib nss-native" | ||
42 | DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" | ||
43 | RDEPENDS_${PN}-smime = "perl" | ||
44 | |||
45 | TD = "${S}/tentative-dist" | 44 | TD = "${S}/tentative-dist" |
46 | TDS = "${S}/tentative-dist-staging" | 45 | TDS = "${S}/tentative-dist-staging" |
47 | 46 | ||
@@ -118,8 +117,8 @@ do_compile() { | |||
118 | OS_TEST=${OS_TEST} \ | 117 | OS_TEST=${OS_TEST} \ |
119 | RPATH="${RPATH}" | 118 | RPATH="${RPATH}" |
120 | } | 119 | } |
121 | do_compile[vardepsexclude] += "SITEINFO_BITS" | ||
122 | 120 | ||
121 | do_compile[vardepsexclude] += "SITEINFO_BITS" | ||
123 | 122 | ||
124 | do_install_prepend_class-nativesdk() { | 123 | do_install_prepend_class-nativesdk() { |
125 | export LDFLAGS="" | 124 | export LDFLAGS="" |
@@ -195,6 +194,7 @@ do_install() { | |||
195 | install -m 755 -t ${D}/${bindir} $binary | 194 | install -m 755 -t ${D}/${bindir} $binary |
196 | done | 195 | done |
197 | } | 196 | } |
197 | |||
198 | do_install[vardepsexclude] += "SITEINFO_BITS" | 198 | do_install[vardepsexclude] += "SITEINFO_BITS" |
199 | 199 | ||
200 | do_install_append() { | 200 | do_install_append() { |
@@ -248,17 +248,20 @@ PACKAGES =+ "${PN}-smime" | |||
248 | FILES_${PN}-smime = "\ | 248 | FILES_${PN}-smime = "\ |
249 | ${bindir}/smime \ | 249 | ${bindir}/smime \ |
250 | " | 250 | " |
251 | |||
251 | FILES_${PN} = "\ | 252 | FILES_${PN} = "\ |
252 | ${sysconfdir} \ | 253 | ${sysconfdir} \ |
253 | ${bindir} \ | 254 | ${bindir} \ |
254 | ${libdir}/lib*.chk \ | 255 | ${libdir}/lib*.chk \ |
255 | ${libdir}/lib*.so \ | 256 | ${libdir}/lib*.so \ |
256 | " | 257 | " |
258 | |||
257 | FILES_${PN}-dev = "\ | 259 | FILES_${PN}-dev = "\ |
258 | ${libdir}/nss \ | 260 | ${libdir}/nss \ |
259 | ${libdir}/pkgconfig/* \ | 261 | ${libdir}/pkgconfig/* \ |
260 | ${includedir}/* \ | 262 | ${includedir}/* \ |
261 | " | 263 | " |
262 | 264 | ||
263 | BBCLASSEXTEND = "native nativesdk" | 265 | RDEPENDS_${PN}-smime = "perl" |
264 | 266 | ||
267 | BBCLASSEXTEND = "native nativesdk" | ||