diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2012-06-10 21:46:51 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-07-16 09:39:07 +0200 |
| commit | c203043683deff90b4d80c326bf6b27a28a59386 (patch) | |
| tree | bf6aa8e0e30de5a21f3d89a0a4bbefb7f6b99d16 /meta-oe/recipes-connectivity | |
| parent | 365d5ec941347f54744b9f5fbb7b06cc3949e14a (diff) | |
| download | meta-openembedded-c203043683deff90b4d80c326bf6b27a28a59386.tar.gz | |
cherokee: move systemd support to meta-systemd
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity')
| -rw-r--r-- | meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.service | 10 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb | 10 |
2 files changed, 3 insertions, 17 deletions
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" |