From c203043683deff90b4d80c326bf6b27a28a59386 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 10 Jun 2012 21:46:51 +0000 Subject: cherokee: move systemd support to meta-systemd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../recipes-connectivity/cherokee/cherokee/cherokee.service | 10 ---------- meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb | 10 +++------- .../recipes-connectivity/cherokee/cherokee/cherokee.service | 10 ++++++++++ .../recipes-connectivity/cherokee/cherokee_1.2.98.bbappend | 10 ++++++++++ 4 files changed, 23 insertions(+), 17 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.service create mode 100644 meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.service create mode 100644 meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend diff --git a/meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.service b/meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.service deleted file mode 100644 index a2d703185d..0000000000 --- a/meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Cherokee web server -After=syslog.target - -[Service] -Type=forking -ExecStart=/usr/sbin/cherokee -d -C /etc/cherokee/cherokee.conf - -[Install] -WantedBy=multi-user.target diff --git a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb b/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb index a4835e071e..f481c4246e 100644 --- a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb +++ b/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb @@ -5,17 +5,16 @@ SECTION = "network" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PR = "r4" +PR = "r5" DEPENDS = "libpcre openssl mysql5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SRC_URI = "http://www.cherokee-project.com/download/1.2/${PV}/cherokee-${PV}.tar.gz \ - file://cherokee.init \ - file://cherokee.service" + file://cherokee.init" SRC_URI[md5sum] = "21b01e7d45c0e82ecc0c4257a9c27feb" SRC_URI[sha256sum] = "042b5687b1a3db3ca818167548ce5d32c35e227c6640732dcb622a6f4a078b7d" -inherit autotools pkgconfig binconfig update-rc.d systemd +inherit autotools pkgconfig binconfig update-rc.d EXTRA_OECONF = "--disable-static \ --disable-nls \ @@ -45,6 +44,3 @@ CONFFILES_${PN} = " \ INITSCRIPT_NAME = "cherokee" INITSCRIPT_PARAMS = "defaults 91 91" - -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "cherokee.service" diff --git a/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.service b/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.service new file mode 100644 index 0000000000..a2d703185d --- /dev/null +++ b/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.service @@ -0,0 +1,10 @@ +[Unit] +Description=Cherokee web server +After=syslog.target + +[Service] +Type=forking +ExecStart=/usr/sbin/cherokee -d -C /etc/cherokee/cherokee.conf + +[Install] +WantedBy=multi-user.target diff --git a/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend b/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend new file mode 100644 index 0000000000..7cc7dd8474 --- /dev/null +++ b/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PRINC := "${@int(PRINC) + 1}" + +inherit systemd + +SRC_URI += "file://cherokee.service" + +SYSTEMD_PACKAGES = "${PN}-systemd" +SYSTEMD_SERVICE = "cherokee.service" -- cgit v1.2.3-54-g00ecf