diff options
Diffstat (limited to 'meta/recipes-support/libnl')
-rw-r--r-- | meta/recipes-support/libnl/files/enable-serial-tests.patch | 28 | ||||
-rwxr-xr-x | meta/recipes-support/libnl/files/run-ptest | 17 | ||||
-rw-r--r-- | meta/recipes-support/libnl/libnl_3.5.0.bb | 70 | ||||
-rw-r--r-- | meta/recipes-support/libnl/libnl_3.9.0.bb | 64 |
4 files changed, 66 insertions, 113 deletions
diff --git a/meta/recipes-support/libnl/files/enable-serial-tests.patch b/meta/recipes-support/libnl/files/enable-serial-tests.patch deleted file mode 100644 index 8ea53f8748..0000000000 --- a/meta/recipes-support/libnl/files/enable-serial-tests.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From b1476d89bf7a0bc6062438731ee4e9026696328b Mon Sep 17 00:00:00 2001 | ||
2 | From: Eric Xu <chi.xu@windriver.com> | ||
3 | Date: Fri, 9 Mar 2018 03:38:49 +0000 | ||
4 | Subject: [PATCH] Add ptest for libnl | ||
5 | |||
6 | serial-tests is required to generate those targets. | ||
7 | |||
8 | Signed-off-by: Eric Xu <chi.xu@windriver.com> | ||
9 | --- | ||
10 | configure.ac | 2 +- | ||
11 | 1 files changed, 1 insertion(+), 1 deletions(-) | ||
12 | |||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index 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 | -- | ||
27 | 2.13.3 | ||
28 | |||
diff --git a/meta/recipes-support/libnl/files/run-ptest b/meta/recipes-support/libnl/files/run-ptest index e5c9eb0a32..0d0c665cd2 100755 --- a/meta/recipes-support/libnl/files/run-ptest +++ b/meta/recipes-support/libnl/files/run-ptest | |||
@@ -1,16 +1,3 @@ | |||
1 | #!/bin/sh | 1 | #! /bin/sh |
2 | 2 | ||
3 | num_fail=0 | 3 | CK_AUTOMAKE=1 ./check-all |
4 | |||
5 | for test in check* | ||
6 | do | ||
7 | ./"$test" \ | ||
8 | && echo "PASS: $test" \ | ||
9 | || { | ||
10 | echo "FAIL: $test" | ||
11 | num_fail=$(( ${num_fail} + 1)) | ||
12 | } | ||
13 | |||
14 | done | ||
15 | |||
16 | exit $num_fail | ||
diff --git a/meta/recipes-support/libnl/libnl_3.5.0.bb b/meta/recipes-support/libnl/libnl_3.5.0.bb deleted file mode 100644 index 09d8c8611e..0000000000 --- a/meta/recipes-support/libnl/libnl_3.5.0.bb +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | SUMMARY = "A library for applications dealing with netlink sockets" | ||
2 | HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" | ||
3 | SECTION = "libs/network" | ||
4 | |||
5 | PE = "1" | ||
6 | |||
7 | LICENSE = "LGPLv2.1" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | ||
9 | |||
10 | DEPENDS = "flex-native bison-native" | ||
11 | |||
12 | SRC_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 | |||
18 | SRC_URI[md5sum] = "74ba57b1b1d6f9f92268aa8141d8e8e4" | ||
19 | SRC_URI[sha256sum] = "352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa" | ||
20 | |||
21 | |||
22 | UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases" | ||
23 | |||
24 | inherit autotools pkgconfig ptest | ||
25 | |||
26 | FILES_${PN} = "${libdir}/libnl-3.so.* \ | ||
27 | ${libdir}/libnl.so.* \ | ||
28 | ${sysconfdir}" | ||
29 | RREPLACES_${PN} = "libnl2" | ||
30 | RCONFLICTS_${PN} = "libnl2" | ||
31 | |||
32 | FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.la" | ||
33 | FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a" | ||
34 | |||
35 | PACKAGES += "${PN}-cli ${PN}-genl ${PN}-idiag ${PN}-nf ${PN}-route ${PN}-xfrm" | ||
36 | FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \ | ||
37 | ${libdir}/libnl/cli/*/*.so \ | ||
38 | ${bindir}/genl-ctrl-list \ | ||
39 | ${bindir}/idiag-socket-details \ | ||
40 | ${bindir}/nf-* \ | ||
41 | ${bindir}/nl-*" | ||
42 | FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \ | ||
43 | ${libdir}/libnl-genl.so.*" | ||
44 | FILES_${PN}-idiag = "${libdir}/libnl-idiag-3.so.*" | ||
45 | FILES_${PN}-nf = "${libdir}/libnl-nf-3.so.*" | ||
46 | FILES_${PN}-route = "${libdir}/libnl-route-3.so.*" | ||
47 | FILES_${PN}-xfrm = "${libdir}/libnl-xfrm-3.so.*" | ||
48 | RREPLACES_${PN}-genl = "libnl-genl2" | ||
49 | RCONFLICTS_${PN}-genl = "libnl-genl2" | ||
50 | |||
51 | RDEPENDS_${PN}-ptest += "libcheck" | ||
52 | DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'libcheck', '', d)}" | ||
53 | |||
54 | # make sure the tests don't link against wrong so file | ||
55 | EXTRA_OECONF += "${@bb.utils.contains('PTEST_ENABLED', '1', '--disable-rpath', '', d)}" | ||
56 | |||
57 | do_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 | |||
63 | do_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 | |||
70 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-support/libnl/libnl_3.9.0.bb b/meta/recipes-support/libnl/libnl_3.9.0.bb new file mode 100644 index 0000000000..db9d93e8cb --- /dev/null +++ b/meta/recipes-support/libnl/libnl_3.9.0.bb | |||
@@ -0,0 +1,64 @@ | |||
1 | SUMMARY = "A library for applications dealing with netlink sockets" | ||
2 | DESCRIPTION = "The libnl suite is a collection of libraries providing \ | ||
3 | APIs to netlink protocol based Linux kernel interfaces. libnl is the core \ | ||
4 | library implementing the fundamentals required to use the netlink protocol \ | ||
5 | such as socket handling, message construction and parsing, and sending \ | ||
6 | and receiving of data." | ||
7 | HOMEPAGE = "http://www.infradead.org/~tgr/libnl/" | ||
8 | SECTION = "libs/network" | ||
9 | |||
10 | PE = "1" | ||
11 | |||
12 | LICENSE = "LGPL-2.1-only" | ||
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | ||
14 | |||
15 | DEPENDS = "flex-native bison-native" | ||
16 | |||
17 | SRC_URI = "${GITHUB_BASE_URI}/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ | ||
18 | file://run-ptest \ | ||
19 | " | ||
20 | |||
21 | SRC_URI[sha256sum] = "aed507004d728a5cf11eab48ca4bf9e6e1874444e33939b9d3dfed25018ee9bb" | ||
22 | |||
23 | GITHUB_BASE_URI = "https://github.com/thom311/${BPN}/releases" | ||
24 | UPSTREAM_CHECK_REGEX = "releases/tag/libnl(?P<pver>.+)" | ||
25 | |||
26 | inherit autotools pkgconfig ptest github-releases | ||
27 | |||
28 | FILES:${PN} = "${libdir}/libnl-3.so.* \ | ||
29 | ${libdir}/libnl.so.* \ | ||
30 | ${sysconfdir}" | ||
31 | RREPLACES:${PN} = "libnl2" | ||
32 | RCONFLICTS:${PN} = "libnl2" | ||
33 | |||
34 | FILES:${PN}-dev += "${libdir}/libnl/cli/*/*.la" | ||
35 | FILES:${PN}-staticdev += "${libdir}/libnl/cli/*/*.a" | ||
36 | |||
37 | PACKAGES += "${PN}-cli ${PN}-genl ${PN}-idiag ${PN}-nf ${PN}-route ${PN}-xfrm" | ||
38 | FILES:${PN}-cli = "${libdir}/libnl-cli-3.so.* \ | ||
39 | ${libdir}/libnl/cli/*/*.so \ | ||
40 | ${bindir}/genl-ctrl-list \ | ||
41 | ${bindir}/idiag-socket-details \ | ||
42 | ${bindir}/nf-* \ | ||
43 | ${bindir}/nl-*" | ||
44 | FILES:${PN}-genl = "${libdir}/libnl-genl-3.so.* \ | ||
45 | ${libdir}/libnl-genl.so.*" | ||
46 | FILES:${PN}-idiag = "${libdir}/libnl-idiag-3.so.*" | ||
47 | FILES:${PN}-nf = "${libdir}/libnl-nf-3.so.*" | ||
48 | FILES:${PN}-route = "${libdir}/libnl-route-3.so.*" | ||
49 | FILES:${PN}-xfrm = "${libdir}/libnl-xfrm-3.so.*" | ||
50 | RREPLACES:${PN}-genl = "libnl-genl2" | ||
51 | RCONFLICTS:${PN}-genl = "libnl-genl2" | ||
52 | |||
53 | DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'libcheck', '', d)}" | ||
54 | RRECOMMENDS:${PN}-ptest += "kernel-module-dummy kernel-module-bonding" | ||
55 | |||
56 | do_compile_ptest() { | ||
57 | oe_runmake ./tests/check-all | ||
58 | } | ||
59 | |||
60 | do_install_ptest() { | ||
61 | ./libtool install install ./tests/check-all ${D}${PTEST_PATH}/ | ||
62 | } | ||
63 | |||
64 | BBCLASSEXTEND = "native nativesdk" | ||