From 316dfdd917bec6a218f431211d28bf8df6b6fb0f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 25 Jun 2018 12:45:53 -0400 Subject: Yocto 2.5 Move OpenBMC to Yocto 2.5(sumo) Signed-off-by: Brad Bishop Change-Id: I5c5ad6904a16e14c1c397f0baf10c9d465594a78 --- ...nclude-stdint.h-explicitly-for-UINT16_MAX.patch | 32 ---------------------- .../iproute2/0001-ip-Remove-unneed-header.patch | 16 +++++------ .../iproute2/0001-iproute2-de-bash-scripts.patch | 11 ++++---- .../0001-libc-compat.h-add-musl-workaround.patch | 8 +++--- .../iproute2/iproute2/configure-cross.patch | 14 +++++----- 5 files changed, 24 insertions(+), 57 deletions(-) delete mode 100644 import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-include-stdint.h-explicitly-for-UINT16_MAX.patch (limited to 'import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2') diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-include-stdint.h-explicitly-for-UINT16_MAX.patch b/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-include-stdint.h-explicitly-for-UINT16_MAX.patch deleted file mode 100644 index eb0c0abba..000000000 --- a/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-include-stdint.h-explicitly-for-UINT16_MAX.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3c885d87befc706bb923933b9819de6fe2de897e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 20 May 2017 14:03:19 -0700 -Subject: [PATCH] include stdint.h explicitly for UINT16_MAX) - -Fixes -| tc_core.c:190:29: error: 'UINT16_MAX' undeclared (first use in this function); did you mean '__INT16_MAX__'? -| if ((sz >> s->size_log) > UINT16_MAX) { -| ^~~~~~~~~~ - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - tc/tc_core.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tc/tc_core.c b/tc/tc_core.c -index 7bbe0d7..821b741 100644 ---- a/tc/tc_core.c -+++ b/tc/tc_core.c -@@ -12,6 +12,7 @@ - - #include - #include -+#include - #include - #include - #include --- -2.13.0 - diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch b/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch index a9f8db694..a9027c5b5 100644 --- a/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch +++ b/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch @@ -1,6 +1,6 @@ -From f58fc99c88a54135e55a6e0956ce8ae71078d1cc Mon Sep 17 00:00:00 2001 +From 02ed10fc5215c4a32e6740b0a0c2439659be6801 Mon Sep 17 00:00:00 2001 From: Changhyeok Bae -Date: Mon, 12 Jun 2017 04:29:07 +0000 +Date: Mon, 13 Nov 2017 15:59:35 +0000 Subject: [PATCH] ip: Remove unneed header Fix redefinition of struct ethhdr with a suitably patched musl libc @@ -8,23 +8,23 @@ that suppresses the kernel if_ether.h. Signed-off-by: Changhyeok Bae -Upstream-Status: Submitted [netdev@vger.kernel.org] +Upstream-Status: Pending [netdev@vger.kernel.org] --- ip/iplink_bridge.c | 1 - 1 file changed, 1 deletion(-) diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c -index 818b43c..f065b22 100644 +index cccdec1..f065b22 100644 --- a/ip/iplink_bridge.c +++ b/ip/iplink_bridge.c -@@ -15,7 +15,6 @@ +@@ -13,7 +13,6 @@ + #include + #include #include +-#include #include #include --#include #include - - #include "rt_names.h" -- 2.7.4 diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch b/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch index 39c7d4031..c3d3fea9c 100644 --- a/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch +++ b/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch @@ -5,14 +5,13 @@ de-bash these two scripts to make iproute2 not depend on bash. Upstream-Status: Pending Signed-off-by: Chen Qi - --- - ip/ifcfg | 15 ++++++++------- - ip/rtpr | 2 +- + ip/ifcfg | 15 ++++++++------- + ip/rtpr | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ip/ifcfg b/ip/ifcfg -index 083d9df..60bcf1f 100644 +index 30a2dc4..8677b2e 100644 --- a/ip/ifcfg +++ b/ip/ifcfg @@ -1,12 +1,13 @@ @@ -43,7 +42,7 @@ index 083d9df..60bcf1f 100644 -ip route add unreachable 255.255.255.255 >& /dev/null +ip route add unreachable 224.0.0.0/24 > /dev/null 2>&1 +ip route add unreachable 255.255.255.255 > /dev/null 2>&1 - if [ `ip link ls $dev | grep -c MULTICAST` -ge 1 ]; then + if [ "`ip link ls $dev | grep -c MULTICAST`" -ge 1 ]; then - ip route add 224.0.0.0/4 dev $dev scope global >& /dev/null + ip route add 224.0.0.0/4 dev $dev scope global > /dev/null 2>&1 fi @@ -60,5 +59,5 @@ index c3629fd..674198d 100644 exec tr "[\\\\]" "[ ]" -- -1.7.9.5 +2.7.4 diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch b/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch index 3d324c96d..50c4bfb0f 100644 --- a/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch +++ b/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch @@ -15,13 +15,13 @@ https://git.buildroot.net/buildroot/tree/package/iproute2/0001-Add-the-musl-work Signed-off-by: Baruch Siach Signed-off-by: Maxin B. John --- - include/linux/libc-compat.h | 4 +++- + include/uapi/linux/libc-compat.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/include/linux/libc-compat.h b/include/linux/libc-compat.h +diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h index f38571d..30f0b67 100644 ---- a/include/linux/libc-compat.h -+++ b/include/linux/libc-compat.h +--- a/include/uapi/linux/libc-compat.h ++++ b/include/uapi/linux/libc-compat.h @@ -49,10 +49,12 @@ #define _LIBC_COMPAT_H diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch b/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch index 866609ca9..8b75a2ada 100644 --- a/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch +++ b/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch @@ -9,19 +9,19 @@ Upstream-Status: Pending Signed-off-by: Koen Kooi Signed-off-by: Shane Wang -Index: iproute2-3.7.0/configure +Index: iproute2-4.14.1/configure =================================================================== ---- iproute2-3.7.0.orig/configure -+++ iproute2-3.7.0/configure +--- iproute2-4.14.1.orig/configure ++++ iproute2-4.14.1/configure @@ -2,6 +2,7 @@ - # This is not an autconf generated configure + # This is not an autoconf generated configure # INCLUDE=${1:-"$PWD/include"} +SYSROOT=$1 - # Make a temp directory in build tree. - TMPDIR=$(mktemp -d config.XXXXXX) -@@ -158,7 +159,7 @@ check_ipt_lib_dir() + # Output file which is input to Makefile + CONFIG=config.mk +@@ -195,7 +196,7 @@ check_ipt_lib_dir() return fi -- cgit v1.2.1