All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2][resend] tcpdump: fix mix of tabs and spaces
@ 2009-06-26 12:16 Michael Smith
  2009-06-26 12:16 ` [PATCH 2/2][resend] tcpdump 4.0.0-r2: remove extra ${sbindir}/tcpdump.4.0.0 Michael Smith
  2009-06-26 12:54 ` [PATCH 1/2][resend] tcpdump: fix mix of tabs and spaces Phil Blundell
  0 siblings, 2 replies; 4+ messages in thread
From: Michael Smith @ 2009-06-26 12:16 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 recipes/tcpdump/tcpdump_3.9.7.bb |   10 ++++++----
 recipes/tcpdump/tcpdump_4.0.0.bb |   16 +++++++++-------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/recipes/tcpdump/tcpdump_3.9.7.bb b/recipes/tcpdump/tcpdump_3.9.7.bb
index ba9710d..163d74f 100644
--- a/recipes/tcpdump/tcpdump_3.9.7.bb
+++ b/recipes/tcpdump/tcpdump_3.9.7.bb
@@ -5,8 +5,10 @@ SECTION = "console/network"
 PRIORITY = "optional"
 DEPENDS = "libpcap"
 
-SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
-           file://tcpdump_configure_no_-O2.patch;patch=1"
+SRC_URI = " \
+	http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
+	file://tcpdump_configure_no_-O2.patch;patch=1 \
+"
 
 inherit autotools
 
@@ -15,6 +17,6 @@ EXTRA_OECONF = "--without-crypto"
 do_configure() {
 	gnu-configize
 	oe_runconf
-        sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile
-        sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile
+	sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile
+	sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile
 }
diff --git a/recipes/tcpdump/tcpdump_4.0.0.bb b/recipes/tcpdump/tcpdump_4.0.0.bb
index 537cb36..7f99220 100644
--- a/recipes/tcpdump/tcpdump_4.0.0.bb
+++ b/recipes/tcpdump/tcpdump_4.0.0.bb
@@ -6,10 +6,12 @@ PRIORITY = "optional"
 DEPENDS = "libpcap"
 PR = "r1"
 
-SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
-           file://tcpdump_configure_no_-O2.patch;patch=1 \
-           file://no-ipv6-tcpdump4.patch;patch=1 \
-           file://0001-minimal-IEEE802.15.4-allowed.patch;patch=1"
+SRC_URI = " \
+	http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
+	file://tcpdump_configure_no_-O2.patch;patch=1 \
+	file://no-ipv6-tcpdump4.patch;patch=1 \
+	file://0001-minimal-IEEE802.15.4-allowed.patch;patch=1 \
+"
 
 inherit autotools
 # ac_cv_linux_vers=${ac_cv_linux_vers=2}
@@ -18,8 +20,8 @@ EXTRA_OECONF = "--without-crypto"
 
 do_configure() {
 	gnu-configize
-    autoconf
+	autoconf
 	oe_runconf
-        sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile
-        sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile
+	sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile
+	sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile
 }
-- 
1.6.3




^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH 2/2][resend] tcpdump 4.0.0-r2: remove extra ${sbindir}/tcpdump.4.0.0
  2009-06-26 12:16 [PATCH 1/2][resend] tcpdump: fix mix of tabs and spaces Michael Smith
@ 2009-06-26 12:16 ` Michael Smith
  2009-06-26 12:54   ` Phil Blundell
  2009-06-26 12:54 ` [PATCH 1/2][resend] tcpdump: fix mix of tabs and spaces Phil Blundell
  1 sibling, 1 reply; 4+ messages in thread
From: Michael Smith @ 2009-06-26 12:16 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 recipes/tcpdump/tcpdump_4.0.0.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/recipes/tcpdump/tcpdump_4.0.0.bb b/recipes/tcpdump/tcpdump_4.0.0.bb
index 7f99220..f36cc0a 100644
--- a/recipes/tcpdump/tcpdump_4.0.0.bb
+++ b/recipes/tcpdump/tcpdump_4.0.0.bb
@@ -4,7 +4,7 @@ LICENSE = "BSD"
 SECTION = "console/network"
 PRIORITY = "optional"
 DEPENDS = "libpcap"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = " \
 	http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
@@ -25,3 +25,8 @@ do_configure() {
 	sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile
 	sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile
 }
+
+do_install_append() {
+	# tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0
+	rm -f ${D}${sbindir}/tcpdump.${PV}
+}
-- 
1.6.3




^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH 1/2][resend] tcpdump: fix mix of tabs and spaces
  2009-06-26 12:16 [PATCH 1/2][resend] tcpdump: fix mix of tabs and spaces Michael Smith
  2009-06-26 12:16 ` [PATCH 2/2][resend] tcpdump 4.0.0-r2: remove extra ${sbindir}/tcpdump.4.0.0 Michael Smith
