diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-12-17 10:45:55 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-12-17 10:45:55 +0100 |
| commit | d950041875a4dfe8a236b465be7f04e13a975544 (patch) | |
| tree | 9ae1403f29f94aefecad5bbe57d82342a010a9da /patches/bridge-utils-1.5 | |
| parent | da33f6c5cfd677aa89d300573328012515705bf8 (diff) | |
| download | ptxdist-d950041875a4dfe8a236b465be7f04e13a975544.tar.gz ptxdist-d950041875a4dfe8a236b465be7f04e13a975544.tar.xz | |
bridge-utils: add patch to build with newer kernel headers
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/bridge-utils-1.5')
3 files changed, 26 insertions, 24 deletions
diff --git a/patches/bridge-utils-1.5/0001-add-dummy-patch-to-enable-autogen.sh.patch b/patches/bridge-utils-1.5/0001-add-dummy-patch-to-enable-autogen.sh.patch deleted file mode 100644 index 848636e93..000000000 --- a/patches/bridge-utils-1.5/0001-add-dummy-patch-to-enable-autogen.sh.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Robert Schwebel <r.schwebel@pengutronix.de> -Date: Sat, 29 Oct 2011 18:58:04 +0200 -Subject: [PATCH] add dummy patch to enable autogen.sh - -See patch below ... not for upstream. - -Not-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> ---- - README.ptx | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - create mode 100644 README.ptx - -diff --git a/README.ptx b/README.ptx -new file mode 100644 -index 0000000..08a6ac9 ---- /dev/null -+++ b/README.ptx -@@ -0,0 +1,4 @@ -+This is a dummy patch; with a patch, it is possible to run autogen.sh -+from ptxdist. -+ -+-rsc diff --git a/patches/bridge-utils-1.5/0001-add-include-linux-in6.h-to-build-with-newer-kernel-h.patch b/patches/bridge-utils-1.5/0001-add-include-linux-in6.h-to-build-with-newer-kernel-h.patch new file mode 100644 index 000000000..602ba6dcf --- /dev/null +++ b/patches/bridge-utils-1.5/0001-add-include-linux-in6.h-to-build-with-newer-kernel-h.patch @@ -0,0 +1,24 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Tue, 17 Dec 2013 10:19:29 +0100 +Subject: [PATCH] add '#include <linux/in6.h>' to build with newer kernel + headers + +See also: https://lkml.org/lkml/2013/1/13/116 + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + libbridge/libbridge.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h +index 39964f2..aeb094d 100644 +--- a/libbridge/libbridge.h ++++ b/libbridge/libbridge.h +@@ -21,6 +21,7 @@ + + #include <sys/socket.h> + #include <linux/if.h> ++#include <linux/in6.h> + #include <linux/if_bridge.h> + + /* defined in net/if.h but that conflicts with linux/if.h... */ diff --git a/patches/bridge-utils-1.5/series b/patches/bridge-utils-1.5/series index fb52a84de..064d4211c 100644 --- a/patches/bridge-utils-1.5/series +++ b/patches/bridge-utils-1.5/series @@ -1,4 +1,4 @@ # generated by git-ptx-patches #tag:base --start-number 1 -0001-add-dummy-patch-to-enable-autogen.sh.patch -# 9172da51f532b02259133e9a0be1e9ba - git-ptx-patches magic +0001-add-include-linux-in6.h-to-build-with-newer-kernel-h.patch +# 5ef46a2f4ea5c1f3c53698f8b7251c59 - git-ptx-patches magic |