diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-12 23:00:00 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-12 23:01:22 +0100 |
commit | 41136dd0cfd7653b9b1da47f865573d7e3d8f9ed (patch) | |
tree | 9293db11a6e42639c3e10eaecf2071997462e258 /meta/recipes-support/nettle/nettle_3.4.1.bb | |
parent | 80baa2d1fbf232dc83a8c945e52ac5e401968015 (diff) | |
download | poky-41136dd0cfd7653b9b1da47f865573d7e3d8f9ed.tar.gz |
Revert "nettle: fix ptest failure"
This reverts commit 83faaf7b2a5f4fc4ae504b300134409e90389770.
This should never have merged as the change was rejected upstream and adding a library
to the ptest package resulted in it providing that SONAME which led to being
included in images like core-image-sato.
This in turn led to a ton of ptest failures in the 2.7 r1 QA report.
(From OE-Core rev: 039e7b25f0018e6923d14b40c35252f99e1d3ea3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/nettle/nettle_3.4.1.bb')
-rw-r--r-- | meta/recipes-support/nettle/nettle_3.4.1.bb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-support/nettle/nettle_3.4.1.bb b/meta/recipes-support/nettle/nettle_3.4.1.bb index 612e058862..dd49c30c84 100644 --- a/meta/recipes-support/nettle/nettle_3.4.1.bb +++ b/meta/recipes-support/nettle/nettle_3.4.1.bb | |||
@@ -14,9 +14,12 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ | |||
14 | file://Add-target-to-only-build-tests-not-run-them.patch \ | 14 | file://Add-target-to-only-build-tests-not-run-them.patch \ |
15 | file://run-ptest \ | 15 | file://run-ptest \ |
16 | file://check-header-files-of-openssl-only-if-enable_.patch \ | 16 | file://check-header-files-of-openssl-only-if-enable_.patch \ |
17 | file://0001-nettle-pbkdf2.c-change-the-initialization-for-salt.patch \ | ||
18 | " | 17 | " |
19 | 18 | ||
19 | SRC_URI_append_class-target = "\ | ||
20 | file://dlopen-test.patch \ | ||
21 | " | ||
22 | |||
20 | SRC_URI[md5sum] = "9bdebb0e2f638d3b9d91f7fc264b70c1" | 23 | SRC_URI[md5sum] = "9bdebb0e2f638d3b9d91f7fc264b70c1" |
21 | SRC_URI[sha256sum] = "f941cf1535cd5d1819be5ccae5babef01f6db611f9b5a777bae9c7604b8a92ad" | 24 | SRC_URI[sha256sum] = "f941cf1535cd5d1819be5ccae5babef01f6db611f9b5a777bae9c7604b8a92ad" |
22 | 25 | ||
@@ -44,10 +47,6 @@ do_install_ptest() { | |||
44 | # tools can be found in PATH, not in ../tools/ | 47 | # tools can be found in PATH, not in ../tools/ |
45 | sed -i -e 's|../tools/||' ${D}${PTEST_PATH}/testsuite/*-test | 48 | sed -i -e 's|../tools/||' ${D}${PTEST_PATH}/testsuite/*-test |
46 | install ${B}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/ | 49 | install ${B}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/ |
47 | # libnettle.so is needed for dlopen-test | ||
48 | if [ -f ${D}${libdir}/libnettle.so.6.* ]; then | ||
49 | cp ${D}${libdir}/libnettle.so.6.* ${D}${PTEST_PATH}/libnettle.so | ||
50 | fi | ||
51 | } | 50 | } |
52 | 51 | ||
53 | BBCLASSEXTEND = "native nativesdk" | 52 | BBCLASSEXTEND = "native nativesdk" |