1) Upgrade iproute2 from 4.7.0 to 4.9.0 2) Add iproute2-4.9.0-musl.patch to fix musl compile problem
Signed-off-by: Zheng Ruoqin <[email protected]> --- .../iproute2/iproute2/iproute2-4.9.0-musl.patch | 39 ++++++++++++++++++++++ .../{iproute2_4.7.0.bb => iproute2_4.9.0.bb} | 6 ++-- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/iproute2/iproute2/iproute2-4.9.0-musl.patch rename meta/recipes-connectivity/iproute2/{iproute2_4.7.0.bb => iproute2_4.9.0.bb} (64%) diff --git a/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.9.0-musl.patch b/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.9.0-musl.patch new file mode 100644 index 0000000..241869b --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.9.0-musl.patch @@ -0,0 +1,39 @@ +Subject: [PATCH] fix 4.9.0 musl compile problem + +Avoid in6_addr redefinition + +Signed-off-by: Zheng Ruoqin <[email protected]> +--- + include/linux/if_tunnel.h | 2 -- + ip/ip6tunnel.c | 1 - + 2 files changed, 3 deletions(-) + +diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h +index 4f975f5..2680646 100644 +--- a/include/linux/if_tunnel.h ++++ b/include/linux/if_tunnel.h +@@ -2,9 +2,7 @@ + #define _IF_TUNNEL_H_ + + #include <linux/types.h> +-#include <linux/if.h> + #include <linux/ip.h> +-#include <linux/in6.h> + #include <asm/byteorder.h> + + +diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c +index b1c0ae6..8fa4eb2 100644 +--- a/ip/ip6tunnel.c ++++ b/ip/ip6tunnel.c +@@ -28,7 +28,6 @@ + #include <arpa/inet.h> + #include <sys/ioctl.h> + #include <linux/ip.h> +-#include <linux/if.h> + #include <linux/if_arp.h> + #include <linux/if_tunnel.h> + #include <linux/ip6_tunnel.h> +-- +2.7.4 + diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.7.0.bb b/meta/recipes-connectivity/iproute2/iproute2_4.9.0.bb similarity index 64% rename from meta/recipes-connectivity/iproute2/iproute2_4.7.0.bb rename to meta/recipes-connectivity/iproute2/iproute2_4.9.0.bb index 426f989..389728d 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_4.7.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_4.9.0.bb @@ -4,9 +4,11 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://configure-cross.patch \ file://0001-iproute2-de-bash-scripts.patch \ file://iproute2-4.3.0-musl.patch \ + file://iproute2-4.9.0-musl.patch \ " -SRC_URI[md5sum] = "d4b205830cdc2702f8a0cbd6232129cd" -SRC_URI[sha256sum] = "8f60dbcfb33a79daae0638f53bdcaa4310c0aa59ae39af8a234020dc69bb7b92" + +SRC_URI[md5sum] = "44a8371a4b2c40e48e4c9f98cbd41391" +SRC_URI[sha256sum] = "c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4" # CFLAGS are computed in Makefile and reference CCOPTS # -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
