tcpdump: fix mix of tabs and spaces
PATCH RESEND 1/2 tcpdump: fix mix of tabs and spaces
Signed-off-by Michael Smith <[email protected]>
--- recipes/tcpdump/tcpdump_3.9.7.bb | 10 ++++++---- recipes/tcpdump/tcpdump_4.0.0.bb | 16 +++++++++------- 2 files changed, 15 insertions(+), 11 deletions(-)
recipes/tcpdump/tcpdump_3.9.7.bb +6 -4
@@ -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 }
recipes/tcpdump/tcpdump_4.0.0.bb +9 -7
@@ -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 }
Signature · 1 line
1.6.3
PATCH RESEND 2/2 tcpdump 4.0.0-r2: remove extra ${sbindir}/tcpdump.4.0.0
Signed-off-by Michael Smith <[email protected]>
--- recipes/tcpdump/tcpdump_4.0.0.bb | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
recipes/tcpdump/tcpdump_4.0.0.bb +6 -1
@@ -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} +}
Signature · 1 line
1.6.3
Re: [PATCH 2/2][resend] tcpdump 4.0.0-r2: remove extra ${sbindir}/tcpdump.4.0.0
Thanks for the patch. I checked this in.
p.
Quoted 27 lines · Michael Smith
Signed-off-by Michael Smith <[email protected]>--- recipes/tcpdump/tcpdump_4.0.0.bb | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)recipes/tcpdump/tcpdump_4.0.0.bb +6
-1@@ -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} +}
Thanks for the patch. I checked this in.
p.
Quoted 65 lines · Michael Smith
Signed-off-by Michael Smith <[email protected]>--- recipes/tcpdump/tcpdump_3.9.7.bb | 10 ++++++---- recipes/tcpdump/tcpdump_4.0.0.bb | 16 +++++++++------- 2 files changed, 15 insertions(+), 11 deletions(-)recipes/tcpdump/tcpdump_3.9.7.bb +6
-4@@ -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 }recipes/tcpdump/tcpdump_4.0.0.bb +9
-7@@ -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 }