diff mbox

[v3,1/2] igmpproxy: uclinux support merged upstream

Message ID 1463661925-56795-1-git-send-email-matthew.weber@rockwellcollins.com
State Superseded
Headers show

Commit Message

Matt Weber May 19, 2016, 12:45 p.m. UTC 
Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
--
v2 -> v3
 - Upstream version bump now contains this feature
---
 package/igmpproxy/0001-uclinux.patch | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 package/igmpproxy/0001-uclinux.patch

Comments

Baruch Siach May 19, 2016, 12:55 p.m. UTC | #1 
Hi Matthew,

On Thu, May 19, 2016 at 07:45:24AM -0500, Matt Weber wrote:
> Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
> --
> v2 -> v3
>  - Upstream version bump now contains this feature

Then both patches should be squashed into one.

baruch

> ---
>  package/igmpproxy/0001-uclinux.patch | 16 ----------------
>  1 file changed, 16 deletions(-)
>  delete mode 100644 package/igmpproxy/0001-uclinux.patch
> 
> diff --git a/package/igmpproxy/0001-uclinux.patch b/package/igmpproxy/0001-uclinux.patch
> deleted file mode 100644
> index 7fa4a23..0000000
> --- a/package/igmpproxy/0001-uclinux.patch
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -configure.ac: uclinux is also linux
> -
> -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> -
> -diff -Nura igmpproxy-0.1.orig/configure.ac igmpproxy-0.1/configure.ac
> ---- igmpproxy-0.1.orig/configure.ac	2014-03-12 18:43:02.369323771 -0300
> -+++ igmpproxy-0.1/configure.ac	2014-03-12 18:43:22.129979179 -0300
> -@@ -7,7 +7,7 @@
> - 
> - AC_CANONICAL_HOST
> - case $host_os in
> --	linux*) os=linux;;
> -+	linux*|uclinux*) os=linux;;
> - 	freebsd*) os=freebsd;;
> - 	netbsd*) os=netbsd;;
> - 	openbsd*) os=openbsd;;
Thomas Petazzoni May 19, 2016, 2:03 p.m. UTC | #2 
Hello,

On Thu, 19 May 2016 07:45:24 -0500, Matt Weber wrote:
> Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
> --
> v2 -> v3
>  - Upstream version bump now contains this feature

Doesn't this patch depends on PATCH 2/2 being applied?

If so, they should be a single patch, otherwise if I apply only this
patch, the build is broken.

Thomas
Matt Weber May 19, 2016, 2:22 p.m. UTC | #3 
Baruch,

On Thu, May 19, 2016 at 7:55 AM, Baruch Siach <baruch@tkos.co.il> wrote:

> Hi Matthew,
>
> On Thu, May 19, 2016 at 07:45:24AM -0500, Matt Weber wrote:
> > Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
> > --
> > v2 -> v3
> >  - Upstream version bump now contains this feature
>
> Then both patches should be squashed into one.
>
>
Sure.

-Matt
diff mbox

Patch

diff --git a/package/igmpproxy/0001-uclinux.patch b/package/igmpproxy/0001-uclinux.patch
deleted file mode 100644
index 7fa4a23..0000000
--- a/package/igmpproxy/0001-uclinux.patch
+++ /dev/null
@@ -1,16 +0,0 @@ 
-configure.ac: uclinux is also linux
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura igmpproxy-0.1.orig/configure.ac igmpproxy-0.1/configure.ac
---- igmpproxy-0.1.orig/configure.ac	2014-03-12 18:43:02.369323771 -0300
-+++ igmpproxy-0.1/configure.ac	2014-03-12 18:43:22.129979179 -0300
-@@ -7,7 +7,7 @@
- 
- AC_CANONICAL_HOST
- case $host_os in
--	linux*) os=linux;;
-+	linux*|uclinux*) os=linux;;
- 	freebsd*) os=freebsd;;
- 	netbsd*) os=netbsd;;
- 	openbsd*) os=openbsd;;