Re: [OE-core] [PATCH v3] libnl: 3.2.29 -> 3.4.0

2017-10-26 Thread Alexander Kanavin 

On 10/26/2017 10:04 AM, Huang, Qiyu wrote:

Well, from the new Makefile.am file,I can't find the related content about this 
patch.

And in the fix-pktloc_syntax_h-race.patch, the description is like this:
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

So, I think deleting this patch will not cause the problem.


That's fine, thanks for looking. Can you resend once more and include 
the information into the commit message please? Something like "upstream 
has refactored the makefiles, and the problematic code is now absent".



Alex
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v3] libnl: 3.2.29 -> 3.4.0

2017-10-26 Thread Huang, Qiyu 
Well, from the new Makefile.am file,I can't find the related content about this 
patch.

And in the fix-pktloc_syntax_h-race.patch, the description is like this:
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 

So, I think deleting this patch will not cause the problem.

huangqy

> -Original Message-
> From: Alexander Kanavin [mailto:alexander.kana...@linux.intel.com]
> Sent: Wednesday, October 25, 2017 7:17 PM
> To: Huang, Qiyu <huangqy.f...@cn.fujitsu.com>;
> openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH v3] libnl: 3.2.29 -> 3.4.0
> 
> On 10/25/2017 05:59 AM, Huang Qiyu wrote:
> > 2) Delete one patch "fix-pktloc_syntax_h-race.patch", for it is
> inappropriate,as the verion 3.4.0 has no lib/Makefile.am file.
> 
> Apologies, but this is not a satisfactory reason to remove this patch.
> Has the upstream fixed the problem that the patch is addressing? Or have they
> simply rearranged the makefiles, and moved the problematic lines to a
> different makefile? If so, you should rebase the fix onto the new location.
> 
> Alex
> 



-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v3] libnl: 3.2.29 -> 3.4.0

2017-10-25 Thread Alexander Kanavin 

On 10/25/2017 05:59 AM, Huang Qiyu wrote:

2) Delete one patch "fix-pktloc_syntax_h-race.patch", for it is 
inappropriate,as the verion 3.4.0 has no lib/Makefile.am file.


Apologies, but this is not a satisfactory reason to remove this patch. 
Has the upstream fixed the problem that the patch is addressing? Or have 
they simply rearranged the makefiles, and moved the problematic lines to 
a different makefile? If so, you should rebase the fix onto the new 
location.


Alex
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v3] libnl: 3.2.29 -> 3.4.0

2017-10-24 Thread Huang Qiyu 
1) Upgrade libnl from 3.2.29 to 3.4.0.
2) Delete one patch "fix-pktloc_syntax_h-race.patch", for it is 
inappropriate,as the verion 3.4.0 has no lib/Makefile.am file.
3) Add one patch "0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch", for 
musl compile.

Signed-off-by: Huang Qiyu 
---
 ...ATCH-fix-libnl-3.4.0-musl-compile-problem.patch | 38 ++
 .../libnl/libnl/fix-pktloc_syntax_h-race.patch | 36 
 .../libnl/{libnl_3.2.29.bb => libnl_3.4.0.bb}  |  7 ++--
 3 files changed, 42 insertions(+), 39 deletions(-)
 create mode 100644 
meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch
 delete mode 100644 
meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
 rename meta/recipes-support/libnl/{libnl_3.2.29.bb => libnl_3.4.0.bb} (87%)

diff --git 
a/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch
 
b/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch
new file mode 100644
index 000..d0e2ead
--- /dev/null
+++ 
b/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch
@@ -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 
+---
+ 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 
+ #include 
+-#include 
+ 
+ #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 
+-#include 
+ 
+ /* The latest drafts declared increase in minimal mtu up to 1280. */
+ 
+-- 
+2.7.4
+
diff --git a/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch 
b/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
deleted file mode 100644
index 79aa0bd..000
--- a/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch
+++ /dev/null
@@ -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 
-
-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 \
diff --git a/meta/recipes-support/libnl/libnl_3.2.29.bb 
b/meta/recipes-support/libnl/libnl_3.4.0.bb
similarity index 87%
rename from meta/recipes-support/libnl/libnl_3.2.29.bb
rename to meta/recipes-support/libnl/libnl_3.4.0.bb
index 7d4839b..90dc644 100644
--- a/meta/recipes-support/libnl/libnl_3.2.29.bb
+++ b/meta/recipes-support/libnl/libnl_3.4.0.bb
@@ -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] =