mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
libnl: 3.2.29 -> 3.4.0
1) Upgrade libnl from 3.2.29 to 3.4.0. 2) Add one patch "0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch", for musl compile. 3) Delete one patch "fix-pktloc_syntax_h-race.patch", since upstream has refactored the makefiles, and the problematic code is now absent. (From OE-Core rev: 7502216082f7cf777173e316dfe67a116a1a2f50) Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
5a23f93c3d
commit
f7a97647ff
+38
@@ -0,0 +1,38 @@
|
||||
Subject: [PATCH] fix libnl-3.4.0 musl compile problem
|
||||
Avoid in6_addr redefinition
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
|
||||
---
|
||||
include/linux-private/linux/if_bridge.h | 1 -
|
||||
include/linux-private/linux/ipv6.h | 1 -
|
||||
2 files changed, 2 deletions(-)
|
||||
|
||||
diff --git a/include/linux-private/linux/if_bridge.h b/include/linux-private/linux/if_bridge.h
|
||||
index f24050b..8f7490c 100644
|
||||
--- a/include/linux-private/linux/if_bridge.h
|
||||
+++ b/include/linux-private/linux/if_bridge.h
|
||||
@@ -15,7 +15,6 @@
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/if_ether.h>
|
||||
-#include <linux/in6.h>
|
||||
|
||||
#define SYSFS_BRIDGE_ATTR "bridge"
|
||||
#define SYSFS_BRIDGE_FDB "brforward"
|
||||
diff --git a/include/linux-private/linux/ipv6.h b/include/linux-private/linux/ipv6.h
|
||||
index e05e684..f16349d 100644
|
||||
--- a/include/linux-private/linux/ipv6.h
|
||||
+++ b/include/linux-private/linux/ipv6.h
|
||||
@@ -2,7 +2,6 @@
|
||||
#define _IPV6_H
|
||||
|
||||
#include <asm/byteorder.h>
|
||||
-#include <linux/in6.h>
|
||||
|
||||
/* The latest drafts declared increase in minimal mtu up to 1280. */
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
libnl has progressed to 0.3.2 and there does not appear to be any
|
||||
"make -j" issues with this build after my limited testing on that
|
||||
newer version so we can assume this issue is fixed upstream
|
||||
|
||||
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
|
||||
|
||||
Index: libnl-3.2.25/lib/Makefile.am
|
||||
===================================================================
|
||||
--- libnl-3.2.25.orig/lib/Makefile.am
|
||||
+++ libnl-3.2.25/lib/Makefile.am
|
||||
@@ -46,9 +46,12 @@ CLEANFILES = \
|
||||
|
||||
# Hack to avoid using ylwrap. It does not function correctly in combination
|
||||
# with --header-file=
|
||||
+route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h
|
||||
+route/pktloc_grammar.h: route/pktloc_grammar.c
|
||||
route/pktloc_grammar.c: route/pktloc_grammar.l
|
||||
$(AM_V_GEN) $(MKDIR_P) route; $(FLEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
|
||||
|
||||
+route/pktloc_syntax.h: route/pktloc_syntax.c
|
||||
route/pktloc_syntax.c: route/pktloc_syntax.y
|
||||
$(AM_V_GEN) $(MKDIR_P) route; $(YACC) -d $(YFLAGS) -o $@ $^
|
||||
|
||||
@@ -102,7 +105,9 @@ BUILT_SOURCES = \
|
||||
route/cls/ematch_grammar.c \
|
||||
route/cls/ematch_syntax.c \
|
||||
route/pktloc_grammar.c \
|
||||
- route/pktloc_syntax.c
|
||||
+ route/pktloc_syntax.c \
|
||||
+ route/pktloc_syntax.h \
|
||||
+ route/pktloc_grammar.h
|
||||
|
||||
EXTRA_DIST = \
|
||||
route/pktloc_grammar.l \
|
||||
+4
-3
@@ -10,13 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
||||
DEPENDS = "flex-native bison-native"
|
||||
|
||||
SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \
|
||||
file://fix-pktloc_syntax_h-race.patch \
|
||||
file://fix-pc-file.patch \
|
||||
file://0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch \
|
||||
"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases"
|
||||
|
||||
SRC_URI[md5sum] = "a8ba62a5c4f883f4e493a46d1f3733fe"
|
||||
SRC_URI[sha256sum] = "0beb593dc6abfffa18a5c787b27884979c1b7e7f1fd468c801e3cc938a685922"
|
||||
SRC_URI[md5sum] = "8f71910c03db363b41e2ea62057a4311"
|
||||
SRC_URI[sha256sum] = "b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
Reference in New Issue
Block a user