diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2012-03-09 10:13:51 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2012-03-11 10:10:37 -0700 |
commit | 2f7c7f82c8c46cee222dea4208de7652e6fceb5c (patch) | |
tree | 5aeb9a2371dad23b8046ba255f6c5d8ddb0f3951 /meta-oe | |
parent | 4cd9933e43ad2772a52b3cc051e102de60ad689d (diff) | |
download | meta-openembedded-2f7c7f82c8c46cee222dea4208de7652e6fceb5c.tar.gz |
cherokee: no need for cherokee.inc since it is used only once
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-connectivity/cherokee/cherokee.inc | 50 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb | 49 |
2 files changed, 47 insertions, 52 deletions
diff --git a/meta-oe/recipes-connectivity/cherokee/cherokee.inc b/meta-oe/recipes-connectivity/cherokee/cherokee.inc deleted file mode 100644 index 1e09dbfb6b..0000000000 --- a/meta-oe/recipes-connectivity/cherokee/cherokee.inc +++ /dev/null @@ -1,50 +0,0 @@ -DESCRIPTION = "Cherokee Web Server fast and secure" -DESCRIPTION_cget = "Small downloader based in the Cherokee client library" -HOMEPAGE = "http://www.cherokee-project.com/" -SECTION = "network" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -INC_PR = "r0" - -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" - - -inherit autotools pkgconfig binconfig update-rc.d - -EXTRA_OECONF = "--disable-static \ - --disable-nls \ - ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ - " - -do_install_append () { - install -m 0755 -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee - - install -d ${D}${base_libdir}/systemd/system - install -m 0644 ${WORKDIR}/*.service ${D}${base_libdir}/systemd/system/ - - # clean up .la files for plugins - rm -f ${D}${libdir}/cherokee/*.la -} - -# Put -dev near the front so we can move the .la files into it with a wildcard -PACKAGES =+ "libcherokee-server libcherokee-client libcherokee-base cget" - -FILES_${PN} += "${base_libdir}/systemd" -FILES_cget = "${bindir}/cget" -FILES_libcherokee-server = "${libdir}/libcherokee-server${SOLIBS}" -FILES_libcherokee-client = "${libdir}/libcherokee-client${SOLIBS}" -FILES_libcherokee-base = "${libdir}/libcherokee-base${SOLIBS}" - -CONFFILES_${PN} = " \ - ${sysconfdir}/cherokee/cherokee.conf \ - ${sysconfdir}/init.d/cherokee \ - " - -INITSCRIPT_NAME = "cherokee" -INITSCRIPT_PARAMS = "defaults 91 91" 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 86b3721c44..93bb1913eb 100644 --- a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb +++ b/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb @@ -1,6 +1,51 @@ -require cherokee.inc +DESCRIPTION = "Cherokee Web Server fast and secure" +DESCRIPTION_cget = "Small downloader based in the Cherokee client library" +HOMEPAGE = "http://www.cherokee-project.com/" +SECTION = "network" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PR = "${INC_PR}.0" +PR = "r1" +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" SRC_URI[md5sum] = "21b01e7d45c0e82ecc0c4257a9c27feb" SRC_URI[sha256sum] = "042b5687b1a3db3ca818167548ce5d32c35e227c6640732dcb622a6f4a078b7d" + +inherit autotools pkgconfig binconfig update-rc.d + +EXTRA_OECONF = "--disable-static \ + --disable-nls \ + ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ + " + +do_install_append () { + install -m 0755 -d ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee + + install -d ${D}${base_libdir}/systemd/system + install -m 0644 ${WORKDIR}/*.service ${D}${base_libdir}/systemd/system/ + + # clean up .la files for plugins + rm -f ${D}${libdir}/cherokee/*.la +} + +# Put -dev near the front so we can move the .la files into it with a wildcard +PACKAGES =+ "libcherokee-server libcherokee-client libcherokee-base cget" + +FILES_${PN} += "${base_libdir}/systemd" +FILES_cget = "${bindir}/cget" +FILES_libcherokee-server = "${libdir}/libcherokee-server${SOLIBS}" +FILES_libcherokee-client = "${libdir}/libcherokee-client${SOLIBS}" +FILES_libcherokee-base = "${libdir}/libcherokee-base${SOLIBS}" + +CONFFILES_${PN} = " \ + ${sysconfdir}/cherokee/cherokee.conf \ + ${sysconfdir}/init.d/cherokee \ + " + +INITSCRIPT_NAME = "cherokee" +INITSCRIPT_PARAMS = "defaults 91 91" |