diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-07-26 13:19:11 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-07-26 13:53:32 +0200 |
commit | 4ad7ec43564fd7ab9c5d50dfcccd4a59308dbcb1 (patch) | |
tree | 77ab21101e16f969c6eee7142d068d51ad26fbc9 /meta-oe/recipes-graphics | |
parent | 3eb8da77f58396eb720c2cc8824ce54a769b3ff7 (diff) | |
download | meta-openembedded-contrib-4ad7ec43564fd7ab9c5d50dfcccd4a59308dbcb1.tar.gz |
xserver-nodm-init: add optional systemd support
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-graphics')
-rw-r--r-- | meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service | 8 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb | 28 |
2 files changed, 30 insertions, 6 deletions
diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service new file mode 100644 index 0000000000..b781c7d3c9 --- /dev/null +++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service @@ -0,0 +1,8 @@ +[Unit] +Description=Xserver startup with a display manager + +[Service] +ExecStart=/usr/bin/xinit /etc/X11/Xsession -- /usr/bin/Xorg + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb index de378e6066..d4a6b972fd 100644 --- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb +++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb @@ -2,11 +2,11 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SECTION = "x11" -RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit" -DEFAULT_PREFERENCE = "-1" -PR = "r5" + +PR = "r9" SRC_URI = "file://xserver-nodm \ + file://xserver-nodm.service \ file://gplv2-license.patch \ " S = ${WORKDIR} @@ -14,13 +14,29 @@ S = ${WORKDIR} inherit allarch do_install() { - install -d ${D}/etc - install -d ${D}/etc/init.d - install xserver-nodm ${D}/etc/init.d + install -d ${D}${sysconfdir}/init.d + install xserver-nodm ${D}${sysconfdir}/init.d + + install -d ${D}${base_libdir}/systemd/system + install -m 0644 xserver-nodm.service ${D}${base_libdir}/systemd/system/ } +RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit" +FILES_${PN} += "${base_libdir}/systemd/system/" + inherit update-rc.d INITSCRIPT_NAME = "xserver-nodm" INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 0 1 6 ." INITSCRIPT_PARAMS_shr = "start 90 5 2 . stop 90 0 1 6 ." + +pkg_postinst_${PN}_append () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + + if [ -e /bin/systemctl ] ; then + systemctl enable xserver-nodm.service + fi +} |