summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-daemons/proftpd
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/proftpd
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/proftpd')
-rw-r--r--meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb32
1 files changed, 16 insertions, 16 deletions
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 db24b358c7..28a7357864 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"