diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2022-01-14 09:39:39 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-01-18 09:01:51 -0800 |
commit | 3b47273cedad16ccf3b5ea22bfa88b6fe85a2c13 (patch) | |
tree | 1136acd70e495eb07240d1ce7559eb159276c431 | |
parent | ec5cc94217f33c0e676d48cd9352bc9e3b8ddd5b (diff) | |
download | meta-openembedded-3b47273cedad16ccf3b5ea22bfa88b6fe85a2c13.tar.gz |
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 <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-networking/recipes-support/bridge-utils/bridge-utils/0001-include-missing-kernel-header.patch (renamed from meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch) | 6 | ||||
-rw-r--r-- | meta-networking/recipes-support/bridge-utils/bridge-utils/0002-build-don-t-ignore-CFLAGS-from-environment.patch (renamed from meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch) | 4 | ||||
-rw-r--r-- | meta-networking/recipes-support/bridge-utils/bridge-utils/0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch (renamed from meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch) | 10 | ||||
-rw-r--r-- | meta-networking/recipes-support/bridge-utils/bridge-utils/0004-cleanup-includes.patch | 149 | ||||
-rw-r--r-- | meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb (renamed from meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.bb) | 11 |
5 files changed, 165 insertions, 15 deletions
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 index 8a23a3070..dbd6b18c4 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 @@ | |||
1 | From 824f838cc9c7b8a44174358446993d61be7bbb3f Mon Sep 17 00:00:00 2001 | 1 | From 203801ae47399569868aa468988e711ba3ddfa92 Mon Sep 17 00:00:00 2001 |
2 | From: Joe MacDonald <joe_macdonald@mentor.com> | 2 | From: Joe MacDonald <joe_macdonald@mentor.com> |
3 | Date: Mon, 30 Oct 2017 13:18:20 -0400 | 3 | Date: Mon, 30 Oct 2017 13:18:20 -0400 |
4 | Subject: [PATCH] include missing kernel header | 4 | Subject: [PATCH] include missing kernel header |
@@ -17,7 +17,7 @@ Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> | |||
17 | 1 file changed, 1 insertion(+) | 17 | 1 file changed, 1 insertion(+) |
18 | 18 | ||
19 | diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h | 19 | diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h |
20 | index c038b92..fd09306 100644 | 20 | index 962f316..422ec33 100644 |
21 | --- a/libbridge/libbridge.h | 21 | --- a/libbridge/libbridge.h |
22 | +++ b/libbridge/libbridge.h | 22 | +++ b/libbridge/libbridge.h |
23 | @@ -24,6 +24,7 @@ | 23 | @@ -24,6 +24,7 @@ |
@@ -29,5 +29,5 @@ index c038b92..fd09306 100644 | |||
29 | #include <linux/if_bridge.h> | 29 | #include <linux/if_bridge.h> |
30 | 30 | ||
31 | -- | 31 | -- |
32 | 2.7.4 | 32 | 2.17.1 |
33 | 33 | ||
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 index 0a72c6b2c..5ec563b6b 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 @@ | |||
1 | From 9d63838d12c772dfe33371e2bb8b8191625539f2 Mon Sep 17 00:00:00 2001 | 1 | From 0c1a66fc62cc321d307c94f962031283142eea69 Mon Sep 17 00:00:00 2001 |
2 | From: Joe MacDonald <joe_macdonald@mentor.com> | 2 | From: Joe MacDonald <joe_macdonald@mentor.com> |
3 | Date: Mon, 30 Oct 2017 13:37:48 -0400 | 3 | Date: Mon, 30 Oct 2017 13:37:48 -0400 |
4 | Subject: [PATCH] build: don't ignore CFLAGS from environment | 4 | Subject: [PATCH] build: don't ignore CFLAGS from environment |
@@ -36,5 +36,5 @@ index e1956d6..eff260c 100644 | |||
36 | %.o: %.c brctl.h | 36 | %.o: %.c brctl.h |
37 | $(CC) $(CFLAGS) $(INCLUDE) -c $< | 37 | $(CC) $(CFLAGS) $(INCLUDE) -c $< |
38 | -- | 38 | -- |
39 | 2.7.4 | 39 | 2.17.1 |
40 | 40 | ||
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 index 3f65761f5..586ebfec6 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 @@ | |||
1 | From c924f66743c054d7ebafef90ca1bbebc96732357 Mon Sep 17 00:00:00 2001 | 1 | From 99264c688ff98d8f0f237cba6c7098eb4d5a12a7 Mon Sep 17 00:00:00 2001 |
2 | From: Joe MacDonald <joe_macdonald@mentor.com> | 2 | From: Joe MacDonald <joe_macdonald@mentor.com> |
3 | Date: Mon, 30 Oct 2017 13:48:33 -0400 | 3 | Date: Mon, 30 Oct 2017 13:48:33 -0400 |
4 | Subject: [PATCH] libbridge: Modifying the AR to cross toolchain | 4 | Subject: [PATCH] libbridge: Modifying the AR to cross toolchain |
@@ -14,12 +14,12 @@ Upstream-Status: Pending | |||
14 | Signed-off-by: Li Zhou <li.zhou@windriver.com> | 14 | Signed-off-by: Li Zhou <li.zhou@windriver.com> |
15 | Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> | 15 | Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> |
16 | --- | 16 | --- |
17 | configure.ac | 1 + | 17 | configure.ac | 4 ++++ |
18 | libbridge/Makefile.in | 2 +- | 18 | libbridge/Makefile.in | 2 +- |
19 | 2 files changed, 2 insertions(+), 1 deletion(-) | 19 | 2 files changed, 5 insertions(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/configure.ac b/configure.ac | 21 | diff --git a/configure.ac b/configure.ac |
22 | index 8b2e2ea..8426b7c 100644 | 22 | index 66817bb..bcc6946 100644 |
23 | --- a/configure.ac | 23 | --- a/configure.ac |
24 | +++ b/configure.ac | 24 | +++ b/configure.ac |
25 | @@ -12,6 +12,10 @@ dnl Checks for programs. | 25 | @@ -12,6 +12,10 @@ dnl Checks for programs. |
@@ -47,5 +47,5 @@ index 7932bfe..bd55e9b 100644 | |||
47 | 47 | ||
48 | CC=@CC@ | 48 | CC=@CC@ |
49 | -- | 49 | -- |
50 | 2.7.4 | 50 | 2.17.1 |
51 | 51 | ||
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 000000000..eb5c53d9e --- /dev/null +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-cleanup-includes.patch | |||
@@ -0,0 +1,149 @@ | |||
1 | From 1763c5b7f8f72d651d62337029c3bdfb269491e4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Stephen Hemminger <sthemmin@microsoft.com> | ||
3 | Date: Fri, 7 Jan 2022 08:44:19 -0800 | ||
4 | Subject: [PATCH] cleanup includes | ||
5 | |||
6 | Use IWYU to only include necessary headers. | ||
7 | Should resolve build issues for distros that need limits.h | ||
8 | to find PATH_MAX. | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | [https://git.kernel.org/pub/scm/network/bridge/bridge-utils.git/commit/?h=main&id=1763c5b7f8f72d651d62337029c3bdfb269491e4] | ||
12 | |||
13 | Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com> | ||
14 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
15 | --- | ||
16 | brctl/brctl.c | 1 - | ||
17 | brctl/brctl_cmd.c | 3 ++- | ||
18 | brctl/brctl_disp.c | 1 - | ||
19 | libbridge/libbridge_devif.c | 5 ++++- | ||
20 | libbridge/libbridge_if.c | 5 +---- | ||
21 | libbridge/libbridge_init.c | 4 +++- | ||
22 | libbridge/libbridge_misc.c | 5 +---- | ||
23 | 7 files changed, 11 insertions(+), 13 deletions(-) | ||
24 | |||
25 | diff --git a/brctl/brctl.c b/brctl/brctl.c | ||
26 | index 8855234..d2fa005 100644 | ||
27 | --- a/brctl/brctl.c | ||
28 | +++ b/brctl/brctl.c | ||
29 | @@ -17,7 +17,6 @@ | ||
30 | */ | ||
31 | |||
32 | #include <stdio.h> | ||
33 | -#include <stdlib.h> | ||
34 | #include <string.h> | ||
35 | #include <errno.h> | ||
36 | #include <getopt.h> | ||
37 | diff --git a/brctl/brctl_cmd.c b/brctl/brctl_cmd.c | ||
38 | index 81f7dfa..4167503 100644 | ||
39 | --- a/brctl/brctl_cmd.c | ||
40 | +++ b/brctl/brctl_cmd.c | ||
41 | @@ -18,10 +18,11 @@ | ||
42 | |||
43 | #include <stdio.h> | ||
44 | #include <stdlib.h> | ||
45 | +#include <stdint.h> | ||
46 | #include <string.h> | ||
47 | #include <sys/time.h> | ||
48 | #include <errno.h> | ||
49 | -#include <asm/param.h> | ||
50 | + | ||
51 | #include "libbridge.h" | ||
52 | #include "brctl.h" | ||
53 | |||
54 | diff --git a/brctl/brctl_disp.c b/brctl/brctl_disp.c | ||
55 | index 3e81241..f6bf2af 100644 | ||
56 | --- a/brctl/brctl_disp.c | ||
57 | +++ b/brctl/brctl_disp.c | ||
58 | @@ -17,7 +17,6 @@ | ||
59 | */ | ||
60 | |||
61 | #include <stdio.h> | ||
62 | -#include <stdlib.h> | ||
63 | #include <string.h> | ||
64 | #include <sys/time.h> | ||
65 | |||
66 | diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c | ||
67 | index 8b7d954..3aac0f9 100644 | ||
68 | --- a/libbridge/libbridge_devif.c | ||
69 | +++ b/libbridge/libbridge_devif.c | ||
70 | @@ -18,12 +18,15 @@ | ||
71 | |||
72 | |||
73 | #include <stdio.h> | ||
74 | -#include <stdlib.h> | ||
75 | #include <unistd.h> | ||
76 | #include <errno.h> | ||
77 | #include <string.h> | ||
78 | #include <dirent.h> | ||
79 | #include <fcntl.h> | ||
80 | +#include <limits.h> | ||
81 | + | ||
82 | +#include <sys/ioctl.h> | ||
83 | +#include <linux/sockios.h> | ||
84 | |||
85 | #include "libbridge.h" | ||
86 | #include "libbridge_private.h" | ||
87 | diff --git a/libbridge/libbridge_if.c b/libbridge/libbridge_if.c | ||
88 | index 5f3aed1..96dda30 100644 | ||
89 | --- a/libbridge/libbridge_if.c | ||
90 | +++ b/libbridge/libbridge_if.c | ||
91 | @@ -16,12 +16,9 @@ | ||
92 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
93 | */ | ||
94 | |||
95 | -#include <stdio.h> | ||
96 | -#include <stdlib.h> | ||
97 | #include <errno.h> | ||
98 | -#include <string.h> | ||
99 | -#include <fcntl.h> | ||
100 | #include <sys/ioctl.h> | ||
101 | +#include <linux/sockios.h> | ||
102 | |||
103 | #include "libbridge.h" | ||
104 | #include "libbridge_private.h" | ||
105 | diff --git a/libbridge/libbridge_init.c b/libbridge/libbridge_init.c | ||
106 | index c914971..d572895 100644 | ||
107 | --- a/libbridge/libbridge_init.c | ||
108 | +++ b/libbridge/libbridge_init.c | ||
109 | @@ -16,14 +16,16 @@ | ||
110 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
111 | */ | ||
112 | |||
113 | +#include <limits.h> | ||
114 | #include <stdio.h> | ||
115 | #include <stdlib.h> | ||
116 | #include <unistd.h> | ||
117 | #include <errno.h> | ||
118 | #include <string.h> | ||
119 | #include <dirent.h> | ||
120 | -#include <sys/types.h> | ||
121 | #include <sys/stat.h> | ||
122 | +#include <sys/ioctl.h> | ||
123 | +#include <linux/sockios.h> | ||
124 | |||
125 | #include "libbridge.h" | ||
126 | #include "libbridge_private.h" | ||
127 | diff --git a/libbridge/libbridge_misc.c b/libbridge/libbridge_misc.c | ||
128 | index 9379e93..5b146fd 100644 | ||
129 | --- a/libbridge/libbridge_misc.c | ||
130 | +++ b/libbridge/libbridge_misc.c | ||
131 | @@ -16,14 +16,11 @@ | ||
132 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
133 | */ | ||
134 | |||
135 | -#include <stdio.h> | ||
136 | #include <stdlib.h> | ||
137 | #include <string.h> | ||
138 | -#include <sys/time.h> | ||
139 | #include <asm/param.h> | ||
140 | -#include "libbridge.h" | ||
141 | -#include "libbridge_private.h" | ||
142 | |||
143 | +#include "libbridge.h" | ||
144 | |||
145 | static const char *state_names[5] = { | ||
146 | [BR_STATE_DISABLED] = "disabled", | ||
147 | -- | ||
148 | 2.17.1 | ||
149 | |||
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 index b8975dec0..85a7e59d5 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" | |||
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37" |
7 | 7 | ||
8 | SRCREV = "ab8a2cc330253321be7bc69dea88bfaa3d48415e" | 8 | SRCREV = "75d949b9fae9718201422f0bd3d1103e67dd597c" |
9 | 9 | ||
10 | SRC_URI = "\ | 10 | SRC_URI = "\ |
11 | git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git;branch=main \ | 11 | git://git.kernel.org/pub/scm/network/bridge/bridge-utils.git;branch=main \ |
12 | file://kernel-headers.patch \ | 12 | file://0001-include-missing-kernel-header.patch \ |
13 | file://0005-build-don-t-ignore-CFLAGS-from-environment.patch \ | 13 | file://0002-build-don-t-ignore-CFLAGS-from-environment.patch \ |
14 | file://0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch \ | 14 | file://0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch \ |
15 | file://0004-cleanup-includes.patch \ | ||
15 | " | 16 | " |
16 | 17 | ||
17 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |