nss: cleanup recipe to match OE style
PATCH 1/2 nss: cleanup recipe to match OE style
--- meta/recipes-support/nss/nss_3.43.bb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
meta/recipes-support/nss/nss_3.43.bb +9 -6
@@ -8,6 +8,9 @@ v3 certificates, and other security standards." HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" SECTION = "libs" +DEPENDS = "sqlite3 nspr zlib nss-native" +DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" + LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \
@@ -38,10 +41,6 @@ UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" inherit siteinfo -DEPENDS = "sqlite3 nspr zlib nss-native" -DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" -RDEPENDS_${PN}-smime = "perl" - TD = "${S}/tentative-dist" TDS = "${S}/tentative-dist-staging"
@@ -118,8 +117,8 @@ do_compile() { OS_TEST=${OS_TEST} \ RPATH="${RPATH}" } -do_compile[vardepsexclude] += "SITEINFO_BITS" +do_compile[vardepsexclude] += "SITEINFO_BITS" do_install_prepend_class-nativesdk() { export LDFLAGS=""
@@ -195,6 +194,7 @@ do_install() { install -m 755 -t ${D}/${bindir} $binary done } + do_install[vardepsexclude] += "SITEINFO_BITS" do_install_append() {
@@ -248,17 +248,20 @@ PACKAGES =+ "${PN}-smime" FILES_${PN}-smime = "\ ${bindir}/smime \ " + FILES_${PN} = "\ ${sysconfdir} \ ${bindir} \ ${libdir}/lib*.chk \ ${libdir}/lib*.so \ " + FILES_${PN}-dev = "\ ${libdir}/nss \ ${libdir}/pkgconfig/* \ ${includedir}/* \ " -BBCLASSEXTEND = "native nativesdk" +RDEPENDS_${PN}-smime = "perl" +BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
PATCH 2/2 nss: add ptest support
This belongs in the long test group
Here is a baseline:
Tests summary:
--------------
Passed: 9132 Failed: 61 Failed with core: 0 ASan failures: 0 Unknown status: 0
DURATION: 15134
--- .../nss/nss/oe_ptest_fixup.patch | 34 +++++++++++++++++++ meta/recipes-support/nss/nss/run-ptest | 3 ++ meta/recipes-support/nss/nss_3.43.bb | 10 +++++- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/nss/nss/oe_ptest_fixup.patch create mode 100644 meta/recipes-support/nss/nss/run-ptest
meta/recipes-support/nss/nss/oe_ptest_fixup.patch new file +34 -0
@@ -0,0 +1,34 @@ + +Upstream-Status: OE specific + +remove some tests that currently hang +Update DIST path /usr + +Signed-off-by: Armin Kuster <[email protected]> + +Index: nss-3.43/nss/tests/common/init.sh +=================================================================== +--- nss-3.43.orig/nss/tests/common/init.sh ++++ nss-3.43/nss/tests/common/init.sh +@@ -267,7 +267,7 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU + COMMON=${TEST_COMMON-$common} + export COMMON + +- DIST=${DIST-${MOZILLA_ROOT}/dist} ++ DIST=/usr + TESTDIR=${TESTDIR-${MOZILLA_ROOT}/tests_results/security} + + # Allow for override options from a config file +Index: nss-3.43/nss/tests/all.sh +=================================================================== +--- nss-3.43.orig/nss/tests/all.sh ++++ nss-3.43/nss/tests/all.sh +@@ -303,7 +303,7 @@ if [ $NO_INIT_SUPPORT -eq 0 ]; then + RUN_FIPS="fips" + fi + +-tests="cipher lowhash libpkix cert dbtests tools $RUN_FIPS sdr crmf smime ssl ocsp merge pkits ec gtests ssl_gtests policy" ++tests="cipher lowhash libpkix cert dbtests tools sdr crmf smime ocsp merge pkits ec policy" + # Don't run chains tests when we have a gyp build. + if [ "$OBJDIR" != "Debug" -a "$OBJDIR" != "Release" ]; then + tests="$tests chains"
meta/recipes-support/nss/nss/run-ptest new file +3 -0
@@ -0,0 +1,3 @@ +#! /bin/sh + +HOST=localhost DOMSUF=localdomain ./tests/all.sh
meta/recipes-support/nss/nss_3.43.bb +9 -1
@@ -31,6 +31,8 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://blank-cert9.db \ file://blank-key4.db \ file://system-pkcs11.txt \ + file://oe_ptest_fixup.patch \ + file://run-ptest \ " SRC_URI[md5sum] = "67c8fa282c32cb56117fdd530dd77001"
@@ -39,7 +41,7 @@ SRC_URI[sha256sum] = "f30bc1b7330887b75de9fec37dbc173001758dc43fb095ffbc45dac409 UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" -inherit siteinfo +inherit siteinfo ptest TD = "${S}/tentative-dist" TDS = "${S}/tentative-dist-staging"
@@ -227,6 +229,11 @@ do_install_append_class-target() { install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt } +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -a ${S}/nss/tests/* ${D}${PTEST_PATH}/tests/. +} + PACKAGE_WRITE_DEPS += "nss-native" pkg_postinst_${PN} () { if [ -n "$D" ]; then
@@ -263,5 +270,6 @@ FILES_${PN}-dev = "\ " RDEPENDS_${PN}-smime = "perl" +RDEPENDS_${PN}-ptest = "nss bash tcsh make perl" BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
Re: [PATCH 2/2] nss: add ptest support
Quoted 12 lines · Armin Kuster
This belongs in the long test group
Here is a baseline:
Tests summary:
--------------Passed: 9132 Failed: 61 Failed with core: 0 ASan failures: 0 Unknown status: 0
Quoted 3 lines
DURATION: 15134
Signed-off-by Armin Kuster <[email protected]>
ERROR: Nothing RPROVIDES 'tcsh' (but /home/pokybuild/yocto-worker/a-quick/build/meta/recipes-support/nss/nss_3.43.bb RDEPENDS on or otherwise requires it)
ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
ERROR: Nothing RPROVIDES 'tcsh' (but /home/pokybuild/yocto-worker/a-quick/build/meta/recipes-support/nss/nss_3.43.bb RDEPENDS on or otherwise requires it)
ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
That is also quite a long runtime (4 hours) which is longer than everything else we have combined :/
Cheers,
Richard
Re: [PATCH 2/2] nss: add ptest support
Quoted 13 lines · Richard Purdie
Quoted 12 lines · Armin Kuster
This belongs in the long test group
Here is a baseline:
Tests summary:
--------------Passed: 9132 Failed: 61 Failed with core: 0 ASan failures: 0 Unknown status: 0
Quoted 8 lines
Quoted 3 lines
DURATION: 15134
Signed-off-by Armin Kuster <[email protected]>ERROR: Nothing RPROVIDES 'tcsh' (but
/home/pokybuild/yocto-worker/a-quick/build/meta/recipes-support/nss/nss_3.43.bbRDEPENDS on or otherwise requires it)
ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
ERROR: Nothing RPROVIDES 'tcsh' (but/home/pokybuild/yocto-worker/a-quick/build/meta/recipes-support/nss/nss_3.43.bbRDEPENDS on or otherwise requires it)
ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
shoot. Had mete-oe included. Will see if I can remove the offending test or whether is can be converted.
Quoted 2 lines
That is also quite a long runtime (4 hours) which is longer than everything else we have combined :/
yep.
- armin
Quoted 5 lines
Cheers,
Richard