summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-13 22:49:41 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-15 16:23:17 +0200
commita45830a39bb47a9eab27980d52966226c9504ea4 (patch)
tree001209d9740e8668b2eeeac4212b3561aecebf29 /meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb
parent6f48cf899aed0622f8fb26ffa144656a1143c9c5 (diff)
downloadmeta-openembedded-a45830a39bb47a9eab27980d52966226c9504ea4.tar.gz
recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python tasks). * Some recipes were using tabs. * Some were using 8 spaces. * Some were using mix or different number of spaces. * Make them consistently use 4 spaces everywhere. * Yocto styleguide advises to use tabs (but the only reason to keep tabs is the need to update a lot of recipes). Lately this advice was also merged into the styleguide on the OE wiki. * Using 4 spaces in both types of tasks is better because it's less error prone when someone is not sure if e.g. do_generate_toolchain_file() is Python or shell task and also allows to highlight every tab used in .bb, .inc, .bbappend, .bbclass as potentially bad (shouldn't be used for indenting of multiline variable assignments and cannot be used for Python tasks). * Don't indent closing quote on multiline variables we're quite inconsistent wheater it's first character on line under opening quote or under first non-whitespace character in previous line. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb')
-rw-r--r--meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb34
1 files changed, 17 insertions, 17 deletions
diff --git a/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb b/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb
index d3ca24f3e..1da819412 100644
--- a/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb
+++ b/meta-oe/recipes-support/tcpdump/tcpdump_4.3.0.bb
@@ -6,11 +6,11 @@ SECTION = "console/network"
6DEPENDS = "libpcap" 6DEPENDS = "libpcap"
7 7
8SRC_URI = " \ 8SRC_URI = " \
9 http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ 9 http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
10 file://tcpdump_configure_no_-O2.patch \ 10 file://tcpdump_configure_no_-O2.patch \
11 file://0001-minimal-IEEE802.15.4-allowed.patch \ 11 file://0001-minimal-IEEE802.15.4-allowed.patch \
12 file://ipv6-cross.patch \ 12 file://ipv6-cross.patch \
13 file://configure.patch \ 13 file://configure.patch \
14" 14"
15SRC_URI[md5sum] = "a3fe4d30ac85ff5467c889ff46b7e1e8" 15SRC_URI[md5sum] = "a3fe4d30ac85ff5467c889ff46b7e1e8"
16SRC_URI[sha256sum] = "efd08b610210d39977ec3175fa82dad9fbd33587930081be2a905a712dba4286" 16SRC_URI[sha256sum] = "efd08b610210d39977ec3175fa82dad9fbd33587930081be2a905a712dba4286"
@@ -19,25 +19,25 @@ inherit autotools
19CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}" 19CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}"
20 20
21EXTRA_OECONF = "--without-crypto --disable-rpath \ 21EXTRA_OECONF = "--without-crypto --disable-rpath \
22 ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6', '--disable-ipv6', d)}" 22 ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6', '--disable-ipv6', d)}"
23 23
24EXTRA_AUTORECONF += " -I m4" 24EXTRA_AUTORECONF += " -I m4"
25 25
26do_configure_prepend() { 26do_configure_prepend() {
27 mkdir -p ${S}/m4 27 mkdir -p ${S}/m4
28 if [ -f aclocal.m4 ]; then 28 if [ -f aclocal.m4 ]; then
29 mv aclocal.m4 ${S}/m4 29 mv aclocal.m4 ${S}/m4
30 fi 30 fi
31 # AC_CHECK_LIB(dlpi.. was looking to host /lib 31 # AC_CHECK_LIB(dlpi.. was looking to host /lib
32 sed -i 's:-L/lib::g' ./configure.in 32 sed -i 's:-L/lib::g' ./configure.in
33} 33}
34do_configure_append() { 34do_configure_append() {
35 sed -i 's:-L/usr/lib::' ./Makefile 35 sed -i 's:-L/usr/lib::' ./Makefile
36 sed -i 's:-Wl,-rpath,${STAGING_LIBDIR}::' ./Makefile 36 sed -i 's:-Wl,-rpath,${STAGING_LIBDIR}::' ./Makefile
37 sed -i 's:-I/usr/include::' ./Makefile 37 sed -i 's:-I/usr/include::' ./Makefile
38} 38}
39 39
40do_install_append() { 40do_install_append() {
41 # tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0 41 # tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0
42 rm -f ${D}${sbindir}/tcpdump.${PV} 42 rm -f ${D}${sbindir}/tcpdump.${PV}
43} 43}