summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-support
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-networking/recipes-support
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-networking/recipes-support')
-rw-r--r--meta-networking/recipes-support/aoetools/aoetools_34.bb2
-rw-r--r--meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb12
-rw-r--r--meta-networking/recipes-support/cifs/cifs-utils_git.bb6
-rw-r--r--meta-networking/recipes-support/macchanger/macchanger_1.5.0.bb10
-rw-r--r--meta-networking/recipes-support/ndisc6/ndisc6_1.0.2.bb36
-rw-r--r--meta-networking/recipes-support/netcat/netcat-openbsd_1.89.bb12
-rw-r--r--meta-networking/recipes-support/netcat/netcat_0.7.1.bb6
-rw-r--r--meta-networking/recipes-support/netperf/netperf_2.6.0.bb44
-rw-r--r--meta-networking/recipes-support/nis/nis.inc2
-rw-r--r--meta-networking/recipes-support/nis/yp-tools_2.12.bb4
-rw-r--r--meta-networking/recipes-support/ntp/ntp.inc64
-rw-r--r--meta-networking/recipes-support/traceroute/traceroute_2.0.18.bb2
-rw-r--r--meta-networking/recipes-support/tunctl/tunctl.inc6
13 files changed, 103 insertions, 103 deletions
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
21EXTRA_OEMAKE = "" 21EXTRA_OEMAKE = ""
22 22
23do_install() { 23do_install() {
24 oe_runmake DESTDIR=${D} install 24 oe_runmake DESTDIR=${D} install
25} 25}
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"
9 9
10LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" 10LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
11SRC_URI = " \ 11SRC_URI = " \
12 ${SOURCEFORGE_MIRROR}/ebtables/arptables-v${PV}.tar.gz;name=arptables \ 12 ${SOURCEFORGE_MIRROR}/ebtables/arptables-v${PV}.tar.gz;name=arptables \
13 file://arptables-compile-install.patch \ 13 file://arptables-compile-install.patch \
14 file://arptables-init-busybox.patch \ 14 file://arptables-init-busybox.patch \
15 " 15"
16SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5" 16SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5"
17SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928" 17SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928"
18 18
19S = "${WORKDIR}/arptables-v${PV}" 19S = "${WORKDIR}/arptables-v${PV}"
20 20
21do_compile () { 21do_compile () {
22 oe_runmake 22 oe_runmake
23} 23}
24 24
25# the install target is not multi-job safe, but it doesn't do much 25# the install target is not multi-job safe, but it doesn't do much
@@ -28,5 +28,5 @@ do_compile () {
28PARALLEL_MAKEINST = "-j1" 28PARALLEL_MAKEINST = "-j1"
29 29
30fakeroot do_install () { 30fakeroot do_install () {
31 oe_runmake 'BINDIR=${sbindir}' 'MANDIR=${mandir}/' 'DESTDIR=${D}' install 31 oe_runmake 'BINDIR=${sbindir}' 'MANDIR=${mandir}/' 'DESTDIR=${D}' install
32} 32}
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"
14inherit autotools 14inherit autotools
15 15
16do_install_append() { 16do_install_append() {
17 # Remove empty /usr/bin and /usr/sbin directories since the mount helper 17 # Remove empty /usr/bin and /usr/sbin directories since the mount helper
18 # is installed to /sbin 18 # is installed to /sbin
19 rmdir ${D}${bindir} ${D}${sbindir} 19 rmdir ${D}${bindir} ${D}${sbindir}
20} 20}
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"
12SRC_URI[sha256sum] = "d44bfa27cb29c5a718627cb3ef3aa42eb5130426545eb2031120826cd73fa8fe" 12SRC_URI[sha256sum] = "d44bfa27cb29c5a718627cb3ef3aa42eb5130426545eb2031120826cd73fa8fe"
13 13
14FILES_${PN} = " \ 14FILES_${PN} = " \
15 ${bindir}/${PN} \ 15 ${bindir}/${PN} \
16 ${datadir}/${PN}/wireless.list \ 16 ${datadir}/${PN}/wireless.list \
17 ${datadir}/${PN}/OUI.list \ 17 ${datadir}/${PN}/OUI.list \
18" 18"
19 19
20FILES_${PN}-doc = " \ 20FILES_${PN}-doc = " \
21 ${datadir}/info \ 21 ${datadir}/info \
22 ${datadir}/man \ 22 ${datadir}/man \
23" 23"
24 24
25inherit autotools 25inherit 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"
11RDEPENDS_${PN}-tracert6 = "${PN}-rltraceroute6" 11RDEPENDS_${PN}-tracert6 = "${PN}-rltraceroute6"
12 12
13SRC_URI = "http://www.remlab.net/files/ndisc6/ndisc6-${PV}.tar.bz2 \ 13SRC_URI = "http://www.remlab.net/files/ndisc6/ndisc6-${PV}.tar.bz2 \
14 " 14"
15SRC_URI[md5sum] = "50cb4c19606cf6ff2b7388e71832f579" 15SRC_URI[md5sum] = "50cb4c19606cf6ff2b7388e71832f579"
16SRC_URI[sha256sum] = "6acec8a0cb9efa3ac98456f46c3016aeec0598b0c7557c95242b5228ad62ca7a" 16SRC_URI[sha256sum] = "6acec8a0cb9efa3ac98456f46c3016aeec0598b0c7557c95242b5228ad62ca7a"
17 17
@@ -22,25 +22,25 @@ inherit autotools gettext
22# Split into seperate packages since we normal don't want them all 22# Split into seperate packages since we normal don't want them all
23# The main package is left empty and therefore not created. 23# The main package is left empty and therefore not created.
24PACKAGES += "${PN}-ndisc6 ${PN}-tcpspray6 ${PN}-rdisc6 \ 24PACKAGES += "${PN}-ndisc6 ${PN}-tcpspray6 ${PN}-rdisc6 \
25 ${PN}-tcptraceroute6 ${PN}-rltraceroute6 \ 25 ${PN}-tcptraceroute6 ${PN}-rltraceroute6 \
26 ${PN}-tracert6 ${PN}-rdnssd ${PN}-misc" 26 ${PN}-tracert6 ${PN}-rdnssd ${PN}-misc"
27FILES_${PN} = "" 27FILES_${PN} = ""
28FILES_${PN}-ndisc6 = "${bindir}/ndisc6" 28FILES_${PN}-ndisc6 = "${bindir}/ndisc6"
29FILES_${PN}-tcpspray6 = "${bindir}/tcpspray6" 29FILES_${PN}-tcpspray6 = "${bindir}/tcpspray6"
30FILES_${PN}-rdisc6 = "${bindir}/rdisc6" 30FILES_${PN}-rdisc6 = "${bindir}/rdisc6"
31FILES_${PN}-tcptraceroute6 = "${bindir}/tcptraceroute6" 31FILES_${PN}-tcptraceroute6 = "${bindir}/tcptraceroute6"
32FILES_${PN}-rltraceroute6 = "${bindir}/rltraceroute6" 32FILES_${PN}-rltraceroute6 = "${bindir}/rltraceroute6"
33FILES_${PN}-tracert6 = "${bindir}/tracert6" 33FILES_${PN}-tracert6 = "${bindir}/tracert6"
34FILES_${PN}-rdnssd = "${sbindir}/rdnssd ${sysconfdir}/rdnssd" 34FILES_${PN}-rdnssd = "${sbindir}/rdnssd ${sysconfdir}/rdnssd"
35FILES_${PN}-misc = "${bindir}/dnssort ${bindir}/name2addr ${bindir}/tcpspray ${bindir}/addr2name" 35FILES_${PN}-misc = "${bindir}/dnssort ${bindir}/name2addr ${bindir}/tcpspray ${bindir}/addr2name"
36 36
37DESCRIPTION_${PN}-ndisc6 = "ICMPv6 Neighbor Discovery tool. \ 37DESCRIPTION_${PN}-ndisc6 = "ICMPv6 Neighbor Discovery tool. \
38Performs IPv6 neighbor discovery in userland. Replaces arping from the \ 38Performs IPv6 neighbor discovery in userland. Replaces arping from the \
39IPv4 world." 39IPv4 world."
40DESCRIPTION_${PN}-rdisc6 = "ICMPv6 Router Discovery tool. \ 40DESCRIPTION_${PN}-rdisc6 = "ICMPv6 Router Discovery tool. \
41Queries IPv6 routers on the network for advertised prefixes. Can be used \ 41Queries IPv6 routers on the network for advertised prefixes. Can be used \
42to detect rogue IPv6 routers, monitor legitimate IPv6 routers." 42to detect rogue IPv6 routers, monitor legitimate IPv6 routers."
43DESCRITPION_${PN}-tcpspray6 = "Performs bandwidth measurements of TCP \ 43DESCRITPION_${PN}-tcpspray6 = "Performs bandwidth measurements of TCP \
44sessions between the local system and a remote echo server in either IPv6 \ 44sessions between the local system and a remote echo server in either IPv6 \
45or IPv4." 45or IPv4."
46 46
@@ -48,15 +48,15 @@ DESCRITPION_${PN}-rdnssd = "Daemon to autoconfigure the list of DNS \
48servers through slateless IPv6 autoconfiguration." 48servers through slateless IPv6 autoconfiguration."
49 49
50do_install_append () { 50do_install_append () {
51 rm -rf ${D}${localstatedir} 51 rm -rf ${D}${localstatedir}
52} 52}
53# Enable SUID bit for applications that need it 53# Enable SUID bit for applications that need it
54pkg_postinst_${PN}-rltraceroute6 () { 54pkg_postinst_${PN}-rltraceroute6 () {
55 chmod 4555 ${bindir}/rltraceroute6 55 chmod 4555 ${bindir}/rltraceroute6
56} 56}
57pkg_postinst_${PN}-ndisc6 () { 57pkg_postinst_${PN}-ndisc6 () {
58 chmod 4555 ${bindir}/ndisc6 58 chmod 4555 ${bindir}/ndisc6
59} 59}
60pkg_postinst_${PN}-rdisc6 () { 60pkg_postinst_${PN}-rdisc6 () {
61 chmod 4555 ${bindir}/rdisc6 61 chmod 4555 ${bindir}/rdisc6
62} 62}
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"
19do_configure[noexec] = "1" 19do_configure[noexec] = "1"
20 20
21do_compile() { 21do_compile() {
22 cd ${S} 22 cd ${S}
23 while read line; do patch -p1 <debian/patches/$line; done <debian/patches/series 23 while read line; do patch -p1 <debian/patches/$line; done <debian/patches/series
24 pkgrel=4 24 pkgrel=4
25 oe_runmake CFLAGS="$CFLAGS -DDEBIAN_VERSION=\"\\\"${pkgrel}\\\"\"" 25 oe_runmake CFLAGS="$CFLAGS -DDEBIAN_VERSION=\"\\\"${pkgrel}\\\"\""
26} 26}
27 27
28do_install() { 28do_install() {
29 install -d ${D}${bindir} 29 install -d ${D}${bindir}
30 install -m 755 ${S}/nc ${D}${bindir}/nc.${BPN} 30 install -m 755 ${S}/nc ${D}${bindir}/nc.${BPN}
31} 31}
32ALTERNATIVE_PRIORITY = "50" 32ALTERNATIVE_PRIORITY = "50"
diff --git a/meta-networking/recipes-support/netcat/netcat_0.7.1.bb b/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
index 2d98122be6..a4805a4c3c 100644
--- a/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
+++ b/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
@@ -8,7 +8,7 @@ PR = "r3"
8 8
9SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2 \ 9SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2 \
10 file://obsolete_autoconf_macros.patch \ 10 file://obsolete_autoconf_macros.patch \
11 " 11"
12 12
13SRC_URI[md5sum] = "0a29eff1736ddb5effd0b1ec1f6fe0ef" 13SRC_URI[md5sum] = "0a29eff1736ddb5effd0b1ec1f6fe0ef"
14SRC_URI[sha256sum] = "b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb" 14SRC_URI[sha256sum] = "b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb"
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df0967
16inherit autotools 16inherit autotools
17 17
18do_install_append() { 18do_install_append() {
19 install -d ${D}${bindir} 19 install -d ${D}${bindir}
20 mv ${D}${bindir}/nc ${D}${bindir}/nc.${BPN} 20 mv ${D}${bindir}/nc ${D}${bindir}/nc.${BPN}
21} 21}
22ALTERNATIVE_PRIORITY = "100" 22ALTERNATIVE_PRIORITY = "100"
diff --git a/meta-networking/recipes-support/netperf/netperf_2.6.0.bb b/meta-networking/recipes-support/netperf/netperf_2.6.0.bb
index 7b78840605..eda78599c1 100644
--- a/meta-networking/recipes-support/netperf/netperf_2.6.0.bb
+++ b/meta-networking/recipes-support/netperf/netperf_2.6.0.bb
@@ -26,31 +26,31 @@ CFLAGS_append = " -DDO_UNIX -DDO_IPV6 -D_GNU_SOURCE"
26# autotools.bbclass attends to include m4 files with path depth <= 2 by 26# autotools.bbclass attends to include m4 files with path depth <= 2 by
27# "find ${S} -maxdepth 2 -name \*.m4", so move m4 files from m4/m4. 27# "find ${S} -maxdepth 2 -name \*.m4", so move m4 files from m4/m4.
28do_configure_prepend() { 28do_configure_prepend() {
29 test -d m4/m4 && mv -f m4/m4 m4-files 29 test -d m4/m4 && mv -f m4/m4 m4-files
30} 30}
31 31
32do_install() { 32do_install() {
33 sed -e 's#/usr/sbin/#${sbindir}/#g' -i ${WORKDIR}/init 33 sed -e 's#/usr/sbin/#${sbindir}/#g' -i ${WORKDIR}/init
34 34
35 install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d 35 install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d
36 install -m 4755 src/netperf ${D}${bindir} 36 install -m 4755 src/netperf ${D}${bindir}
37 install -m 4755 src/netserver ${D}${sbindir} 37 install -m 4755 src/netserver ${D}${sbindir}
38 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/netperf 38 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/netperf
39 39
40 # man 40 # man
41 install -d ${D}${mandir}/man1/ 41 install -d ${D}${mandir}/man1/
42 install -m 0644 doc/netserver.man ${D}${mandir}/man1/netserver.1 42 install -m 0644 doc/netserver.man ${D}${mandir}/man1/netserver.1
43 install -m 0644 doc/netperf.man ${D}${mandir}/man1/netperf.1 43 install -m 0644 doc/netperf.man ${D}${mandir}/man1/netperf.1
44 44
45 # move scripts to examples directory 45 # move scripts to examples directory
46 install -d ${D}${docdir}/netperf/examples 46 install -d ${D}${docdir}/netperf/examples
47 install -m 0644 doc/examples/*_script ${D}${docdir}/netperf/examples/ 47 install -m 0644 doc/examples/*_script ${D}${docdir}/netperf/examples/
48 48
49 # docs .. 49 # docs ..
50 install -m 0644 COPYING ${D}${docdir}/netperf 50 install -m 0644 COPYING ${D}${docdir}/netperf
51 install -m 0644 Release_Notes ${D}${docdir}/netperf 51 install -m 0644 Release_Notes ${D}${docdir}/netperf
52 install -m 0644 README ${D}${docdir}/netperf 52 install -m 0644 README ${D}${docdir}/netperf
53 install -m 0644 doc/netperf_old.ps ${D}${docdir}/netperf 53 install -m 0644 doc/netperf_old.ps ${D}${docdir}/netperf
54} 54}
55 55
56INITSCRIPT_NAME="netperf" 56INITSCRIPT_NAME="netperf"
diff --git a/meta-networking/recipes-support/nis/nis.inc b/meta-networking/recipes-support/nis/nis.inc
index f9f5bd1b42..f2eef05d62 100644
--- a/meta-networking/recipes-support/nis/nis.inc
+++ b/meta-networking/recipes-support/nis/nis.inc
@@ -18,7 +18,7 @@ inherit autotools gettext
18# a security problem (and this fix to the build problem is *much* 18# a security problem (and this fix to the build problem is *much*
19# easier and more maintainable.) 19# easier and more maintainable.)
20do_install() { 20do_install() {
21 oe_runmake 'DESTDIR=${D}' install-strip 21 oe_runmake 'DESTDIR=${D}' install-strip
22} 22}
23 23
24# An attempt to build on uclibc will fail, causing annoyance, 24# An attempt to build on uclibc will fail, causing annoyance,
diff --git a/meta-networking/recipes-support/nis/yp-tools_2.12.bb b/meta-networking/recipes-support/nis/yp-tools_2.12.bb
index 8593c6ba43..0017845508 100644
--- a/meta-networking/recipes-support/nis/yp-tools_2.12.bb
+++ b/meta-networking/recipes-support/nis/yp-tools_2.12.bb
@@ -26,6 +26,6 @@ RCONFLICTS_${PN} += "${PN}-systemd"
26SYSTEMD_SERVICE_${PN} = "domainname.service" 26SYSTEMD_SERVICE_${PN} = "domainname.service"
27 27
28do_install_append() { 28do_install_append() {
29 install -d ${D}${systemd_unitdir}/system 29 install -d ${D}${systemd_unitdir}/system
30 install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system 30 install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system
31} 31}
diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc
index 3f53fffa3e..a604b9c53e 100644
--- a/meta-networking/recipes-support/ntp/ntp.inc
+++ b/meta-networking/recipes-support/ntp/ntp.inc
@@ -20,7 +20,7 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
20 file://ntpdate.default \ 20 file://ntpdate.default \
21 file://ntpdate.service \ 21 file://ntpdate.service \
22 file://ntpd.service \ 22 file://ntpd.service \
23 " 23"
24 24
25inherit autotools update-rc.d systemd 25inherit autotools update-rc.d systemd
26 26
@@ -37,27 +37,27 @@ PACKAGECONFIG[openssl] = "--with-openssl-libdir=${STAGING_LIBDIR} \
37 openssl" 37 openssl"
38 38
39do_install_append() { 39do_install_append() {
40 install -d ${D}${sysconfdir}/init.d 40 install -d ${D}${sysconfdir}/init.d
41 install -m 644 ${WORKDIR}/ntp.conf ${D}${sysconfdir} 41 install -m 644 ${WORKDIR}/ntp.conf ${D}${sysconfdir}
42 install -m 755 ${WORKDIR}/ntpd ${D}${sysconfdir}/init.d 42 install -m 755 ${WORKDIR}/ntpd ${D}${sysconfdir}/init.d
43 install -d ${D}${bindir} 43 install -d ${D}${bindir}
44 install -m 755 ${WORKDIR}/ntpdate ${D}${bindir}/ntpdate-sync 44 install -m 755 ${WORKDIR}/ntpdate ${D}${bindir}/ntpdate-sync
45 45
46 # Fix hardcoded paths in scripts 46 # Fix hardcoded paths in scripts
47 sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync 47 sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync
48 sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync 48 sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync
49 sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync 49 sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync
50 sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync 50 sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/ntpd ${D}${bindir}/ntpdate-sync
51 sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${bindir}/ntpdate-sync 51 sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${bindir}/ntpdate-sync
52 52
53 install -d ${D}/${sysconfdir}/default 53 install -d ${D}/${sysconfdir}/default
54 install -m 644 ${WORKDIR}/ntpdate.default ${D}${sysconfdir}/default/ntpdate 54 install -m 644 ${WORKDIR}/ntpdate.default ${D}${sysconfdir}/default/ntpdate
55 install -d ${D}/${sysconfdir}/network/if-up.d 55 install -d ${D}/${sysconfdir}/network/if-up.d
56 ln -s ${bindir}/ntpdate-sync ${D}/${sysconfdir}/network/if-up.d 56 ln -s ${bindir}/ntpdate-sync ${D}/${sysconfdir}/network/if-up.d
57 57
58 install -d ${D}${systemd_unitdir}/system 58 install -d ${D}${systemd_unitdir}/system
59 install -m 0644 ${WORKDIR}/ntpdate.service ${D}${systemd_unitdir}/system/ 59 install -m 0644 ${WORKDIR}/ntpdate.service ${D}${systemd_unitdir}/system/
60 install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/ 60 install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/
61} 61}
62 62
63PACKAGES += "ntpdate ${PN}-tickadj ${PN}-utils" 63PACKAGES += "ntpdate ${PN}-tickadj ${PN}-utils"
@@ -89,10 +89,10 @@ FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd $
89FILES_${PN}-tickadj = "${bindir}/tickadj" 89FILES_${PN}-tickadj = "${bindir}/tickadj"
90FILES_${PN}-utils = "${bindir}" 90FILES_${PN}-utils = "${bindir}"
91FILES_ntpdate = "${bindir}/ntpdate \ 91FILES_ntpdate = "${bindir}/ntpdate \
92 ${sysconfdir}/network/if-up.d/ntpdate-sync \ 92 ${sysconfdir}/network/if-up.d/ntpdate-sync \
93 ${bindir}/ntpdate-sync \ 93 ${bindir}/ntpdate-sync \
94 ${sysconfdir}/default/ntpdate \ 94 ${sysconfdir}/default/ntpdate \
95 ${systemd_unitdir}/system/ntpdate.service \ 95 ${systemd_unitdir}/system/ntpdate.service \
96" 96"
97 97
98CONFFILES_${PN} = "${sysconfdir}/ntp.conf" 98CONFFILES_${PN} = "${sysconfdir}/ntp.conf"
@@ -104,13 +104,13 @@ INITSCRIPT_PARAMS = "defaults"
104 104
105pkg_postinst_ntpdate() { 105pkg_postinst_ntpdate() {
106if test "x$D" != "x"; then 106if test "x$D" != "x"; then
107 exit 1 107 exit 1
108else 108else
109 if ! grep -q -s ntpdate /var/spool/cron/root; then 109 if ! grep -q -s ntpdate /var/spool/cron/root; then
110 echo "adding crontab" 110 echo "adding crontab"
111 test -d /var/spool/cron || mkdir -p /var/spool/cron 111 test -d /var/spool/cron || mkdir -p /var/spool/cron
112 echo "30 * * * * ${bindir}/ntpdate-sync silent" >> /var/spool/cron/root 112 echo "30 * * * * ${bindir}/ntpdate-sync silent" >> /var/spool/cron/root
113 fi 113 fi
114fi 114fi
115} 115}
116 116
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"
16inherit update-alternatives 16inherit update-alternatives
17 17
18SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/traceroute-2.0.18/traceroute-2.0.18.tar.gz \ 18SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/traceroute-2.0.18/traceroute-2.0.18.tar.gz \
19 " 19"
20 20
21SRC_URI[md5sum] = "b7254149b7f081cce07f4b9e065ba5ef" 21SRC_URI[md5sum] = "b7254149b7f081cce07f4b9e065ba5ef"
22SRC_URI[sha256sum] = "5994a88520927fefe3c9754aaf1e02b4d0f3f8fb1f521a68fa86215c3fcab9ef" 22SRC_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
6SRC_URI = "${SOURCEFORGE_MIRROR}/tunctl/tunctl-${PV}.tar.gz" 6SRC_URI = "${SOURCEFORGE_MIRROR}/tunctl/tunctl-${PV}.tar.gz"
7 7
8do_compile() { 8do_compile() {
9 oe_runmake tunctl 9 oe_runmake tunctl
10} 10}
11 11
12do_install() { 12do_install() {
13 install -d ${D}/${sbindir} 13 install -d ${D}/${sbindir}
14 install -m 755 tunctl ${D}/${sbindir} 14 install -m 755 tunctl ${D}/${sbindir}
15} 15}