diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-07-20 10:44:22 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-23 13:55:26 +0100 |
commit | fffce97a93f9b91666597baaeafcb32c0fa9d22e (patch) | |
tree | 73675bcb89c224bceab0607065aef5f94f4a38ae /meta/recipes-support/libnl | |
parent | e614dab6d82226f12e88e0a13831b6e44b578352 (diff) | |
download | poky-fffce97a93f9b91666597baaeafcb32c0fa9d22e.tar.gz |
libnl: upgrade 3.6.0 -> 3.7.0
(From OE-Core rev: b01edff4791eeca86bd7d3903458518172d3be8a)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libnl')
-rw-r--r-- | meta/recipes-support/libnl/files/fa7f97f8982544c4fcb403893bae6701230d5165.patch | 48 | ||||
-rw-r--r-- | meta/recipes-support/libnl/libnl_3.7.0.bb (renamed from meta/recipes-support/libnl/libnl_3.6.0.bb) | 8 |
2 files changed, 3 insertions, 53 deletions
diff --git a/meta/recipes-support/libnl/files/fa7f97f8982544c4fcb403893bae6701230d5165.patch b/meta/recipes-support/libnl/files/fa7f97f8982544c4fcb403893bae6701230d5165.patch deleted file mode 100644 index 02662c939e..0000000000 --- a/meta/recipes-support/libnl/files/fa7f97f8982544c4fcb403893bae6701230d5165.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | From fa7f97f8982544c4fcb403893bae6701230d5165 Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas Haller <thaller@redhat.com> | ||
3 | Date: Fri, 15 Apr 2022 13:29:49 +0200 | ||
4 | Subject: [PATCH] build: avoid building check-direct with --disable-static | ||
5 | |||
6 | "check-direct" needs to statically link with the libraries, because | ||
7 | it wants to test internal ABI, which is hidden in the share libraries. | ||
8 | When configuring with "--disable-static", static libs are not build | ||
9 | and the test tool cannot be build. | ||
10 | |||
11 | Just skip the test in that case. | ||
12 | |||
13 | https://github.com/thom311/libnl/issues/306 | ||
14 | Upstream-Status: Backport [https://github.com/thom311/libnl/commit/fa7f97f8982544c4fcb403893bae6701230d5165] | ||
15 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
16 | --- | ||
17 | Makefile.am | 2 ++ | ||
18 | configure.ac | 2 ++ | ||
19 | 2 files changed, 4 insertions(+) | ||
20 | |||
21 | diff --git a/Makefile.am b/Makefile.am | ||
22 | index a6bcf553..2f5e0dfc 100644 | ||
23 | --- a/Makefile.am | ||
24 | +++ b/Makefile.am | ||
25 | @@ -984,8 +984,10 @@ tests_check_all_LDADD = \ | ||
26 | $(NULL) | ||
27 | |||
28 | if WITH_CHECK | ||
29 | +if ENABLE_STATIC | ||
30 | check_programs += tests/check-direct | ||
31 | endif | ||
32 | +endif | ||
33 | |||
34 | tests_check_direct_SOURCES = \ | ||
35 | tests/check-direct.c \ | ||
36 | diff --git a/configure.ac b/configure.ac | ||
37 | index 1f9ad0eb..0fd1cc0f 100644 | ||
38 | --- a/configure.ac | ||
39 | +++ b/configure.ac | ||
40 | @@ -107,6 +107,8 @@ else | ||
41 | AC_CHECK_LIB([pthread], [pthread_mutex_lock], [], AC_MSG_ERROR([libpthread is required])) | ||
42 | fi | ||
43 | |||
44 | +AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" != "no"]) | ||
45 | + | ||
46 | AC_ARG_ENABLE([debug], | ||
47 | AS_HELP_STRING([--disable-debug], [Do not include debugging statements]), | ||
48 | [enable_debug="$enableval"], [enable_debug="yes"]) | ||
diff --git a/meta/recipes-support/libnl/libnl_3.6.0.bb b/meta/recipes-support/libnl/libnl_3.7.0.bb index af3aa41040..ddcc83a039 100644 --- a/meta/recipes-support/libnl/libnl_3.6.0.bb +++ b/meta/recipes-support/libnl/libnl_3.7.0.bb | |||
@@ -14,14 +14,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | |||
14 | 14 | ||
15 | DEPENDS = "flex-native bison-native" | 15 | DEPENDS = "flex-native bison-native" |
16 | 16 | ||
17 | SRC_URI = " \ | 17 | SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ |
18 | https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ | ||
19 | file://enable-serial-tests.patch \ | 18 | file://enable-serial-tests.patch \ |
20 | file://run-ptest \ | 19 | file://run-ptest \ |
21 | file://fa7f97f8982544c4fcb403893bae6701230d5165.patch \ | 20 | " |
22 | " | ||
23 | 21 | ||
24 | SRC_URI[sha256sum] = "532155fd011e5a805bd67121b87a01c757e2bb24112ac17e69cb86013b970009" | 22 | SRC_URI[sha256sum] = "9fe43ccbeeea72c653bdcf8c93332583135cda46a79507bfd0a483bb57f65939" |
25 | 23 | ||
26 | 24 | ||
27 | UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases" | 25 | UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases" |