summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-daemons
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-daemons
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-daemons')
-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
8 files changed, 62 insertions, 62 deletions
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