From a45830a39bb47a9eab27980d52966226c9504ea4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 13 Apr 2013 22:49:41 +0200 Subject: 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 Acked-by: Koen Kooi --- .../recipes-support/aoetools/aoetools_34.bb | 2 +- .../recipes-support/arptables/arptables_0.0.3-4.bb | 12 ++-- .../recipes-support/cifs/cifs-utils_git.bb | 6 +- .../recipes-support/macchanger/macchanger_1.5.0.bb | 10 ++-- .../recipes-support/ndisc6/ndisc6_1.0.2.bb | 36 ++++++------ .../recipes-support/netcat/netcat-openbsd_1.89.bb | 12 ++-- .../recipes-support/netcat/netcat_0.7.1.bb | 6 +- .../recipes-support/netperf/netperf_2.6.0.bb | 44 +++++++-------- meta-networking/recipes-support/nis/nis.inc | 2 +- .../recipes-support/nis/yp-tools_2.12.bb | 4 +- meta-networking/recipes-support/ntp/ntp.inc | 64 +++++++++++----------- .../traceroute/traceroute_2.0.18.bb | 2 +- meta-networking/recipes-support/tunctl/tunctl.inc | 6 +- 13 files changed, 103 insertions(+), 103 deletions(-) (limited to 'meta-networking/recipes-support') diff --git a/meta-networking/recipes-support/aoetools/aoetools_34.bb b/meta-networking/recipes-support/aoetools/aoetools_34.bb index 68ff4bbd06..cf002984a4 100644 --- a/meta-networking/recipes-support/aoetools/aoetools_34.bb +++ b/meta-networking/recipes-support/aoetools/aoetools_34.bb @@ -21,5 +21,5 @@ SRC_URI[sha256sum] = "fd6c57244e9458d7cbe7a0171295ddee4d8cdcae291e40d6acbc641df7 EXTRA_OEMAKE = "" do_install() { - oe_runmake DESTDIR=${D} install + oe_runmake DESTDIR=${D} install } diff --git a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb b/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb index 86b900a5da..fe14b61e11 100644 --- a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb +++ b/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb @@ -9,17 +9,17 @@ RDEPENDS_${PN} += "perl" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/ebtables/arptables-v${PV}.tar.gz;name=arptables \ - file://arptables-compile-install.patch \ - file://arptables-init-busybox.patch \ - " + ${SOURCEFORGE_MIRROR}/ebtables/arptables-v${PV}.tar.gz;name=arptables \ + file://arptables-compile-install.patch \ + file://arptables-init-busybox.patch \ +" SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5" SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928" S = "${WORKDIR}/arptables-v${PV}" do_compile () { - oe_runmake + oe_runmake } # the install target is not multi-job safe, but it doesn't do much @@ -28,5 +28,5 @@ do_compile () { PARALLEL_MAKEINST = "-j1" fakeroot do_install () { - oe_runmake 'BINDIR=${sbindir}' 'MANDIR=${mandir}/' 'DESTDIR=${D}' install + oe_runmake 'BINDIR=${sbindir}' 'MANDIR=${mandir}/' 'DESTDIR=${D}' install } diff --git a/meta-networking/recipes-support/cifs/cifs-utils_git.bb b/meta-networking/recipes-support/cifs/cifs-utils_git.bb index 53285a1520..19b60ad389 100644 --- a/meta-networking/recipes-support/cifs/cifs-utils_git.bb +++ b/meta-networking/recipes-support/cifs/cifs-utils_git.bb @@ -14,7 +14,7 @@ S = "${WORKDIR}/git" inherit autotools do_install_append() { - # Remove empty /usr/bin and /usr/sbin directories since the mount helper - # is installed to /sbin - rmdir ${D}${bindir} ${D}${sbindir} + # Remove empty /usr/bin and /usr/sbin directories since the mount helper + # is installed to /sbin + rmdir ${D}${bindir} ${D}${sbindir} } diff --git a/meta-networking/recipes-support/macchanger/macchanger_1.5.0.bb b/meta-networking/recipes-support/macchanger/macchanger_1.5.0.bb index 51c4a348cc..ff30558f22 100644 --- a/meta-networking/recipes-support/macchanger/macchanger_1.5.0.bb +++ b/meta-networking/recipes-support/macchanger/macchanger_1.5.0.bb @@ -12,14 +12,14 @@ SRC_URI[md5sum] = "79b7cdaeca3d8ebafa764c4b0dd03ab7" SRC_URI[sha256sum] = "d44bfa27cb29c5a718627cb3ef3aa42eb5130426545eb2031120826cd73fa8fe" FILES_${PN} = " \ - ${bindir}/${PN} \ - ${datadir}/${PN}/wireless.list \ - ${datadir}/${PN}/OUI.list \ + ${bindir}/${PN} \ + ${datadir}/${PN}/wireless.list \ + ${datadir}/${PN}/OUI.list \ " FILES_${PN}-doc = " \ - ${datadir}/info \ - ${datadir}/man \ + ${datadir}/info \ + ${datadir}/man \ " inherit autotools diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.2.bb b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.2.bb index 3920c1a5a0..d753912133 100644 --- a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.2.bb +++ b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.2.bb @@ -11,7 +11,7 @@ RDEPENDS_${PN}-tcptraceroute6 = "${PN}-rltraceroute6" RDEPENDS_${PN}-tracert6 = "${PN}-rltraceroute6" SRC_URI = "http://www.remlab.net/files/ndisc6/ndisc6-${PV}.tar.bz2 \ - " +" SRC_URI[md5sum] = "50cb4c19606cf6ff2b7388e71832f579" SRC_URI[sha256sum] = "6acec8a0cb9efa3ac98456f46c3016aeec0598b0c7557c95242b5228ad62ca7a" @@ -22,25 +22,25 @@ inherit autotools gettext # Split into seperate packages since we normal don't want them all # The main package is left empty and therefore not created. PACKAGES += "${PN}-ndisc6 ${PN}-tcpspray6 ${PN}-rdisc6 \ - ${PN}-tcptraceroute6 ${PN}-rltraceroute6 \ - ${PN}-tracert6 ${PN}-rdnssd ${PN}-misc" -FILES_${PN} = "" -FILES_${PN}-ndisc6 = "${bindir}/ndisc6" -FILES_${PN}-tcpspray6 = "${bindir}/tcpspray6" -FILES_${PN}-rdisc6 = "${bindir}/rdisc6" -FILES_${PN}-tcptraceroute6 = "${bindir}/tcptraceroute6" -FILES_${PN}-rltraceroute6 = "${bindir}/rltraceroute6" -FILES_${PN}-tracert6 = "${bindir}/tracert6" -FILES_${PN}-rdnssd = "${sbindir}/rdnssd ${sysconfdir}/rdnssd" + ${PN}-tcptraceroute6 ${PN}-rltraceroute6 \ + ${PN}-tracert6 ${PN}-rdnssd ${PN}-misc" +FILES_${PN} = "" +FILES_${PN}-ndisc6 = "${bindir}/ndisc6" +FILES_${PN}-tcpspray6 = "${bindir}/tcpspray6" +FILES_${PN}-rdisc6 = "${bindir}/rdisc6" +FILES_${PN}-tcptraceroute6 = "${bindir}/tcptraceroute6" +FILES_${PN}-rltraceroute6 = "${bindir}/rltraceroute6" +FILES_${PN}-tracert6 = "${bindir}/tracert6" +FILES_${PN}-rdnssd = "${sbindir}/rdnssd ${sysconfdir}/rdnssd" FILES_${PN}-misc = "${bindir}/dnssort ${bindir}/name2addr ${bindir}/tcpspray ${bindir}/addr2name" -DESCRIPTION_${PN}-ndisc6 = "ICMPv6 Neighbor Discovery tool. \ +DESCRIPTION_${PN}-ndisc6 = "ICMPv6 Neighbor Discovery tool. \ Performs IPv6 neighbor discovery in userland. Replaces arping from the \ IPv4 world." -DESCRIPTION_${PN}-rdisc6 = "ICMPv6 Router Discovery tool. \ +DESCRIPTION_${PN}-rdisc6 = "ICMPv6 Router Discovery tool. \ Queries IPv6 routers on the network for advertised prefixes. Can be used \ to detect rogue IPv6 routers, monitor legitimate IPv6 routers." -DESCRITPION_${PN}-tcpspray6 = "Performs bandwidth measurements of TCP \ +DESCRITPION_${PN}-tcpspray6 = "Performs bandwidth measurements of TCP \ sessions between the local system and a remote echo server in either IPv6 \ or IPv4." @@ -48,15 +48,15 @@ DESCRITPION_${PN}-rdnssd = "Daemon to autoconfigure the list of DNS \ servers through slateless IPv6 autoconfiguration." do_install_append () { - rm -rf ${D}${localstatedir} + rm -rf ${D}${localstatedir} } # Enable SUID bit for applications that need it pkg_postinst_${PN}-rltraceroute6 () { - chmod 4555 ${bindir}/rltraceroute6 + chmod 4555 ${bindir}/rltraceroute6 } pkg_postinst_${PN}-ndisc6 () { - chmod 4555 ${bindir}/ndisc6 + chmod 4555 ${bindir}/ndisc6 } pkg_postinst_${PN}-rdisc6 () { - chmod 4555 ${bindir}/rdisc6 + chmod 4555 ${bindir}/rdisc6 } diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd_1.89.bb b/meta-networking/recipes-support/netcat/netcat-openbsd_1.89.bb index 00eec3ea02..0a30de6a49 100644 --- a/meta-networking/recipes-support/netcat/netcat-openbsd_1.89.bb +++ b/meta-networking/recipes-support/netcat/netcat-openbsd_1.89.bb @@ -19,14 +19,14 @@ S = "${WORKDIR}/${BPN}-${PV}.orig" do_configure[noexec] = "1" do_compile() { - cd ${S} - while read line; do patch -p1 > /var/spool/cron/root - fi + if ! grep -q -s ntpdate /var/spool/cron/root; then + echo "adding crontab" + test -d /var/spool/cron || mkdir -p /var/spool/cron + echo "30 * * * * ${bindir}/ntpdate-sync silent" >> /var/spool/cron/root + fi fi } diff --git a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb index f52314003b..e6718dbd5d 100644 --- a/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb +++ b/meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb @@ -16,7 +16,7 @@ PR = "r1" inherit update-alternatives SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/traceroute-2.0.18/traceroute-2.0.18.tar.gz \ - " +" SRC_URI[md5sum] = "b7254149b7f081cce07f4b9e065ba5ef" SRC_URI[sha256sum] = "5994a88520927fefe3c9754aaf1e02b4d0f3f8fb1f521a68fa86215c3fcab9ef" diff --git a/meta-networking/recipes-support/tunctl/tunctl.inc b/meta-networking/recipes-support/tunctl/tunctl.inc index 29aed44a41..e95cfa523d 100644 --- a/meta-networking/recipes-support/tunctl/tunctl.inc +++ b/meta-networking/recipes-support/tunctl/tunctl.inc @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://tunctl.c;beginline=1;endline=4;md5=ff3a09996bc5fff6bc SRC_URI = "${SOURCEFORGE_MIRROR}/tunctl/tunctl-${PV}.tar.gz" do_compile() { - oe_runmake tunctl + oe_runmake tunctl } do_install() { - install -d ${D}/${sbindir} - install -m 755 tunctl ${D}/${sbindir} + install -d ${D}/${sbindir} + install -m 755 tunctl ${D}/${sbindir} } -- cgit 1.2.3-korg