summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics/nonworking
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-oe/recipes-graphics/nonworking
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-oe/recipes-graphics/nonworking')
-rw-r--r--meta-oe/recipes-graphics/nonworking/slim/slim_1.3.2.bb70
1 files changed, 35 insertions, 35 deletions
diff --git a/meta-oe/recipes-graphics/nonworking/slim/slim_1.3.2.bb b/meta-oe/recipes-graphics/nonworking/slim/slim_1.3.2.bb
index 1428806b5a..57b47f6587 100644
--- a/meta-oe/recipes-graphics/nonworking/slim/slim_1.3.2.bb
+++ b/meta-oe/recipes-graphics/nonworking/slim/slim_1.3.2.bb
@@ -8,19 +8,19 @@ PR = "r1"
8DEPENDS = "virtual/libx11 libxmu libpng jpeg freetype sessreg ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 8DEPENDS = "virtual/libx11 libxmu libpng jpeg freetype sessreg ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
9 9
10SRC_URI = " \ 10SRC_URI = " \
11 http://download.berlios.de/${PN}/${P}.tar.gz \ 11 http://download.berlios.de/${PN}/${P}.tar.gz \
12 file://0002-Fix-image-handling-integer-overflows.patch \ 12 file://0002-Fix-image-handling-integer-overflows.patch \
13 file://0003-Fix-build-failure-with-ld-as-needed.patch \ 13 file://0003-Fix-build-failure-with-ld-as-needed.patch \
14 file://0004-Add-support-libpng15.patch \ 14 file://0004-Add-support-libpng15.patch \
15 file://0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch \ 15 file://0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch \
16 file://0006-Remove-localhost-from-Authenticator-of-pam.patch \ 16 file://0006-Remove-localhost-from-Authenticator-of-pam.patch \
17 file://0007-Fix-tty-slowness.patch \ 17 file://0007-Fix-tty-slowness.patch \
18 file://0008-restart-Xserver-if-killed.patch \ 18 file://0008-restart-Xserver-if-killed.patch \
19 file://slim-dynwm \ 19 file://slim-dynwm \
20 file://update_slim_wmlist \ 20 file://update_slim_wmlist \
21 file://Makefile.oe \ 21 file://Makefile.oe \
22 file://slim.pamd \ 22 file://slim.pamd \
23 file://slim.service \ 23 file://slim.service \
24" 24"
25 25
26SRC_URI[md5sum] = "ca1ae6120e6f4b4969f2d6cf94f47b42" 26SRC_URI[md5sum] = "ca1ae6120e6f4b4969f2d6cf94f47b42"
@@ -28,32 +28,32 @@ SRC_URI[sha256sum] = "f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72db
28 28
29 29
30EXTRA_OEMAKE += " \ 30EXTRA_OEMAKE += " \
31 USE_PAM=${@base_contains('DISTRO_FEATURES', 'pam', '1', '0', d)} \ 31 USE_PAM=${@base_contains('DISTRO_FEATURES', 'pam', '1', '0', d)} \
32 PREFIX=${prefix} \ 32 PREFIX=${prefix} \
33 CFGDIR=${sysconfdir} \ 33 CFGDIR=${sysconfdir} \
34 MANDIR=${mandir} \ 34 MANDIR=${mandir} \
35 DESTDIR=${D} \ 35 DESTDIR=${D} \
36 CFLAGS+=-I${STAGING_INCDIR}/freetype2 \ 36 CFLAGS+=-I${STAGING_INCDIR}/freetype2 \
37 CXXFLAGS+=-I${STAGING_INCDIR}/freetype2 \ 37 CXXFLAGS+=-I${STAGING_INCDIR}/freetype2 \
38" 38"
39 39
40do_compile_prepend() { 40do_compile_prepend() {
41 cp -pP ${WORKDIR}/Makefile.oe ${S}/Makefile 41 cp -pP ${WORKDIR}/Makefile.oe ${S}/Makefile
42} 42}
43 43
44do_install() { 44do_install() {
45 oe_runmake install 45 oe_runmake install
46 install -d ${D}${bindir} 46 install -d ${D}${bindir}
47 install -m 0755 ${WORKDIR}/slim-dynwm ${D}${bindir}/ 47 install -m 0755 ${WORKDIR}/slim-dynwm ${D}${bindir}/
48 install -m 0755 ${WORKDIR}/update_slim_wmlist ${D}${bindir}/ 48 install -m 0755 ${WORKDIR}/update_slim_wmlist ${D}${bindir}/
49 install -d ${D}${sysconfdir}/pam.d/ 49 install -d ${D}${sysconfdir}/pam.d/
50 install -m 0644 ${WORKDIR}/slim.pamd ${D}${sysconfdir}/pam.d/slim 50 install -m 0644 ${WORKDIR}/slim.pamd ${D}${sysconfdir}/pam.d/slim
51 51
52 install -d ${D}${systemd_unitdir}/system/ 52 install -d ${D}${systemd_unitdir}/system/
53 install -m 0644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system/ 53 install -m 0644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system/
54 54
55 echo 'sessionstart_cmd /usr/bin/sessreg -a -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf 55 echo 'sessionstart_cmd /usr/bin/sessreg -a -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf
56 echo 'sessionstop_cmd /usr/bin/sessreg -d -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf 56 echo 'sessionstop_cmd /usr/bin/sessreg -d -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf
57} 57}
58 58
59 59
@@ -62,7 +62,7 @@ FILES_${PN} += "${systemd_unitdir}/system/"
62 62
63pkg_postinst_${PN} () { 63pkg_postinst_${PN} () {
64if test "x$D" != "x"; then 64if test "x$D" != "x"; then
65 exit 1 65 exit 1
66fi 66fi
67systemctl enable slim.service 67systemctl enable slim.service
68 68
@@ -73,7 +73,7 @@ echo "${bindir}/slim" > ${sysconfdir}/X11/default-display-manager
73 73
74pkg_postrm_${PN} () { 74pkg_postrm_${PN} () {
75if test "x$D" != "x"; then 75if test "x$D" != "x"; then
76 exit 1 76 exit 1
77fi 77fi
78systemctl disable slim.service 78systemctl disable slim.service
79sed -i /slim/d $D${sysconfdir}/X11/default-display-manager || true 79sed -i /slim/d $D${sysconfdir}/X11/default-display-manager || true