From 3b47273cedad16ccf3b5ea22bfa88b6fe85a2c13 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Fri, 14 Jan 2022 09:39:39 +0800 Subject: [PATCH] bridge-utils: upgrade 1.7 -> 1.7.1 * Update SRC_URI to official git repo per [1] * Refresh patches * Backport a patch to fix build error with musl [1] https://wiki.linuxfoundation.org/networking/bridge Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- ... 0001-include-missing-kernel-header.patch} | 6 +- ...on-t-ignore-CFLAGS-from-environment.patch} | 4 +- ...Modifying-the-AR-to-cross-toolchain.patch} | 10 +- .../bridge-utils/0004-cleanup-includes.patch | 149 ++++++++++++++++++ ...dge-utils_1.7.bb => bridge-utils_1.7.1.bb} | 11 +- 5 files changed, 165 insertions(+), 15 deletions(-) rename meta-networking/recipes-support/bridge-utils/bridge-utils/{kernel-headers.patch => 0001-include-missing-kernel-header.patch} (88%) rename meta-networking/recipes-support/bridge-utils/bridge-utils/{0005-build-don-t-ignore-CFLAGS-from-environment.patch => 0002-build-don-t-ignore-CFLAGS-from-environment.patch} (94%) rename meta-networking/recipes-support/bridge-utils/bridge-utils/{0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch => 0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch} (85%) create mode 100644 meta-networking/recipes-support/bridge-utils/bridge-utils/0004-cleanup-includes.patch rename meta-networking/recipes-support/bridge-utils/{bridge-utils_1.7.bb => bridge-utils_1.7.1.bb} (67%) diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch b/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-include-missing-kernel-header.patch similarity index 88% rename from meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch rename to meta-networking/recipes-support/bridge-utils/bridge-utils/0001-include-missing-kernel-header.patch index 8a23a3070c..dbd6b18c42 100644 --- a/meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-include-missing-kernel-header.patch @@ -1,4 +1,4 @@ -From 824f838cc9c7b8a44174358446993d61be7bbb3f Mon Sep 17 00:00:00 2001 +From 203801ae47399569868aa468988e711ba3ddfa92 Mon Sep 17 00:00:00 2001 From: Joe MacDonald Date: Mon, 30 Oct 2017 13:18:20 -0400 Subject: [PATCH] include missing kernel header @@ -17,7 +17,7 @@ Signed-off-by: Joe MacDonald 1 file changed, 1 insertion(+) diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h -index c038b92..fd09306 100644 +index 962f316..422ec33 100644 --- a/libbridge/libbridge.h +++ b/libbridge/libbridge.h @@ -24,6 +24,7 @@ @@ -29,5 +29,5 @@ index c038b92..fd09306 100644 #include -- -2.7.4 +2.17.1 diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch b/meta-networking/recipes-support/bridge-utils/bridge-utils/0002-build-don-t-ignore-CFLAGS-from-environment.patch similarity index 94% rename from meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch rename to meta-networking/recipes-support/bridge-utils/bridge-utils/0002-build-don-t-ignore-CFLAGS-from-environment.patch index 0a72c6b2c4..5ec563b6b1 100644 --- a/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils/0002-build-don-t-ignore-CFLAGS-from-environment.patch @@ -1,4 +1,4 @@ -From 9d63838d12c772dfe33371e2bb8b8191625539f2 Mon Sep 17 00:00:00 2001 +From 0c1a66fc62cc321d307c94f962031283142eea69 Mon Sep 17 00:00:00 2001 From: Joe MacDonald Date: Mon, 30 Oct 2017 13:37:48 -0400 Subject: [PATCH] build: don't ignore CFLAGS from environment @@ -36,5 +36,5 @@ index e1956d6..eff260c 100644 %.o: %.c brctl.h $(CC) $(CFLAGS) $(INCLUDE) -c $< -- -2.7.4 +2.17.1 diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch b/meta-networking/recipes-support/bridge-utils/bridge-utils/0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch similarity index 85% rename from meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch rename to meta-networking/recipes-support/bridge-utils/bridge-utils/0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch index 3f65761f54..586ebfec68 100644 --- a/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils/0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch @@ -1,4 +1,4 @@ -From c924f66743c054d7ebafef90ca1bbebc96732357 Mon Sep 17 00:00:00 2001 +From 99264c688ff98d8f0f237cba6c7098eb4d5a12a7 Mon Sep 17 00:00:00 2001 From: Joe MacDonald Date: Mon, 30 Oct 2017 13:48:33 -0400 Subject: [PATCH] libbridge: Modifying the AR to cross toolchain @@ -14,12 +14,12 @@ Upstream-Status: Pending Signed-off-by: Li Zhou Signed-off-by: Joe MacDonald --- - configure.ac | 1 + + configure.ac | 4 ++++ libbridge/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 8b2e2ea..8426b7c 100644 +index 66817bb..bcc6946 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,10 @@ dnl Checks for programs. @@ -47,5 +47,5 @@ index 7932bfe..bd55e9b 100644 CC=@CC@ -- -2.7.4 +2.17.1 diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-cleanup-includes.patch b/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-cleanup-includes.patch new file mode 100644 index 0000000000..eb5c53d9ed --- /dev/null +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-cleanup-includes.patch @@ -0,0 +1,149 @@ +From 1763c5b7f8f72d651d62337029c3bdfb269491e4 Mon Sep 17 00:00:00 2001 +From: Stephen Hemminger +Date: Fri, 7 Jan 2022 08:44:19 -0800 +Subject: [PATCH] cleanup includes + +Use IWYU to only include necessary headers. +Should resolve build issues for distros that need limits.h +to find PATH_MAX. + +Upstream-Status: Backport +[https://git.kernel.org/pub/scm/network/bridge/bridge-utils.git/commit/?h=main&id=1763c5b7f8f72d651d62337029c3bdfb269491e4] + +Signed-off-by: Stephen Hemminger +Signed-off-by: Yi Zhao +--- + brctl/brctl.c | 1 - + brctl/brctl_cmd.c | 3 ++- + brctl/brctl_disp.c | 1 - + libbridge/libbridge_devif.c | 5 ++++- + libbridge/libbridge_if.c | 5 +---- + libbridge/libbridge_init.c | 4 +++- + libbridge/libbridge_misc.c | 5 +---- + 7 files changed, 11 insertions(+), 13 deletions(-) + +diff --git a/brctl/brctl.c b/brctl/brctl.c +index 8855234..d2fa005 100644 +--- a/brctl/brctl.c ++++ b/brctl/brctl.c +@@ -17,7 +17,6 @@ + */ + + #include +-#include + #include + #include + #include +diff --git a/brctl/brctl_cmd.c b/brctl/brctl_cmd.c +index 81f7dfa..4167503 100644 +--- a/brctl/brctl_cmd.c ++++ b/brctl/brctl_cmd.c +@@ -18,10 +18,11 @@ + + #include + #include ++#include + #include + #include + #include +-#include ++ + #include "libbridge.h" + #include "brctl.h" + +diff --git a/brctl/brctl_disp.c b/brctl/brctl_disp.c +index 3e81241..f6bf2af 100644 +--- a/brctl/brctl_disp.c ++++ b/brctl/brctl_disp.c +@@ -17,7 +17,6 @@ + */ + + #include +-#include + #include + #include + +diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c +index 8b7d954..3aac0f9 100644 +--- a/libbridge/libbridge_devif.c ++++ b/libbridge/libbridge_devif.c +@@ -18,12 +18,15 @@ + + + #include +-#include + #include + #include + #include + #include + #include ++#include ++ ++#include ++#include + + #include "libbridge.h" + #include "libbridge_private.h" +diff --git a/libbridge/libbridge_if.c b/libbridge/libbridge_if.c +index 5f3aed1..96dda30 100644 +--- a/libbridge/libbridge_if.c ++++ b/libbridge/libbridge_if.c +@@ -16,12 +16,9 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +-#include +-#include + #include +-#include +-#include + #include ++#include + + #include "libbridge.h" + #include "libbridge_private.h" +diff --git a/libbridge/libbridge_init.c b/libbridge/libbridge_init.c +index c914971..d572895 100644 +--- a/libbridge/libbridge_init.c ++++ b/libbridge/libbridge_init.c +@@ -16,14 +16,16 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#include + #include + #include + #include + #include + #include + #include +-#include + #include ++#include ++#include + + #include "libbridge.h" + #include "libbridge_private.h" +diff --git a/libbridge/libbridge_misc.c b/libbridge/libbridge_misc.c +index 9379e93..5b146fd 100644 +--- a/libbridge/libbridge_misc.c ++++ b/libbridge/libbridge_misc.c +@@ -16,14 +16,11 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +-#include + #include + #include +-#include + #include +-#include "libbridge.h" +-#include "libbridge_private.h" + ++#include "libbridge.h" + + static const char *state_names[5] = { + [BR_STATE_DISABLED] = "disabled", +-- +2.17.1 + diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.bb b/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb similarity index 67% rename from meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.bb rename to meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb index b8975dec0b..85a7e59d57 100644 --- a/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.bb +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb @@ -5,13 +5,14 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37" -SRCREV = "ab8a2cc330253321be7bc69dea88bfaa3d48415e" +SRCREV = "75d949b9fae9718201422f0bd3d1103e67dd597c" SRC_URI = "\ - git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git;branch=main \ - file://kernel-headers.patch \ - file://0005-build-don-t-ignore-CFLAGS-from-environment.patch \ - file://0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch \ + git://git.kernel.org/pub/scm/network/bridge/bridge-utils.git;branch=main \ + file://0001-include-missing-kernel-header.patch \ + file://0002-build-don-t-ignore-CFLAGS-from-environment.patch \ + file://0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch \ + file://0004-cleanup-includes.patch \ " S = "${WORKDIR}/git"