added my Recipes
This commit is contained in:
@@ -0,0 +1,33 @@
|
||||
From 203801ae47399569868aa468988e711ba3ddfa92 Mon Sep 17 00:00:00 2001
|
||||
From: Joe MacDonald <joe_macdonald@mentor.com>
|
||||
Date: Mon, 30 Oct 2017 13:18:20 -0400
|
||||
Subject: [PATCH] include missing kernel header
|
||||
|
||||
Fixes errors like
|
||||
|
||||
| /b/kraj/jlinux-next/poky/build/tmp-eglibc/sysroots/re-64b/usr/include/linux/if_bridge.h:172:20: error: field 'ip6' has incomplete type
|
||||
| In file included from ../libbridge/libbridge.h:24:0,
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
|
||||
---
|
||||
libbridge/libbridge.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h
|
||||
index 962f316..422ec33 100644
|
||||
--- a/libbridge/libbridge.h
|
||||
+++ b/libbridge/libbridge.h
|
||||
@@ -24,6 +24,7 @@
|
||||
#include <sys/time.h>
|
||||
#include <netinet/in.h>
|
||||
|
||||
+#include <linux/in6.h>
|
||||
#include <linux/if.h>
|
||||
#include <linux/if_bridge.h>
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
From 0c1a66fc62cc321d307c94f962031283142eea69 Mon Sep 17 00:00:00 2001
|
||||
From: Joe MacDonald <joe_macdonald@mentor.com>
|
||||
Date: Mon, 30 Oct 2017 13:37:48 -0400
|
||||
Subject: [PATCH] build: don't ignore CFLAGS from environment
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
We need to take them into account so as to behave nicely towards
|
||||
build environments which expect to be able to set them, e.g. for
|
||||
optimisation flags, or debug options.
|
||||
|
||||
Therefore they need to be added to the compiler command line of
|
||||
every source file, and in addition, the same CFLAGS that were
|
||||
used during compilation must also always be used during linking!
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: André Draszik <git@andred.net>
|
||||
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
|
||||
---
|
||||
brctl/Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/brctl/Makefile.in b/brctl/Makefile.in
|
||||
index e1956d6..eff260c 100644
|
||||
--- a/brctl/Makefile.in
|
||||
+++ b/brctl/Makefile.in
|
||||
@@ -34,7 +34,7 @@ install: $(PROGRAMS)
|
||||
$(INSTALL) -m 755 $(PROGRAMS) $(DESTDIR)$(sbindir)
|
||||
|
||||
brctl: $(brctl_OBJECTS) ../libbridge/libbridge.a
|
||||
- $(CC) $(LDFLAGS) $(brctl_OBJECTS) $(LIBS) -o brctl
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) $(brctl_OBJECTS) $(LIBS) -o brctl
|
||||
|
||||
%.o: %.c brctl.h
|
||||
$(CC) $(CFLAGS) $(INCLUDE) -c $<
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
From 99264c688ff98d8f0f237cba6c7098eb4d5a12a7 Mon Sep 17 00:00:00 2001
|
||||
From: Joe MacDonald <joe_macdonald@mentor.com>
|
||||
Date: Mon, 30 Oct 2017 13:48:33 -0400
|
||||
Subject: [PATCH] libbridge: Modifying the AR to cross toolchain
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The Makefile uses the host “ar” tool when it should be using the ar from
|
||||
the target toolchain.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Li Zhou <li.zhou@windriver.com>
|
||||
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
|
||||
---
|
||||
configure.ac | 4 ++++
|
||||
libbridge/Makefile.in | 2 +-
|
||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 66817bb..bcc6946 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -12,6 +12,10 @@ dnl Checks for programs.
|
||||
AC_PROG_CC
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_RANLIB
|
||||
+AN_MAKEVAR([AR], [AC_PROG_AR])
|
||||
+AN_PROGRAM([ar], [AC_PROG_AR])
|
||||
+AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
|
||||
+AC_PROG_AR
|
||||
|
||||
dnl Checks for header files.
|
||||
AC_HEADER_STDC
|
||||
diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in
|
||||
index 7932bfe..bd55e9b 100644
|
||||
--- a/libbridge/Makefile.in
|
||||
+++ b/libbridge/Makefile.in
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
KERNEL_HEADERS=-I@KERNEL_HEADERS@
|
||||
|
||||
-AR=ar
|
||||
+AR=@AR@
|
||||
RANLIB=@RANLIB@
|
||||
|
||||
CC=@CC@
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -0,0 +1,149 @@
|
||||
From 1763c5b7f8f72d651d62337029c3bdfb269491e4 Mon Sep 17 00:00:00 2001
|
||||
From: Stephen Hemminger <sthemmin@microsoft.com>
|
||||
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 <sthemmin@microsoft.com>
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
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 <stdio.h>
|
||||
-#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <getopt.h>
|
||||
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 <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <stdint.h>
|
||||
#include <string.h>
|
||||
#include <sys/time.h>
|
||||
#include <errno.h>
|
||||
-#include <asm/param.h>
|
||||
+
|
||||
#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 <stdio.h>
|
||||
-#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
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 <stdio.h>
|
||||
-#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <dirent.h>
|
||||
#include <fcntl.h>
|
||||
+#include <limits.h>
|
||||
+
|
||||
+#include <sys/ioctl.h>
|
||||
+#include <linux/sockios.h>
|
||||
|
||||
#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 <stdio.h>
|
||||
-#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
-#include <string.h>
|
||||
-#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
+#include <linux/sockios.h>
|
||||
|
||||
#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 <limits.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <dirent.h>
|
||||
-#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <sys/ioctl.h>
|
||||
+#include <linux/sockios.h>
|
||||
|
||||
#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 <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
-#include <sys/time.h>
|
||||
#include <asm/param.h>
|
||||
-#include "libbridge.h"
|
||||
-#include "libbridge_private.h"
|
||||
|
||||
+#include "libbridge.h"
|
||||
|
||||
static const char *state_names[5] = {
|
||||
[BR_STATE_DISABLED] = "disabled",
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
SUMMARY = "Tools for ethernet bridging"
|
||||
HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge"
|
||||
SECTION = "net"
|
||||
LICENSE = "GPL-2.0-only"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37"
|
||||
|
||||
SRCREV = "75d949b9fae9718201422f0bd3d1103e67dd597c"
|
||||
|
||||
SRC_URI = "\
|
||||
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"
|
||||
|
||||
DEPENDS = "sysfsutils"
|
||||
|
||||
inherit autotools-brokensep update-alternatives
|
||||
|
||||
ALTERNATIVE:${PN} = "brctl"
|
||||
ALTERNATIVE_PRIORITY[brctl] = "100"
|
||||
ALTERNATIVE_LINK_NAME[brctl] = "${sbindir}/brctl"
|
||||
|
||||
EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}"
|
||||
|
||||
do_install:append () {
|
||||
install -d ${D}/${datadir}/bridge-utils
|
||||
install -d ${D}/${sysconfdir}/network/if-pre-up.d
|
||||
install -d ${D}/${sysconfdir}/network/if-post-down.d
|
||||
}
|
||||
|
||||
RRECOMMENDS:${PN} = "kernel-module-bridge"
|
||||
Reference in New Issue
Block a user