summaryrefslogtreecommitdiffstats
path: root/meta-networking
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
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')
-rw-r--r--meta-networking/recipes-connectivity/crda/crda_1.1.3.bb12
-rw-r--r--meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb50
-rw-r--r--meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb8
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb14
-rw-r--r--meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb32
-rw-r--r--meta-networking/recipes-daemons/ptpd/ptpd_2.2.0.bb6
-rw-r--r--meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.36.bb4
-rw-r--r--meta-networking/recipes-daemons/radvd/radvd.inc32
-rw-r--r--meta-networking/recipes-daemons/radvd/radvd_1.9.1.bb2
-rw-r--r--meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb26
-rw-r--r--meta-networking/recipes-daemons/vblade/vblade_20.bb8
-rw-r--r--meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb28
-rw-r--r--meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb34
-rw-r--r--meta-networking/recipes-filter/libmnl/libmnl_1.0.3.bb2
-rw-r--r--meta-networking/recipes-irc/znc/znc_git.bb2
-rw-r--r--meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb2
-rw-r--r--meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb18
-rw-r--r--meta-networking/recipes-protocols/quagga/quagga.inc16
-rw-r--r--meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc26
-rw-r--r--meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb12
-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
33 files changed, 270 insertions, 270 deletions
diff --git a/meta-networking/recipes-connectivity/crda/crda_1.1.3.bb b/meta-networking/recipes-connectivity/crda/crda_1.1.3.bb
index d736c7a2d..dc1fc21cf 100644
--- a/meta-networking/recipes-connectivity/crda/crda_1.1.3.bb
+++ b/meta-networking/recipes-connectivity/crda/crda_1.1.3.bb
@@ -9,7 +9,7 @@ DEPENDS = "python-m2crypto-native python-native libgcrypt libnl"
9 9
10SRC_URI = "http://wireless.kernel.org/download/crda/${P}.tar.bz2;name=crda \ 10SRC_URI = "http://wireless.kernel.org/download/crda/${P}.tar.bz2;name=crda \
11 http://wireless.kernel.org/download/wireless-regdb/regulatory.bins/2013.01.11-regulatory.bin;name=bin \ 11 http://wireless.kernel.org/download/wireless-regdb/regulatory.bins/2013.01.11-regulatory.bin;name=bin \
12 " 12"
13SRC_URI[crda.md5sum] = "29579185e06a75675507527243d28e5c" 13SRC_URI[crda.md5sum] = "29579185e06a75675507527243d28e5c"
14SRC_URI[crda.sha256sum] = "aa8a7fe92f0765986c421a5b6768a185375ac210393df0605ee132f6754825f0" 14SRC_URI[crda.sha256sum] = "aa8a7fe92f0765986c421a5b6768a185375ac210393df0605ee132f6754825f0"
15SRC_URI[bin.md5sum] = "e0c8a5ca63fb8bf803213f9a0c90b50b" 15SRC_URI[bin.md5sum] = "e0c8a5ca63fb8bf803213f9a0c90b50b"
@@ -20,19 +20,19 @@ inherit python-dir pythonnative
20EXTRA_OEMAKE = "MAKEFLAGS= DESTDIR=${D}" 20EXTRA_OEMAKE = "MAKEFLAGS= DESTDIR=${D}"
21 21
22do_compile() { 22do_compile() {
23 oe_runmake all_noverify 23 oe_runmake all_noverify
24} 24}
25 25
26do_install() { 26do_install() {
27 oe_runmake install 27 oe_runmake install
28 28
29 install -d ${D}${libdir}/crda/ 29 install -d ${D}${libdir}/crda/
30 30
31 install -m 0644 ${WORKDIR}/2013.01.11-regulatory.bin ${D}${libdir}/crda/regulatory.bin 31 install -m 0644 ${WORKDIR}/2013.01.11-regulatory.bin ${D}${libdir}/crda/regulatory.bin
32} 32}
33 33
34 34
35RDEPENDS_${PN} = "udev" 35RDEPENDS_${PN} = "udev"
36FILES_${PN} += "${libdir}crda/regulatory.bin \ 36FILES_${PN} += "${libdir}crda/regulatory.bin \
37 ${base_libdir}/udev/rules.d/85-regulatory.rules \ 37 ${base_libdir}/udev/rules.d/85-regulatory.rules \
38 " 38"
diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
index 155befec1..603bf0176 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
@@ -25,40 +25,40 @@ inherit autotools gettext
25 25
26noipv6="${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6 gl_cv_socket_ipv6=no', d)}" 26noipv6="${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6 gl_cv_socket_ipv6=no', d)}"
27EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR} \ 27EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR} \
28 --with-path-procnet-dev=/proc/net/dev \ 28 --with-path-procnet-dev=/proc/net/dev \
29 ${noipv6} \ 29 ${noipv6} \
30 " 30"
31 31
32do_configure_prepend () { 32do_configure_prepend () {
33 export HELP2MAN='true' 33 export HELP2MAN='true'
34 cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}/build-aux/config.rpath 34 cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}/build-aux/config.rpath
35 rm -f ${S}/glob/configure* 35 rm -f ${S}/glob/configure*
36} 36}
37 37
38do_install () { 38do_install () {
39 autotools_do_install 39 autotools_do_install
40 install -d ${D}${base_sbindir} ${D}${base_bindir} 40 install -d ${D}${base_sbindir} ${D}${base_bindir}
41 mv ${D}${bindir}/tftp ${D}${bindir}/tftp.${BPN} 41 mv ${D}${bindir}/tftp ${D}${bindir}/tftp.${BPN}
42 mv ${D}${bindir}/telnet ${D}${bindir}/telnet.${BPN} 42 mv ${D}${bindir}/telnet ${D}${bindir}/telnet.${BPN}
43 mv ${D}${bindir}/logger ${D}${bindir}/logger.${BPN} 43 mv ${D}${bindir}/logger ${D}${bindir}/logger.${BPN}
44 mv ${D}${bindir}/traceroute ${D}${bindir}/traceroute.${BPN} 44 mv ${D}${bindir}/traceroute ${D}${bindir}/traceroute.${BPN}
45 mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${BPN} 45 mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${BPN}
46 mv ${D}${bindir}/ifconfig ${D}${base_sbindir}/ifconfig.${BPN} 46 mv ${D}${bindir}/ifconfig ${D}${base_sbindir}/ifconfig.${BPN}
47} 47}
48 48
49pkg_postinst_${PN} () { 49pkg_postinst_${PN} () {
50 update-alternatives --install ${bindir}/tftp tftp tftp.${BPN} 100 50 update-alternatives --install ${bindir}/tftp tftp tftp.${BPN} 100
51 update-alternatives --install ${bindir}/telnet telnet telnet.${BPN} 100 51 update-alternatives --install ${bindir}/telnet telnet telnet.${BPN} 100
52 update-alternatives --install ${bindir}/logger logger logger.${BPN} 100 52 update-alternatives --install ${bindir}/logger logger logger.${BPN} 100
53 update-alternatives --install ${bindir}/traceroute traceroute traceroute.${BPN} 100 53 update-alternatives --install ${bindir}/traceroute traceroute traceroute.${BPN} 100
54 update-alternatives --install ${base_bindir}/hostname hostname hostname.${BPN} 100 54 update-alternatives --install ${base_bindir}/hostname hostname hostname.${BPN} 100
55 update-alternatives --install ${base_sbindir}/ifconfig ifconfig ifconfig.${BPN} 100 55 update-alternatives --install ${base_sbindir}/ifconfig ifconfig ifconfig.${BPN} 100
56} 56}
57 57
58pkg_prerm_${PN} () { 58pkg_prerm_${PN} () {
59 update-alternatives --remove tftp tftp.${BPN} 59 update-alternatives --remove tftp tftp.${BPN}
60 update-alternatives --remove telnet telnet.${BPN} 60 update-alternatives --remove telnet telnet.${BPN}
61 update-alternatives --remove logger logger.${BPN} 61 update-alternatives --remove logger logger.${BPN}
62 update-alternatives --remove traceroute traceroute.${BPN} 62 update-alternatives --remove traceroute traceroute.${BPN}
63 update-alternatives --remove ifconfig ifconfig.${BPN} 63 update-alternatives --remove ifconfig ifconfig.${BPN}
64} 64}
diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb
index 1b2b8bf66..2ce9530d0 100644
--- a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb
+++ b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb
@@ -12,10 +12,10 @@ CFLAGS_append = ' -DVERSION=\\"${PV}\\"'
12LDFLAGS_append = " -lgcrypt -lgpg-error" 12LDFLAGS_append = " -lgcrypt -lgpg-error"
13 13
14do_install () { 14do_install () {
15 sed -i s:m600:m\ 600:g Makefile 15 sed -i s:m600:m\ 600:g Makefile
16 oe_runmake 'DESTDIR=${D}' 'PREFIX=/usr' install 16 oe_runmake 'DESTDIR=${D}' 'PREFIX=/usr' install
17 rm -f ${D}${sysconfdir}/vpnc/vpnc.conf #This file is useless 17 rm -f ${D}${sysconfdir}/vpnc/vpnc.conf #This file is useless
18 install ${WORKDIR}/default.conf ${D}${sysconfdir}/vpnc/default.conf 18 install ${WORKDIR}/default.conf ${D}${sysconfdir}/vpnc/default.conf
19} 19}
20 20
21CONFFILES_${PN} = "${sysconfdir}/vpnc/default.conf" 21CONFFILES_${PN} = "${sysconfdir}/vpnc/default.conf"
diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
index 8db4378d3..74a4e68e2 100644
--- a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
+++ b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
@@ -59,7 +59,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.bz2 \
59 file://libtirpc-name-clash-backout.patch \ 59 file://libtirpc-name-clash-backout.patch \
60 file://autofs-5.0.7-do-not-check-for-modprobe.patch \ 60 file://autofs-5.0.7-do-not-check-for-modprobe.patch \
61 file://fix_disable_ldap.patch \ 61 file://fix_disable_ldap.patch \
62 " 62"
63 63
64SRC_URI[md5sum] = "bc46838dece83c02d800ff144ed9f431" 64SRC_URI[md5sum] = "bc46838dece83c02d800ff144ed9f431"
65SRC_URI[sha256sum] = "08c4304d8076dc80c14df559bc5fd821b67ef3457b245f61068bd053d8f94ccc" 65SRC_URI[sha256sum] = "08c4304d8076dc80c14df559bc5fd821b67ef3457b245f61068bd053d8f94ccc"
@@ -81,19 +81,19 @@ EXTRA_OECONF += "--disable-mount-locking \
81 --enable-ignore-busy --with-openldap=no \ 81 --enable-ignore-busy --with-openldap=no \
82 --with-sasl=no --with-libtirpc=yes \ 82 --with-sasl=no --with-libtirpc=yes \
83 --with-path=${STAGING_BINDIR_NATIVE} \ 83 --with-path=${STAGING_BINDIR_NATIVE} \
84 " 84"
85CACHED_CONFIGUREVARS = "ac_cv_path_RANLIB=${RANLIB} \ 85CACHED_CONFIGUREVARS = "ac_cv_path_RANLIB=${RANLIB} \
86 ac_cv_path_RPCGEN=rpcgen \ 86 ac_cv_path_RPCGEN=rpcgen \
87 " 87"
88 88
89do_configure_prepend () { 89do_configure_prepend () {
90 if [ ! -e acinclude.m4 ]; then 90 if [ ! -e acinclude.m4 ]; then
91 cp aclocal.m4 acinclude.m4 91 cp aclocal.m4 acinclude.m4
92 fi 92 fi
93} 93}
94 94
95do_install_append () { 95do_install_append () {
96 test -d ${D}/run && rmdir ${D}/run 96 test -d ${D}/run && rmdir ${D}/run
97} 97}
98 98
99INSANE_SKIP_${PN} = "dev-so" 99INSANE_SKIP_${PN} = "dev-so"
diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
index db24b358c..28a735786 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
@@ -12,7 +12,7 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \
12 file://contrib.patch \ 12 file://contrib.patch \
13 file://proftpd-basic.init \ 13 file://proftpd-basic.init \
14 file://default \ 14 file://default \
15 " 15"
16 16
17SRC_URI[md5sum] = "0871e0b93c9c3c88ca950b6d9a04aed2" 17SRC_URI[md5sum] = "0871e0b93c9c3c88ca950b6d9a04aed2"
18SRC_URI[sha256sum] = "9f659585cea90fc6af34a0ffae4a90e4ed37abe92dbd9b6c311f95a436c961cb" 18SRC_URI[sha256sum] = "9f659585cea90fc6af34a0ffae4a90e4ed37abe92dbd9b6c311f95a436c961cb"
@@ -21,32 +21,32 @@ inherit autotools useradd update-rc.d
21 21
22EXTRA_OECONF = "--disable-cap \ 22EXTRA_OECONF = "--disable-cap \
23 --disable-auth-pam \ 23 --disable-auth-pam \
24 " 24"
25 25
26# proftpd uses libltdl which currently makes configuring using 26# proftpd uses libltdl which currently makes configuring using
27# autotools.bbclass a pain... 27# autotools.bbclass a pain...
28do_configure () { 28do_configure () {
29 oe_runconf 29 oe_runconf
30} 30}
31 31
32FTPUSER = "ftp" 32FTPUSER = "ftp"
33FTPGROUP = "ftp" 33FTPGROUP = "ftp"
34 34
35do_install () { 35do_install () {
36 oe_runmake DESTDIR=${D} install 36 oe_runmake DESTDIR=${D} install
37 rmdir ${D}${libdir}/proftpd ${D}${datadir}/locale 37 rmdir ${D}${libdir}/proftpd ${D}${datadir}/locale
38 [ -d ${D}${libexecdir} ] && rmdir ${D}${libexecdir} 38 [ -d ${D}${libexecdir} ] && rmdir ${D}${libexecdir}
39 sed -i '/ *User[ \t]*/s/ftp/${FTPUSER}/' ${D}${sysconfdir}/proftpd.conf 39 sed -i '/ *User[ \t]*/s/ftp/${FTPUSER}/' ${D}${sysconfdir}/proftpd.conf
40 sed -i '/ *Group[ \t]*/s/ftp/${FTPGROUP}/' ${D}${sysconfdir}/proftpd.conf 40 sed -i '/ *Group[ \t]*/s/ftp/${FTPGROUP}/' ${D}${sysconfdir}/proftpd.conf
41 install -d ${D}${sysconfdir}/init.d 41 install -d ${D}${sysconfdir}/init.d
42 install -m 0755 ${WORKDIR}/proftpd-basic.init ${D}${sysconfdir}/init.d/proftpd 42 install -m 0755 ${WORKDIR}/proftpd-basic.init ${D}${sysconfdir}/init.d/proftpd
43 sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/proftpd 43 sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/proftpd
44 sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/proftpd 44 sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/proftpd
45 sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/proftpd 45 sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/proftpd
46 sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/proftpd 46 sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/proftpd
47 47
48 install -d ${D}${sysconfdir}/default 48 install -d ${D}${sysconfdir}/default
49 install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/proftpd 49 install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/proftpd
50} 50}
51 51
52INITSCRIPT_NAME = "proftpd" 52INITSCRIPT_NAME = "proftpd"
diff --git a/meta-networking/recipes-daemons/ptpd/ptpd_2.2.0.bb b/meta-networking/recipes-daemons/ptpd/ptpd_2.2.0.bb
index 39a0cdd52..f2e895d1c 100644
--- a/meta-networking/recipes-daemons/ptpd/ptpd_2.2.0.bb
+++ b/meta-networking/recipes-daemons/ptpd/ptpd_2.2.0.bb
@@ -22,7 +22,7 @@ S = "${WORKDIR}/ptpd-${PV}/src"
22EXTRA_OEMAKE = "" 22EXTRA_OEMAKE = ""
23 23
24do_install() { 24do_install() {
25 install -d ${D}${bindir} ${D}${mandir}/man8 25 install -d ${D}${bindir} ${D}${mandir}/man8
26 install -m 0755 ptpd2 ${D}${bindir} 26 install -m 0755 ptpd2 ${D}${bindir}
27 install -m 0644 ptpd2.8 ${D}${mandir}/man8 27 install -m 0644 ptpd2.8 ${D}${mandir}/man8
28} 28}
diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.36.bb b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.36.bb
index 871ab6e52..e3a3e4e8f 100644
--- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.36.bb
+++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.36.bb
@@ -9,8 +9,8 @@ PR = "r0"
9 9
10SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.tar.gz \ 10SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.tar.gz \
11 file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \ 11 file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \
12 file://nostrip.patch \ 12 file://nostrip.patch \
13 " 13"
14SRC_URI[md5sum] = "bbcb48e8aa6ec1abff9775b89f84af91" 14SRC_URI[md5sum] = "bbcb48e8aa6ec1abff9775b89f84af91"
15SRC_URI[sha256sum] = "90fb63b1a9d448076aa9f3e3c74b298965f98e03c824e9a4d241fffe8eb3a130" 15SRC_URI[sha256sum] = "90fb63b1a9d448076aa9f3e3c74b298965f98e03c824e9a4d241fffe8eb3a130"
16 16
diff --git a/meta-networking/recipes-daemons/radvd/radvd.inc b/meta-networking/recipes-daemons/radvd/radvd.inc
index 406127939..89669f7a6 100644
--- a/meta-networking/recipes-daemons/radvd/radvd.inc
+++ b/meta-networking/recipes-daemons/radvd/radvd.inc
@@ -14,21 +14,21 @@ SRC_URI = "http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \
14inherit autotools update-rc.d useradd 14inherit autotools update-rc.d useradd
15 15
16do_install_append () { 16do_install_append () {
17 install -m 0755 -d ${D}${sysconfdir}/init.d \ 17 install -m 0755 -d ${D}${sysconfdir}/init.d \
18 ${D}${sysconfdir}/default/volatiles \ 18 ${D}${sysconfdir}/default/volatiles \
19 ${D}${docdir}/radvd 19 ${D}${docdir}/radvd
20 # Install init script and volatiles 20 # Install init script and volatiles
21 install -m 0755 ${WORKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd 21 install -m 0755 ${WORKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd
22 sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/radvd 22 sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/radvd
23 sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/radvd 23 sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/radvd
24 sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/radvd 24 sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/radvd
25 sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/radvd 25 sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/radvd
26 26
27 install -m 0644 ${WORKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/volatiles.03_radvd 27 install -m 0644 ${WORKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/volatiles.03_radvd
28 # Documentation 28 # Documentation
29 for i in radvd.conf.example README; do \ 29 for i in radvd.conf.example README; do \
30 install -m 0644 $i ${D}${docdir}/radvd; \ 30 install -m 0644 $i ${D}${docdir}/radvd; \
31 done 31 done
32} 32}
33 33
34INITSCRIPT_NAME = "radvd" 34INITSCRIPT_NAME = "radvd"
@@ -38,5 +38,5 @@ USERADD_PACKAGES = "${PN}"
38USERADD_PARAM_${PN} = "--system --home ${localstatedir}/run/radvd/ -M -g nogroup radvd" 38USERADD_PARAM_${PN} = "--system --home ${localstatedir}/run/radvd/ -M -g nogroup radvd"
39 39
40pkg_postinst_${PN} () { 40pkg_postinst_${PN} () {
41 ${sysconfdir}/init.d/populate-volatile.sh update 41 ${sysconfdir}/init.d/populate-volatile.sh update
42} 42}
diff --git a/meta-networking/recipes-daemons/radvd/radvd_1.9.1.bb b/meta-networking/recipes-daemons/radvd/radvd_1.9.1.bb
index 37c224b19..0dccdeddd 100644
--- a/meta-networking/recipes-daemons/radvd/radvd_1.9.1.bb
+++ b/meta-networking/recipes-daemons/radvd/radvd_1.9.1.bb
@@ -6,4 +6,4 @@ SRC_URI[md5sum] = "e807ad7e9a76d46b6133df391385cd31"
6SRC_URI[sha256sum] = "54eb5704a2b710ba946fa30d2bca811fa23b1b3bfab322c38cb0c2a9619aa933" 6SRC_URI[sha256sum] = "54eb5704a2b710ba946fa30d2bca811fa23b1b3bfab322c38cb0c2a9619aa933"
7 7
8SRC_URI += "\ 8SRC_URI += "\
9 file://change-scanner-dependency.patch" 9 file://change-scanner-dependency.patch"
diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
index af48455db..cb5b234be 100644
--- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
+++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
@@ -34,24 +34,24 @@ EXTRA_OECONF += "--disable-option-checking"
34 34
35# configure.in has errors 35# configure.in has errors
36do_configure() { 36do_configure() {
37 oe_runconf 37 oe_runconf
38} 38}
39 39
40do_install() { 40do_install() {
41 oe_runmake install INSTALLROOT=${D} 41 oe_runmake install INSTALLROOT=${D}
42 mv ${D}${bindir}/tftp ${D}${bindir}/tftp-hpa 42 mv ${D}${bindir}/tftp ${D}${bindir}/tftp-hpa
43 mv ${D}${sbindir}/in.tftpd ${D}${sbindir}/in.tftpd-hpa 43 mv ${D}${sbindir}/in.tftpd ${D}${sbindir}/in.tftpd-hpa
44 44
45 install -m 755 -d ${D}${localstatedir}/lib/tftpboot/ 45 install -m 755 -d ${D}${localstatedir}/lib/tftpboot/
46 install -d ${D}${sysconfdir}/init.d 46 install -d ${D}${sysconfdir}/init.d
47 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/tftpd-hpa 47 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/tftpd-hpa
48 sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa 48 sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa
49 sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa 49 sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa
50 sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa 50 sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa
51 sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/tftpd-hpa 51 sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/tftpd-hpa
52 52
53 install -d ${D}${sysconfdir}/default 53 install -d ${D}${sysconfdir}/default
54 install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/tftpd-hpa 54 install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/tftpd-hpa
55} 55}
56 56
57FILES_${PN} = "${bindir}" 57FILES_${PN} = "${bindir}"
diff --git a/meta-networking/recipes-daemons/vblade/vblade_20.bb b/meta-networking/recipes-daemons/vblade/vblade_20.bb
index 3756d530b..5b7c16764 100644
--- a/meta-networking/recipes-daemons/vblade/vblade_20.bb
+++ b/meta-networking/recipes-daemons/vblade/vblade_20.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
6 6
7SRC_URI = "${SOURCEFORGE_MIRROR}/aoetools/${BPN}-${PV}.tgz \ 7SRC_URI = "${SOURCEFORGE_MIRROR}/aoetools/${BPN}-${PV}.tgz \
8 file://cross.patch" 8 file://cross.patch"
9 9
10SRC_URI[md5sum] = "3c80e4a6bc7d66ae0c235b88cb44bd59" 10SRC_URI[md5sum] = "3c80e4a6bc7d66ae0c235b88cb44bd59"
11SRC_URI[sha256sum] = "c8fe2fc4f2fba8e07e5cfdf17335982584eef2cd5c78bf8b1db93f2b56e7121d" 11SRC_URI[sha256sum] = "c8fe2fc4f2fba8e07e5cfdf17335982584eef2cd5c78bf8b1db93f2b56e7121d"
@@ -13,8 +13,8 @@ SRC_URI[sha256sum] = "c8fe2fc4f2fba8e07e5cfdf17335982584eef2cd5c78bf8b1db93f2b56
13inherit autotools 13inherit autotools
14 14
15do_install() { 15do_install() {
16 install -D -m 0755 ${S}/vblade ${D}/${sbindir}/vblade 16 install -D -m 0755 ${S}/vblade ${D}/${sbindir}/vblade
17 install -D -m 0755 ${S}/vbladed ${D}/${sbindir}/vbladed 17 install -D -m 0755 ${S}/vbladed ${D}/${sbindir}/vbladed
18 install -D -m 0644 ${S}/vblade.8 ${D}/${mandir}/man8/vblade.8 18 install -D -m 0644 ${S}/vblade.8 ${D}/${mandir}/man8/vblade.8
19} 19}
20 20
diff --git a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb
index 9938e2478..23babb070 100644
--- a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb
+++ b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb
@@ -7,10 +7,10 @@ DEPENDS = "libnfnetlink libnetfilter-conntrack libnetfilter-cttimeout \
7PR = "r0" 7PR = "r0"
8 8
9SRC_URI = " \ 9SRC_URI = " \
10 http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-${PV}.tar.bz2;name=tar \ 10 http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-${PV}.tar.bz2;name=tar \
11 file://conntrack-failover \ 11 file://conntrack-failover \
12 file://init \ 12 file://init \
13 " 13"
14SRC_URI[tar.md5sum] = "ee737c774e01349f75e935228a2d851b" 14SRC_URI[tar.md5sum] = "ee737c774e01349f75e935228a2d851b"
15SRC_URI[tar.sha256sum] = "036b032a5c4d180aad686df21399d74506b9b3d3000794eb13ac313482e24896" 15SRC_URI[tar.sha256sum] = "036b032a5c4d180aad686df21399d74506b9b3d3000794eb13ac313482e24896"
16 16
@@ -19,15 +19,15 @@ inherit autotools update-rc.d
19INITSCRIPT_NAME = "conntrackd" 19INITSCRIPT_NAME = "conntrackd"
20 20
21do_install_append() { 21do_install_append() {
22 install -d ${D}/${sysconfdir}/conntrackd 22 install -d ${D}/${sysconfdir}/conntrackd
23 install -d ${D}/${sysconfdir}/init.d 23 install -d ${D}/${sysconfdir}/init.d
24 install -m 0644 doc/sync/ftfw/conntrackd.conf ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample 24 install -m 0644 doc/sync/ftfw/conntrackd.conf ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample
25 install -m 0755 ${WORKDIR}/conntrack-failover ${D}/${sysconfdir}/init.d/conntrack-failover 25 install -m 0755 ${WORKDIR}/conntrack-failover ${D}/${sysconfdir}/init.d/conntrack-failover
26 install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/conntrackd 26 install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/conntrackd
27 27
28 # Fix hardcoded paths in scripts 28 # Fix hardcoded paths in scripts
29 sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd 29 sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd
30 sed -i 's!/etc/!${sysconfdir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd 30 sed -i 's!/etc/!${sysconfdir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd
31 sed -i 's!/var/!${localstatedir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample 31 sed -i 's!/var/!${localstatedir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample
32 sed -i 's!^export PATH=.*!export PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}/${sysconfdir}/init.d/conntrackd 32 sed -i 's!^export PATH=.*!export PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}/${sysconfdir}/init.d/conntrackd
33} 33}
diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
index d6d803add..78e069ac8 100644
--- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
+++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
@@ -11,7 +11,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \
11 file://01debian_defaultconfig.patch \ 11 file://01debian_defaultconfig.patch \
12 file://ebtables.init \ 12 file://ebtables.init \
13 file://no-as-needed.patch \ 13 file://no-as-needed.patch \
14 " 14"
15 15
16SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0" 16SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0"
17SRC_URI[sha256sum] = "dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d" 17SRC_URI[sha256sum] = "dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d"
@@ -31,24 +31,24 @@ EXTRA_OEMAKE = " \
31 'CFLAGS=${CFLAGS}' \ 31 'CFLAGS=${CFLAGS}' \
32 'LDFLAGS=${LDFLAGS} -Wl,--no-as-needed' \ 32 'LDFLAGS=${LDFLAGS} -Wl,--no-as-needed' \
33 'LD=${LD}' \ 33 'LD=${LD}' \
34 " 34"
35 35
36do_install () { 36do_install () {
37 install -d ${D}${sysconfdir}/init.d 37 install -d ${D}${sysconfdir}/init.d
38 install -d ${D}${sysconfdir}/default 38 install -d ${D}${sysconfdir}/default
39 install -d ${D}${sysconfdir}/ebtables 39 install -d ${D}${sysconfdir}/ebtables
40 oe_runmake DESTDIR='${D}' install 40 oe_runmake DESTDIR='${D}' install
41 install -m 0755 ${WORKDIR}/ebtables.init ${D}/${sysconfdir}/init.d/ebtables 41 install -m 0755 ${WORKDIR}/ebtables.init ${D}/${sysconfdir}/init.d/ebtables
42 mv ${D}${sysconfdir}/default/ebtables-config ${D}${sysconfdir}/default/ebtables 42 mv ${D}${sysconfdir}/default/ebtables-config ${D}${sysconfdir}/default/ebtables
43 43
44 # Fix hardcoded paths in scripts 44 # Fix hardcoded paths in scripts
45 sed -i 's!/sbin/!${base_sbindir}/!g' ${D}/${sysconfdir}/init.d/ebtables 45 sed -i 's!/sbin/!${base_sbindir}/!g' ${D}/${sysconfdir}/init.d/ebtables
46 sed -i 's!/etc/!${sysconfdir}/!g' ${D}/${sysconfdir}/init.d/ebtables 46 sed -i 's!/etc/!${sysconfdir}/!g' ${D}/${sysconfdir}/init.d/ebtables
47 47
48 # The script ebtables-save refernces perl in exec_prefix, so 48 # The script ebtables-save refernces perl in exec_prefix, so
49 # move it to sbindir to avoid QA issue 49 # move it to sbindir to avoid QA issue
50 install -d ${D}/${sbindir} 50 install -d ${D}/${sbindir}
51 mv ${D}/${base_sbindir}/ebtables-save ${D}/${sbindir} 51 mv ${D}/${base_sbindir}/ebtables-save ${D}/${sbindir}
52} 52}
53 53
54CONFFILES_${PN} += "${sysconfdir}/default/ebtables" 54CONFFILES_${PN} += "${sysconfdir}/default/ebtables"
diff --git a/meta-networking/recipes-filter/libmnl/libmnl_1.0.3.bb b/meta-networking/recipes-filter/libmnl/libmnl_1.0.3.bb
index 369aaa9f8..74f909660 100644
--- a/meta-networking/recipes-filter/libmnl/libmnl_1.0.3.bb
+++ b/meta-networking/recipes-filter/libmnl/libmnl_1.0.3.bb
@@ -1,6 +1,6 @@
1SUMMARY = "Minimalistic user-space Netlink utility library" 1SUMMARY = "Minimalistic user-space Netlink utility library"
2DESCRIPTION = "Minimalistic user-space library oriented to Netlink developers, providing \ 2DESCRIPTION = "Minimalistic user-space library oriented to Netlink developers, providing \
3 functions for common tasks in parsing, validating, and constructing both the Netlink header and TLVs." 3 functions for common tasks in parsing, validating, and constructing both the Netlink header and TLVs."
4HOMEPAGE = "http://www.netfilter.org/projects/libmnl/index.html" 4HOMEPAGE = "http://www.netfilter.org/projects/libmnl/index.html"
5LICENSE = "LGPLv2.1+" 5LICENSE = "LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 6LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
diff --git a/meta-networking/recipes-irc/znc/znc_git.bb b/meta-networking/recipes-irc/znc/znc_git.bb
index aea8ed492..817e2c468 100644
--- a/meta-networking/recipes-irc/znc/znc_git.bb
+++ b/meta-networking/recipes-irc/znc/znc_git.bb
@@ -15,5 +15,5 @@ inherit autotools
15 15
16# ZNC has a custom autogen.sh that states that this command is needed *and* expected to fail 16# ZNC has a custom autogen.sh that states that this command is needed *and* expected to fail
17do_configure_prepend() { 17do_configure_prepend() {
18 automake --add-missing || true 18 automake --add-missing || true
19} 19}
diff --git a/meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb b/meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb
index d17cc78a1..a7c10f797 100644
--- a/meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb
+++ b/meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb
@@ -23,7 +23,7 @@ EXTRA_OECMAKE = " \
23 -DLOG_PGSQL=FALSE \ 23 -DLOG_PGSQL=FALSE \
24 -DRADIUS=FALSE \ 24 -DRADIUS=FALSE \
25 -DNETSNMP=FALSE \ 25 -DNETSNMP=FALSE \
26 " 26"
27FILES_${PN}-dbg += "/usr/lib/${BPN}/.debug/*" 27FILES_${PN}-dbg += "/usr/lib/${BPN}/.debug/*"
28 28
29PACKAGES =+ "${PN}-libs" 29PACKAGES =+ "${PN}-libs"
diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
index c173af434..6a90578bc 100644
--- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
+++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
@@ -1,9 +1,9 @@
1SUMMARY = "Client for Microsoft PPTP VPNs" 1SUMMARY = "Client for Microsoft PPTP VPNs"
2DESCRIPTION = "PPTP Client is a Linux, FreeBSD, NetBSD \ 2DESCRIPTION = "PPTP Client is a Linux, FreeBSD, NetBSD \
3 and OpenBSD client for the proprietary Microsoft Point-to-Point \ 3 and OpenBSD client for the proprietary Microsoft Point-to-Point \
4 Tunneling Protocol, PPTP. Allows connection to a PPTP based \ 4 Tunneling Protocol, PPTP. Allows connection to a PPTP based \
5 Virtual Private Network (VPN) as used by employers and some \ 5 Virtual Private Network (VPN) as used by employers and some \
6 cable and ADSL internet service providers." 6 cable and ADSL internet service providers."
7HOMEPAGE = "http://pptpclient.sourceforge.net" 7HOMEPAGE = "http://pptpclient.sourceforge.net"
8SECTION = "network" 8SECTION = "network"
9LICENSE = "GPLv2+" 9LICENSE = "GPLv2+"
@@ -14,7 +14,7 @@ PR = "r1"
14SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \ 14SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \
15 file://options.pptp \ 15 file://options.pptp \
16 file://fix-parallel-build.patch \ 16 file://fix-parallel-build.patch \
17 " 17"
18 18
19SRC_URI[md5sum] = "4c3d19286a37459a632c7128c92a9857" 19SRC_URI[md5sum] = "4c3d19286a37459a632c7128c92a9857"
20SRC_URI[sha256sum] = "e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d37694bc" 20SRC_URI[sha256sum] = "e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d37694bc"
@@ -22,10 +22,10 @@ SRC_URI[sha256sum] = "e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d3
22S = "${WORKDIR}/pptp-${PV}" 22S = "${WORKDIR}/pptp-${PV}"
23 23
24do_install() { 24do_install() {
25 install -d ${D}${sbindir} ${D}${sysconfdir}/ppp ${D}${mandir}/man8 25 install -d ${D}${sbindir} ${D}${sysconfdir}/ppp ${D}${mandir}/man8
26 install -m 555 pptp ${D}${sbindir} 26 install -m 555 pptp ${D}${sbindir}
27 install -m 644 pptp.8 ${D}${mandir}/man8 27 install -m 644 pptp.8 ${D}${mandir}/man8
28 install -m 644 ${WORKDIR}/options.pptp ${D}${sysconfdir}/ppp 28 install -m 644 ${WORKDIR}/options.pptp ${D}${sysconfdir}/ppp
29} 29}
30 30
31RDEPENDS_${PN} = "ppp" 31RDEPENDS_${PN} = "ppp"
diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc
index b40c85803..160c458cc 100644
--- a/meta-networking/recipes-protocols/quagga/quagga.inc
+++ b/meta-networking/recipes-protocols/quagga/quagga.inc
@@ -136,33 +136,33 @@ pkg_postinst_${PN} () {
136 136
137# Stop apps before uninstall 137# Stop apps before uninstall
138pkg_prerm_${PN} () { 138pkg_prerm_${PN} () {
139 ${sysconfdir}/init.d/quagga stop 139 ${sysconfdir}/init.d/quagga stop
140} 140}
141 141
142pkg_prerm_${PN}-ospfd () { 142pkg_prerm_${PN}-ospfd () {
143 ${sysconfdir}/init.d/quagga stop ospfd 143 ${sysconfdir}/init.d/quagga stop ospfd
144} 144}
145 145
146pkg_prerm_${PN}-ospf6d () { 146pkg_prerm_${PN}-ospf6d () {
147 ${sysconfdir}/init.d/quagga stop ospf6d 147 ${sysconfdir}/init.d/quagga stop ospf6d
148} 148}
149 149
150pkg_prerm_${PN}-babeld () { 150pkg_prerm_${PN}-babeld () {
151 ${sysconfdir}/init.d/quagga stop babeld 151 ${sysconfdir}/init.d/quagga stop babeld
152} 152}
153 153
154pkg_prerm_${PN}-bgpd () { 154pkg_prerm_${PN}-bgpd () {
155 ${sysconfdir}/init.d/quagga stop bgpd 155 ${sysconfdir}/init.d/quagga stop bgpd
156} 156}
157 157
158pkg_prerm_${PN}-ripd () { 158pkg_prerm_${PN}-ripd () {
159 ${sysconfdir}/init.d/quagga stop ripd 159 ${sysconfdir}/init.d/quagga stop ripd
160} 160}
161 161
162pkg_prerm_${PN}-ripngd () { 162pkg_prerm_${PN}-ripngd () {
163 ${sysconfdir}/init.d/quagga stop ripngd 163 ${sysconfdir}/init.d/quagga stop ripngd
164} 164}
165 165
166pkg_prerm_${PN}-isisd () { 166pkg_prerm_${PN}-isisd () {
167 ${sysconfdir}/init.d/quagga stop isisd 167 ${sysconfdir}/init.d/quagga stop isisd
168} 168}
diff --git a/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc b/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc
index cea542732..f4ea2b826 100644
--- a/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc
+++ b/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc
@@ -15,22 +15,22 @@ S = "${WORKDIR}/git"
15inherit update-rc.d 15inherit update-rc.d
16 16
17do_compile () { 17do_compile () {
18 oe_runmake CFLAGS="${CFLAGS} -DLINUX" LDFLAGS="${LDFLAGS}" PREFIX="${prefix}" KERNELSRC=${STAGING_KERNEL_DIR} all 18 oe_runmake CFLAGS="${CFLAGS} -DLINUX" LDFLAGS="${LDFLAGS}" PREFIX="${prefix}" KERNELSRC=${STAGING_KERNEL_DIR} all
19} 19}
20 20
21do_install () { 21do_install () {
22 oe_runmake PREFIX="${D}${prefix}" install 22 oe_runmake PREFIX="${D}${prefix}" install
23 23
24 install -d ${D}${sysconfdir}/init.d 24 install -d ${D}${sysconfdir}/init.d
25 touch ${D}${sysconfdir}/xl2tpd.conf 25 touch ${D}${sysconfdir}/xl2tpd.conf
26 install -m 0755 debian/xl2tpd.init ${D}${sysconfdir}/init.d/xl2tpd 26 install -m 0755 debian/xl2tpd.init ${D}${sysconfdir}/init.d/xl2tpd
27 sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/xl2tpd 27 sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/xl2tpd
28 sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/xl2tpd 28 sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/xl2tpd
29 sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/xl2tpd 29 sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/xl2tpd
30 sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/xl2tpd 30 sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/xl2tpd
31 31
32 install -d ${D}${sysconfdir}/default 32 install -d ${D}${sysconfdir}/default
33 install -m 0644 debian/xl2tpd.default ${D}${sysconfdir}/default/xl2tpd 33 install -m 0644 debian/xl2tpd.default ${D}${sysconfdir}/default/xl2tpd
34} 34}
35 35
36CONFFILES_${PN} += "${sysconfdir}/xl2tpd.conf ${sysconfdir}/default/xl2tpd" 36CONFFILES_${PN} += "${sysconfdir}/xl2tpd.conf ${sysconfdir}/default/xl2tpd"
diff --git a/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb b/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb
index f755940f1..9307263c7 100644
--- a/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb
+++ b/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb
@@ -25,10 +25,10 @@ SRC_URI[md5sum] = "bdafb16b008ebb5633e4e581f77821d2"
25SRC_URI[sha256sum] = "a8c74df127753e2310fa1e072f3c9ca44a404bb0bbce9cfec7a84c6dff8bec7b" 25SRC_URI[sha256sum] = "a8c74df127753e2310fa1e072f3c9ca44a404bb0bbce9cfec7a84c6dff8bec7b"
26 26
27do_install () { 27do_install () {
28 install -d ${D}${sbindir} 28 install -d ${D}${sbindir}
29 install -d ${D}${sysconfdir}/network/if-up.d 29 install -d ${D}${sysconfdir}/network/if-up.d
30 install -d ${D}${sysconfdir}/default 30 install -d ${D}${sysconfdir}/default
31 install -c -m 755 ${S}/zeroconf ${D}${sbindir}/zeroconf 31 install -c -m 755 ${S}/zeroconf ${D}${sbindir}/zeroconf
32 install -c -m 755 ${WORKDIR}/debian-zeroconf ${D}${sysconfdir}/network/if-up.d/zeroconf 32 install -c -m 755 ${WORKDIR}/debian-zeroconf ${D}${sysconfdir}/network/if-up.d/zeroconf
33 install -c ${WORKDIR}/zeroconf-default ${D}${sysconfdir}/default/zeroconf 33 install -c ${WORKDIR}/zeroconf-default ${D}${sysconfdir}/default/zeroconf
34} 34}
diff --git a/meta-networking/recipes-support/aoetools/aoetools_34.bb b/meta-networking/recipes-support/aoetools/aoetools_34.bb
index 68ff4bbd0..cf002984a 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 86b900a5d..fe14b61e1 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 53285a152..19b60ad38 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 51c4a348c..ff30558f2 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 3920c1a5a..d75391213 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 00eec3ea0..0a30de6a4 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 2d98122be..a4805a4c3 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 7b7884060..eda78599c 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 f9f5bd1b4..f2eef05d6 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 8593c6ba4..001784550 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 3f53fffa3..a604b9c53 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 f52314003..e6718dbd5 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 29aed44a4..e95cfa523 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}