CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdm: move systemd support from meta-systemd back to meta-gnome

Browse Source 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa 2013-04-13 13:32:40 +02:00
parent 48442f2621
commit 0638208514
3 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in → meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in
View File

17
meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
View File

@ -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 = "r10"
PR = "r15"
inherit gnome update-rc.d
inherit gnome update-rc.d systemd
SRC_URI += " \
file://cross-xdetection.diff \
@ -17,6 +17,7 @@ SRC_URI += " \
file://gdm.conf \
file://gdm-pam \
file://Default \
file://gdm.service.in \
"
SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e"
@ -49,6 +50,10 @@ do_install_append() {
install -d ${D}/${sysconfdir}/gdm/Init
install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/Init
install -d ${D}${systemd_unitdir}/system
sed -e 's,%sbindir%,${sbindir},g' \
< ${WORKDIR}/gdm.service.in \
> ${D}${systemd_unitdir}/system/gdm.service
}
FILES_${PN} += "${datadir}/icon* \
@ -60,6 +65,10 @@ RDEPENDS_${PN} += "grep dbus-x11 shadow"
CONFFILES_${PN} += "${sysconfdir}/gdm/gdm.conf ${sysconfdir}/init.d/gdm"
RRECOMMENDS_${PN} += "openssh-misc desktop-file-utils glib-2.0-utils metacity gnome-session polkit-gnome consolekit"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "gdm.service"
INITSCRIPT_NAME = "gdm"
INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
@ -87,7 +96,3 @@ pkg_postrm_${PN} () {
delgroup gdm || true
sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true
}

20
meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend
View File

@ -1,20 +0,0 @@
# look for files in the layer first
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 4}"
inherit systemd
SRC_URI += "file://gdm.service.in"
do_install_append() {
install -d ${D}${systemd_unitdir}/system
sed -e 's,%sbindir%,${sbindir},g' \
< ${WORKDIR}/gdm.service.in \
> ${D}${systemd_unitdir}/system/gdm.service
}
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "gdm.service"