@ 2009-06-26 12:54 ` Phil Blundell
  1 sibling, 0 replies; 4+ messages in thread
From: Phil Blundell @ 2009-06-26 12:54 UTC (permalink / raw)
  To: openembedded-devel

Thanks for the patch.  I checked this in.

p.

On Fri, 2009-06-26 at 08:16 -0400, Michael Smith wrote:
> Signed-off-by: Michael Smith <msmith@cbnco.com>
> ---
>  recipes/tcpdump/tcpdump_3.9.7.bb |   10 ++++++----
>  recipes/tcpdump/tcpdump_4.0.0.bb |   16 +++++++++-------
>  2 files changed, 15 insertions(+), 11 deletions(-)
> 
> diff --git a/recipes/tcpdump/tcpdump_3.9.7.bb b/recipes/tcpdump/tcpdump_3.9.7.bb
> index ba9710d..163d74f 100644
> --- a/recipes/tcpdump/tcpdump_3.9.7.bb
> +++ b/recipes/tcpdump/tcpdump_3.9.7.bb
> @@ -5,8 +5,10 @@ SECTION = "console/network"
>  PRIORITY = "optional"
>  DEPENDS = "libpcap"
>  
> -SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
> -           file://tcpdump_configure_no_-O2.patch;patch=1"
> +SRC_URI = " \
> +	http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
> +	file://tcpdump_configure_no_-O2.patch;patch=1 \
> +"
>  
>  inherit autotools
>  
> @@ -15,6 +17,6 @@ EXTRA_OECONF = "--without-crypto"
>  do_configure() {
>  	gnu-configize
>  	oe_runconf
> -        sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile
> -        sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile
> +	sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile
> +	sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile
>  }
> diff --git a/recipes/tcpdump/tcpdump_4.0.0.bb b/recipes/tcpdump/tcpdump_4.0.0.bb
> index 537cb36..7f99220 100644
> --- a/recipes/tcpdump/tcpdump_4.0.0.bb
> +++ b/recipes/tcpdump/tcpdump_4.0.0.bb
> @@ -6,10 +6,12 @@ PRIORITY = "optional"
>  DEPENDS = "libpcap"
>  PR = "r1"
>  
> -SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
> -           file://tcpdump_configure_no_-O2.patch;patch=1 \
> -           file://no-ipv6-tcpdump4.patch;patch=1 \
> -           file://0001-minimal-IEEE802.15.4-allowed.patch;patch=1"
> +SRC_URI = " \
> +	http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
> +	file://tcpdump_configure_no_-O2.patch;patch=1 \
> +	file://no-ipv6-tcpdump4.patch;patch=1 \
> +	file://0001-minimal-IEEE802.15.4-allowed.patch;patch=1 \
> +"
>  
>  inherit autotools
>  # ac_cv_linux_vers=${ac_cv_linux_vers=2}
> @@ -18,8 +20,8 @@ EXTRA_OECONF = "--without-crypto"
>  
>  do_configure() {
>  	gnu-configize
> -    autoconf
> +	autoconf
>  	oe_runconf
> -        sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile
> -        sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile
> +	sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile
> +	sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile
>  }




^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH 2/2][resend] tcpdump 4.0.0-r2: remove extra ${sbindir}/tcpdump.4.0.0
  2009-06-26 12:16 ` [PATCH 2/2][resend] tcpdump 4.0.0-r2: remove extra ${sbindir}/tcpdump.4.0.0 Michael Smith
@ 2009-06-26 12:54   ` Phil Blundell
  0 siblings, 0 replies; 4+ messages in thread
From: Phil Blundell @ 2009-06-26 12:54 UTC (permalink / raw)
  To: openembedded-devel

Thanks for the patch.  I checked this in.

p.

On Fri, 2009-06-26 at 08:16 -0400, Michael Smith wrote:
> Signed-off-by: Michael Smith <msmith@cbnco.com>
> ---
>  recipes/tcpdump/tcpdump_4.0.0.bb |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletions(-)
> 
> diff --git a/recipes/tcpdump/tcpdump_4.0.0.bb b/recipes/tcpdump/tcpdump_4.0.0.bb
> index 7f99220..f36cc0a 100644
> --- a/recipes/tcpdump/tcpdump_4.0.0.bb
> +++ b/recipes/tcpdump/tcpdump_4.0.0.bb
> @@ -4,7 +4,7 @@ LICENSE = "BSD"
>  SECTION = "console/network"
>  PRIORITY = "optional"
>  DEPENDS = "libpcap"
> -PR = "r1"
> +PR = "r2"
>  
>  SRC_URI = " \
>  	http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
> @@ -25,3 +25,8 @@ do_configure() {
>  	sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile
>  	sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile
>  }
> +
> +do_install_append() {
> +	# tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0
> +	rm -f ${D}${sbindir}/tcpdump.${PV}
> +}




^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-06-26 13:05 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-26 12:16 [PATCH 1/2][resend] tcpdump: fix mix of tabs and spaces Michael Smith
2009-06-26 12:16 ` [PATCH 2/2][resend] tcpdump 4.0.0-r2: remove extra ${sbindir}/tcpdump.4.0.0 Michael Smith
2009-06-26 12:54   ` Phil Blundell
2009-06-26 12:54 ` [PATCH 1/2][resend] tcpdump: fix mix of tabs and spaces Phil Blundell

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.