From patchwork Fri Jul 13 08:30:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [meta-oe, V2, 27/32] xserver-nodm-init: move systemd support to meta-systemd Date: Fri, 13 Jul 2012 08:30:35 -0000 From: =?utf-8?q?Andreas_M=C3=BCller_=3Cschnitzeltony=40googlemail=2Ecom=3E?= X-Patchwork-Id: 31895 Message-Id: <1342168240-7760-28-git-send-email-schnitzeltony@googlemail.com> To: openembedded-devel@lists.openembedded.org Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- .../xserver-nodm-init/xserver-nodm-init_2.0.bb | 16 +------------- .../xserver-nodm-init}/xserver-nodm.conf | 0 .../xserver-nodm-init}/xserver-nodm.service | 0 .../xserver-nodm-init_2.0.bbappend | 21 ++++++++++++++++++++ 4 files changed, 23 insertions(+), 14 deletions(-) rename {meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0 => meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init}/xserver-nodm.conf (100%) rename {meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0 => meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init}/xserver-nodm.service (100%) create mode 100644 meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend 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 62c33c9..544ae7f 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 @@ -3,34 +3,22 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SECTION = "x11" -PR = "r16" +PR = "r17" SRC_URI = "file://xserver-nodm \ - file://xserver-nodm.service \ - file://xserver-nodm.conf \ file://gplv2-license.patch \ " S = "${WORKDIR}" -inherit allarch - -inherit update-rc.d systemd +inherit allarch 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 ." -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "xserver-nodm.service" - do_install() { install -d ${D}${sysconfdir}/init.d install xserver-nodm ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/default - install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm } -FILES_${PN}-systemd += "${sysconfdir}/default/xserver-nodm" - RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit" -RDEPENDS_${PN}-systemd += "xserver-common (>= 1.30) xinit" diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.conf b/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.conf similarity index 100% rename from meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.conf rename to meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.conf diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service b/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.service similarity index 100% rename from meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service rename to meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.service diff --git a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend b/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend new file mode 100644 index 0000000..5538805 --- /dev/null +++ b/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend @@ -0,0 +1,21 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PRINC := "${@int(PRINC) + 1}" + +inherit systemd + +SRC_URI += "file://xserver-nodm.service \ + file://xserver-nodm.conf \ +" + +do_install_append() { + install -d ${D}${sysconfdir}/default + install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm +} + +SYSTEMD_PACKAGES = "${PN}-systemd" +SYSTEMD_SERVICE_${PN}-systemd = "xserver-nodm.service" + +FILES_${PN}-systemd += "${sysconfdir}/default/xserver-nodm" + +RDEPENDS_${PN}-systemd += "xserver-common (>= 1.30) xinit"