summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libnl/files/enable-serial-tests.patch28
-rwxr-xr-xmeta/recipes-support/libnl/files/run-ptest16
-rw-r--r--meta/recipes-support/libnl/libnl_3.5.0.bb30
3 files changed, 72 insertions, 2 deletions
diff --git a/meta/recipes-support/libnl/files/enable-serial-tests.patch b/meta/recipes-support/libnl/files/enable-serial-tests.patch
new file mode 100644
index 0000000000..8ea53f8748
--- /dev/null
+++ b/meta/recipes-support/libnl/files/enable-serial-tests.patch
@@ -0,0 +1,28 @@
1From b1476d89bf7a0bc6062438731ee4e9026696328b Mon Sep 17 00:00:00 2001
2From: Eric Xu <chi.xu@windriver.com>
3Date: Fri, 9 Mar 2018 03:38:49 +0000
4Subject: [PATCH] Add ptest for libnl
5
6serial-tests is required to generate those targets.
7
8Signed-off-by: Eric Xu <chi.xu@windriver.com>
9---
10 configure.ac | 2 +-
11 1 files changed, 1 insertion(+), 1 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index dfead98..2cc8257 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -46,7 +46,7 @@ AC_INIT(libnl, [libnl_version], [], [], [http://www.infradead.org/~tgr/libnl/])
18 AC_CONFIG_HEADERS([lib/defs.h])
19 AC_CONFIG_AUX_DIR([build-aux])
20 AC_CONFIG_MACRO_DIR([m4])
21-AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
22+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects serial-tests])
23 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)], [])
24 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
25
26--
272.13.3
28
diff --git a/meta/recipes-support/libnl/files/run-ptest b/meta/recipes-support/libnl/files/run-ptest
new file mode 100755
index 0000000000..e5c9eb0a32
--- /dev/null
+++ b/meta/recipes-support/libnl/files/run-ptest
@@ -0,0 +1,16 @@
1#!/bin/sh
2
3num_fail=0
4
5for test in check*
6do
7 ./"$test" \
8 && echo "PASS: $test" \
9 || {
10 echo "FAIL: $test"
11 num_fail=$(( ${num_fail} + 1))
12 }
13
14done
15
16exit $num_fail
diff --git a/meta/recipes-support/libnl/libnl_3.5.0.bb b/meta/recipes-support/libnl/libnl_3.5.0.bb
index 9d0e1441a9..09d8c8611e 100644
--- a/meta/recipes-support/libnl/libnl_3.5.0.bb
+++ b/meta/recipes-support/libnl/libnl_3.5.0.bb
@@ -9,19 +9,26 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
9 9
10DEPENDS = "flex-native bison-native" 10DEPENDS = "flex-native bison-native"
11 11
12SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz" 12SRC_URI = " \
13 https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \
14 file://enable-serial-tests.patch \
15 file://run-ptest \
16 "
17
13SRC_URI[md5sum] = "74ba57b1b1d6f9f92268aa8141d8e8e4" 18SRC_URI[md5sum] = "74ba57b1b1d6f9f92268aa8141d8e8e4"
14SRC_URI[sha256sum] = "352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa" 19SRC_URI[sha256sum] = "352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa"
15 20
21
16UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases" 22UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases"
17 23
18inherit autotools pkgconfig 24inherit autotools pkgconfig ptest
19 25
20FILES_${PN} = "${libdir}/libnl-3.so.* \ 26FILES_${PN} = "${libdir}/libnl-3.so.* \
21 ${libdir}/libnl.so.* \ 27 ${libdir}/libnl.so.* \
22 ${sysconfdir}" 28 ${sysconfdir}"
23RREPLACES_${PN} = "libnl2" 29RREPLACES_${PN} = "libnl2"
24RCONFLICTS_${PN} = "libnl2" 30RCONFLICTS_${PN} = "libnl2"
31
25FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.la" 32FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.la"
26FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a" 33FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a"
27 34
@@ -41,4 +48,23 @@ FILES_${PN}-xfrm = "${libdir}/libnl-xfrm-3.so.*"
41RREPLACES_${PN}-genl = "libnl-genl2" 48RREPLACES_${PN}-genl = "libnl-genl2"
42RCONFLICTS_${PN}-genl = "libnl-genl2" 49RCONFLICTS_${PN}-genl = "libnl-genl2"
43 50
51RDEPENDS_${PN}-ptest += "libcheck"
52DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'libcheck', '', d)}"
53
54# make sure the tests don't link against wrong so file
55EXTRA_OECONF += "${@bb.utils.contains('PTEST_ENABLED', '1', '--disable-rpath', '', d)}"
56
57do_compile_ptest() {
58 # hack to remove the call to `make runtest-TESTS`
59 sed -i 's/$(MAKE) $(AM_MAKEFLAGS) runtest-TESTS//g' Makefile
60 oe_runmake check
61}
62
63do_install_ptest(){
64 # legacy? tests are also installed, but ptest-runner will not run them
65 # upstream are not running these tests in their CI pipeline
66 # issue opened https://github.com/thom311/libnl/issues/270
67 install -m 0755 tests/.libs/* ${D}${PTEST_PATH}/
68}
69
44BBCLASSEXTEND = "native nativesdk" 70BBCLASSEXTEND = "native nativesdk"