summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/gdm
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-gnome/recipes-gnome/gdm
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-gnome/recipes-gnome/gdm')
-rw-r--r--meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb42
1 files changed, 21 insertions, 21 deletions
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
index 45bddc8f0..1e55dd988 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
+++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
@@ -18,7 +18,7 @@ SRC_URI += " \
18 file://gdm-pam \ 18 file://gdm-pam \
19 file://Default \ 19 file://Default \
20 file://gdm.service.in \ 20 file://gdm.service.in \
21 " 21"
22 22
23SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e" 23SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e"
24SRC_URI[archive.sha256sum] = "034d23af0ea18d86e5543e707212d9297ec7d83f221808968af266dbebc0e703" 24SRC_URI[archive.sha256sum] = "034d23af0ea18d86e5543e707212d9297ec7d83f221808968af266dbebc0e703"
@@ -29,36 +29,36 @@ EXTRA_OECONF = " --enable-authentication-scheme=shadow \
29 --disable-scrollkeeper" 29 --disable-scrollkeeper"
30 30
31do_configure_prepend() { 31do_configure_prepend() {
32 sed -i -e "s:\bdocs::g" ${S}/Makefile.am 32 sed -i -e "s:\bdocs::g" ${S}/Makefile.am
33} 33}
34 34
35do_install_prepend() { 35do_install_prepend() {
36 mkdir -p ${D}/var/lib/gdm/.gconf.mandatory 36 mkdir -p ${D}/var/lib/gdm/.gconf.mandatory
37 cp ${WORKDIR}/%gconf-tree.xml ${D}/var/lib/gdm/.gconf.mandatory/ 37 cp ${WORKDIR}/%gconf-tree.xml ${D}/var/lib/gdm/.gconf.mandatory/
38} 38}
39 39
40do_install_append() { 40do_install_append() {
41 install -d ${D}/${sysconfdir}/init.d 41 install -d ${D}/${sysconfdir}/init.d
42 install -m 0755 ${WORKDIR}/gdm ${D}/${sysconfdir}/init.d/ 42 install -m 0755 ${WORKDIR}/gdm ${D}/${sysconfdir}/init.d/
43 43
44 install -d ${D}/${sysconfdir}/gdm 44 install -d ${D}/${sysconfdir}/gdm
45 install -m 0644 ${WORKDIR}/gdm.conf ${D}/${sysconfdir}/gdm/ 45 install -m 0644 ${WORKDIR}/gdm.conf ${D}/${sysconfdir}/gdm/
46 46
47 install -d ${D}/${sysconfdir}/pam.d 47 install -d ${D}/${sysconfdir}/pam.d
48 install -m 0755 ${WORKDIR}/gdm-pam ${D}/${sysconfdir}/pam.d/gdm 48 install -m 0755 ${WORKDIR}/gdm-pam ${D}/${sysconfdir}/pam.d/gdm
49 49
50 install -d ${D}/${sysconfdir}/gdm/Init 50 install -d ${D}/${sysconfdir}/gdm/Init
51 install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/Init 51 install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/Init
52 52
53 install -d ${D}${systemd_unitdir}/system 53 install -d ${D}${systemd_unitdir}/system
54 sed -e 's,%sbindir%,${sbindir},g' \ 54 sed -e 's,%sbindir%,${sbindir},g' \
55 < ${WORKDIR}/gdm.service.in \ 55 < ${WORKDIR}/gdm.service.in \
56 > ${D}${systemd_unitdir}/system/gdm.service 56 > ${D}${systemd_unitdir}/system/gdm.service
57} 57}
58 58
59FILES_${PN} += "${datadir}/icon* \ 59FILES_${PN} += "${datadir}/icon* \
60 ${datadir}/xsession* \ 60 ${datadir}/xsession* \
61 " 61"
62 62
63RDEPENDS_${PN} += "grep dbus-x11 shadow" 63RDEPENDS_${PN} += "grep dbus-x11 shadow"
64# "libpam-base-files" 64# "libpam-base-files"
@@ -81,8 +81,8 @@ pkg_postinst_${PN} () {
81 grep "^gdm:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/gdm gdm --ingroup gdm -g gdm 81 grep "^gdm:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/gdm gdm --ingroup gdm -g gdm
82 82
83if [ -d /var/lib/gdm ]; then 83if [ -d /var/lib/gdm ]; then
84 chown -R gdm:gdm /var/lib/gdm 84 chown -R gdm:gdm /var/lib/gdm
85 chmod 0750 /var/lib/gdm 85 chmod 0750 /var/lib/gdm
86fi 86fi
87 87
88# Register up as default dm 88# Register up as default dm
@@ -94,5 +94,5 @@ echo "${bindir}/gdm" > ${sysconfdir}/X11/default-display-manager
94pkg_postrm_${PN} () { 94pkg_postrm_${PN} () {
95 deluser gdm || true 95 deluser gdm || true
96 delgroup gdm || true 96 delgroup gdm || true
97 sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true 97 sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true
98} 98}