On Sat, Apr 27, 2013 at 08:33:57PM +0200, Andreas Müller wrote: > Exiting postinst code leaves systemd.bbclass offline postinst code unexecuted, > causes postinst not to finish at first boot (gdm.service is not aliased to > display-manager.service -> started much too early) and is not neccesary: > language preparation can be done offline. > > Signed-off-by: Andreas Müller <[email protected]> > --- > meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | 31 ++++++++++----------------- > 1 files changed, 12 insertions(+), 19 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 1e55dd9..87efc28 100644 > --- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb > +++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb > @@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" > > DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep > consolekit libpam gnome-doc-utils gtk+ xrdb" > > -PR = "r15" > +PR = "r16" > > -inherit gnome update-rc.d systemd > +inherit gnome update-rc.d systemd useradd > > SRC_URI += " \ > file://cross-xdetection.diff \ > @@ -33,8 +33,8 @@ do_configure_prepend() { > } > > do_install_prepend() { > - mkdir -p ${D}/var/lib/gdm/.gconf.mandatory > - cp ${WORKDIR}/%gconf-tree.xml ${D}/var/lib/gdm/.gconf.mandatory/ > + install -d ${D}/${localstatedir}/lib/gdm/.gconf.mandatory > + install ${WORKDIR}/%gconf-tree.xml > ${D}/${localstatedir}/lib/gdm/.gconf.mandatory/ > } > > do_install_append() { > @@ -54,6 +54,9 @@ do_install_append() { > sed -e 's,%sbindir%,${sbindir},g' \ > < ${WORKDIR}/gdm.service.in \ > > ${D}${systemd_unitdir}/system/gdm.service > + > + chown -R gdm:gdm ${D}${localstatedir}/lib/gdm > + chmod 0750 ${D}${localstatedir}/lib/gdm > } > > FILES_${PN} += "${datadir}/icon* \ > @@ -72,23 +75,13 @@ SYSTEMD_SERVICE_${PN} = "gdm.service" > INITSCRIPT_NAME = "gdm" > INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." > > -pkg_postinst_${PN} () { > - # can't do this offline > - if [ "x$D" != "x" ]; then > - exit 1 > - fi > - grep "^gdm:" /etc/group > /dev/null || addgroup gdm > - grep "^gdm:" /etc/passwd > /dev/null || adduser --disabled-password > --system --home /var/lib/gdm gdm --ingroup gdm -g gdm > - > -if [ -d /var/lib/gdm ]; then > - chown -R gdm:gdm /var/lib/gdm > - chmod 0750 /var/lib/gdm > -fi > +USERADD_PACKAGES = "${PN}" > +USERADD_PARAM_${PN} = "--system --no-create-home --home > ${localstatedir}/lib/gdm --user-group gdm" > > +pkg_postinst_${PN} () { > # Register up as default dm > -mkdir -p ${sysconfdir}/X11/ > -echo "${bindir}/gdm" > ${sysconfdir}/X11/default-display-manager > - > +mkdir -p $D${sysconfdir}/X11/ > +echo "${bindir}/gdm" > $D${sysconfdir}/X11/default-display-manager
Maybe we should use u-a for default-display-manager like we use
x-window-manager for WMs.
but git grep display-manager shows only
meta-oe/recipes-graphics/nonworking/slim/slim_1.3.2.bb
doing the same as gdm
> }
>
> pkg_postrm_${PN} () {
> --
> 1.7.4.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> [email protected]
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
