diff options
author | Ross Burton <ross.burton@intel.com> | 2019-09-03 12:19:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-06 08:13:40 +0100 |
commit | 6f777c872064cada250043da60d24295153642b6 (patch) | |
tree | 3a0cd09b7ddad5f16c1bc4e036bd4cbd70b74b40 /meta/recipes-support/libnl | |
parent | 491aff847714464f1edf79968d3684e07764636a (diff) | |
download | openembedded-core-contrib-6f777c872064cada250043da60d24295153642b6.tar.gz |
libnl: upgrade to 3.5.0
Drop the musl workaround, as upstream has solved this correctly now.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libnl')
-rw-r--r-- | meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch | 38 | ||||
-rw-r--r-- | meta/recipes-support/libnl/libnl_3.5.0.bb (renamed from meta/recipes-support/libnl/libnl_3.4.0.bb) | 5 |
2 files changed, 2 insertions, 41 deletions
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 deleted file mode 100644 index b20a299623..0000000000 --- a/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 - diff --git a/meta/recipes-support/libnl/libnl_3.4.0.bb b/meta/recipes-support/libnl/libnl_3.5.0.bb index 90dc644be4..e6a225af52 100644 --- a/meta/recipes-support/libnl/libnl_3.4.0.bb +++ b/meta/recipes-support/libnl/libnl_3.5.0.bb @@ -11,13 +11,12 @@ DEPENDS = "flex-native bison-native" SRC_URI = "https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.gz \ 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] = "8f71910c03db363b41e2ea62057a4311" -SRC_URI[sha256sum] = "b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf" +SRC_URI[md5sum] = "74ba57b1b1d6f9f92268aa8141d8e8e4" +SRC_URI[sha256sum] = "352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa" inherit autotools pkgconfig |