[PATCH 1/2] tcpdump: fix mix of tabs and spaces in do_configure()

[PATCH 1/2] tcpdump: fix mix of tabs and spaces in do_configure()

[Michael Smith]

I randomly picked tabs.

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

diff --git a/recipes/tcpdump/tcpdump_3.9.7.bb b/recipes/tcpdump/tcpdump_3.9.7.bb
index ba9710d..962663f 100644
--- a/recipes/tcpdump/tcpdump_3.9.7.bb
+++ b/recipes/tcpdump/tcpdump_3.9.7.bb
@@ -15,6 +15,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..c807fb1 100644
--- a/recipes/tcpdump/tcpdump_4.0.0.bb
+++ b/recipes/tcpdump/tcpdump_4.0.0.bb
@@ -18,8 +18,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.5.6.5

[PATCH 2/2] tcpdump 4.0.0-r2: remove extra ${sbindir}/tcpdump.4.0.0

[Michael Smith]

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 c807fb1..a9e8a0d 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 \
            file://tcpdump_configure_no_-O2.patch;patch=1 \
@@ -23,3 +23,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.5.6.5

Re: [PATCH 1/2] tcpdump: fix mix of tabs and spaces in do_configure()

[Denys Dmytriyenko]

On Thu, May 28, 2009 at 02:23:32PM -0400, Michael Smith wrote:
> I randomly picked tabs.
> 
> Signed-off-by: Michael Smith <msmith@cbnco.com>

I'm not sure this kind of cleanup requires patch review...

> ---
>  recipes/tcpdump/tcpdump_3.9.7.bb |    4 ++--
>  recipes/tcpdump/tcpdump_4.0.0.bb |    6 +++---
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/recipes/tcpdump/tcpdump_3.9.7.bb b/recipes/tcpdump/tcpdump_3.9.7.bb
> index ba9710d..962663f 100644
> --- a/recipes/tcpdump/tcpdump_3.9.7.bb
> +++ b/recipes/tcpdump/tcpdump_3.9.7.bb
> @@ -15,6 +15,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..c807fb1 100644
> --- a/recipes/tcpdump/tcpdump_4.0.0.bb
> +++ b/recipes/tcpdump/tcpdump_4.0.0.bb
> @@ -18,8 +18,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.5.6.5
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: [PATCH 1/2] tcpdump: fix mix of tabs and spaces in do_configure()

[Philip Balister]

[-- Attachment #1: Type: text/plain, Size: 2233 bytes --]

Denys Dmytriyenko wrote:
> On Thu, May 28, 2009 at 02:23:32PM -0400, Michael Smith wrote:
>> I randomly picked tabs.
>>
>> Signed-off-by: Michael Smith <msmith@cbnco.com>
> 
> I'm not sure this kind of cleanup requires patch review...

It doesn't look like Michael has commit access. I did try applying it, 
and git-am said there was a mix of tabs and spaces.

Do we prefer tabs or spaces in bb files?

Philip

> 
>> ---
>>  recipes/tcpdump/tcpdump_3.9.7.bb |    4 ++--
>>  recipes/tcpdump/tcpdump_4.0.0.bb |    6 +++---
>>  2 files changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/recipes/tcpdump/tcpdump_3.9.7.bb b/recipes/tcpdump/tcpdump_3.9.7.bb
>> index ba9710d..962663f 100644
>> --- a/recipes/tcpdump/tcpdump_3.9.7.bb
>> +++ b/recipes/tcpdump/tcpdump_3.9.7.bb
>> @@ -15,6 +15,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..c807fb1 100644
>> --- a/recipes/tcpdump/tcpdump_4.0.0.bb
>> +++ b/recipes/tcpdump/tcpdump_4.0.0.bb
>> @@ -18,8 +18,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.5.6.5
>>
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> 

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/x-pkcs7-signature, Size: 3303 bytes --]

Re: [PATCH 1/2] tcpdump: fix mix of tabs and spaces in do_configure()

[Michael Smith]

Philip Balister wrote:

> It doesn't look like Michael has commit access. I did try applying it, 
> and git-am said there was a mix of tabs and spaces.

Yes, the SRC_URI lines were lined up with spaces. It looked nice enough 
that I didn't fix it; but there was a line in the do_configure() script 
that was actually 4 spaces off from the rest, and the OCD in me couldn't 
take it. :)

Path of least resistance seems to be tabs, if that's the default for 
most editors. The Wiki just says to avoid mixing them in the same file.

Mike

Re: [PATCH 1/2] tcpdump: fix mix of tabs and spaces in do_configure()

[Michael Smith]

Michael Smith <msmith <at> cbnco.com> writes:

> Philip Balister wrote:
> > It doesn't look like Michael has commit access. I did try applying it, 
> > and git-am said there was a mix of tabs and spaces.

> Yes, the SRC_URI lines were lined up with spaces. It looked nice enough 
> that I didn't fix it;

Hi Philip,

How can I get git am to warn about the mixing? I tried git am
--whitespace=error-all on the mbox file from patchwork, but it doesn't seem to
find a mix; actually, in the patch files there are no added lines with spaces,
only removed lines and a context line.

Mike

Re: [PATCH 1/2] tcpdump: fix mix of tabs and spaces in do_configure()

[Koen Kooi]

On 30-05-09 21:44, Michael Smith wrote:
> Michael Smith<msmith<at>  cbnco.com>  writes:
>
>> Philip Balister wrote:
>>> It doesn't look like Michael has commit access. I did try applying it,
>>> and git-am said there was a mix of tabs and spaces.
>
>> Yes, the SRC_URI lines were lined up with spaces. It looked nice enough
>> that I didn't fix it;
>
> Hi Philip,
>
> How can I get git am to warn about the mixing? I tried git am
> --whitespace=error-all on the mbox file from patchwork, but it doesn't seem to
> find a mix; actually, in the patch files there are no added lines with spaces,
> only removed lines and a context line.

Ignore git-am "errors" about whitespace. If I add a patch to a recipe 
and do git format-patch in that commit (so you get a patch in a patch) 
git-am will scream bloody murder for something that has no actual 
whitespace errors.
I suspect that the only time you can trust git output is when your name 
is Linus and work on kernel code.

regards,

Koen

Re: [PATCH 1/2] tcpdump: fix mix of tabs and spaces in do_configure()

[Otavio Salvador]

Hello Koen,

On Sat, May 30, 2009 at 6:15 PM, Koen Kooi <k.kooi@student.utwente.nl> wrote:
> Ignore git-am "errors" about whitespace. If I add a patch to a recipe and do
> git format-patch in that commit (so you get a patch in a patch) git-am will
> scream bloody murder for something that has no actual whitespace errors.
> I suspect that the only time you can trust git output is when your name is
> Linus and work on kernel code.

Well, not 100% true.

Basically when you're adding patch files this is really possible to
have warnings that cannot be solved, mostly because the patch itself
also has context of the code on it. However, in case those warnings
come from your bb files, classes, conf, ini or whatever, it would be
nice to be checked and fixed before pushing it.

-- 
Otavio Salvador                  O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br

[PATCH] tcpdump: fix mix of tabs and spaces

[Michael Smith]

Signed-off-by: Michael Smith <msmith@cbnco.com>
---

Resend. Got rid of all space indents in the file, so this time hopefully
git am won't complain :)

 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

[PATCH] tcpdump 4.0.0-r2: remove extra ${sbindir}/tcpdump.4.0.0

[Michael Smith]

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