cherokee: Factor out common parts to cherokee.inc and fix up the packaging

for cherokee-nossl which is even more broken then before after this change.

4 files changed, 57 insertions, 86 deletions

diff --git a/packages/cherokee/cherokee-nossl_0.5.3.bb b/packages/cherokee/cherokee-nossl_0.5.3.bb
index 5487afcfde..409366004a 100644
--- a/packages/cherokee/cherokee-nossl_0.5.3.bb
+++ b/packages/cherokee/cherokee-nossl_0.5.3.bb
@@ -7,3 +7,8 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/cherokee-${PV}', '${FILE_D
 S = "${WORKDIR}/cherokee-${PV}"
 
 EXTRA_OECONF = "--disable-tls --disable-static --disable-nls"
+
+# Fix up files - the ${PN} in the defaults expand to cherokee-nossl
+# but we are actually installing into cherokee.
+FILES_${PN} += "${datadir}/cherokee ${libdir}/cherokee/*"
+FILES_${PN}-dbg += "${libdir}/cherokee/.debug"
diff --git a/packages/cherokee/cherokee.inc b/packages/cherokee/cherokee.inc
new file mode 100644
index 0000000000..4adc283173
--- /dev/null
+++ b/packages/cherokee/cherokee.inc
@@ -0,0 +1,42 @@
+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 = "GPL"
+DEPENDS = "libpcre gnutls"
+
+SRC_URI = "http://www.cherokee-project.com/download/0.5/${PV}/cherokee-${PV}.tar.gz \
+           file://cherokee.init "
+
+inherit autotools pkgconfig binconfig update-rc.d
+
+EXTRA_OECONF = "--enable-tls=gnutls --disable-static --disable-nls"
+
+do_install_prepend () {
+        # It only needs this app during the install, so compile it natively
+        $BUILD_CC -DHAVE_SYS_STAT_H -o cherokee_replace cherokee_replace.c
+}
+do_install_append () {
+        install -m 0755 -d ${D}${sysconfdir}/init.d
+        install -m 755 ${WORKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee
+}
+
+PACKAGES =+ "cget libcherokee-server libcherokee-client libcherokee-base"
+
+FILES_cget = "${bindir}/cget"
+FILES_libcherokee-server = "${libdir}/libcherokee-server*"
+FILES_libcherokee-client = "${libdir}/libcherokee-client*"
+FILES_libcherokee-base = "${libdir}/libcherokee-base*"
+
+CONFFILES_${PN} = "${sysconfdir}/cherokee/mime.types \
+                   ${sysconfdir}/cherokee/mods-available/admin \
+                   ${sysconfdir}/cherokee/mods-available/ssl \
+                   ${sysconfdir}/cherokee/advanced.conf \
+                   ${sysconfdir}/cherokee/cherokee.conf \
+                   ${sysconfdir}/cherokee/mime.compression.types \
+                   ${sysconfdir}/cherokee/sites-available/example.com \
+                   ${sysconfdir}/cherokee/sites-available/default \
+                   ${sysconfdir}/cherokee/icons.conf"
+
+INITSCRIPT_NAME = "cherokee"
+INITSCRIPT_PARAMS = "defaults 91 91"
diff --git a/packages/cherokee/cherokee_0.5.3.bb b/packages/cherokee/cherokee_0.5.3.bb
index 511ebc4904..45746ccded 100644
--- a/packages/cherokee/cherokee_0.5.3.bb
+++ b/packages/cherokee/cherokee_0.5.3.bb
@@ -1,51 +1,14 @@
-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 = "GPL"
-DEPENDS = "libpcre gnutls"
-PR = "r4"
+PR = "r5"
 
-SRC_URI = "http://www.cherokee-project.com/download/0.5/${PV}/cherokee-${PV}.tar.gz \
-          file://configure.patch;patch=1 \
-          file://Makefile.in.patch;patch=1 \
-          file://Makefile.cget.patch;patch=1 \
-          file://util.patch;patch=1 \
-          file://cherokee.init"
+SRC_URI_append = "file://configure.patch;patch=1 \
+                  file://Makefile.in.patch;patch=1 \
+                  file://Makefile.cget.patch;patch=1 \
+                  file://util.patch;patch=1"
 
-inherit autotools pkgconfig binconfig update-rc.d
-
-EXTRA_OECONF = "--enable-tls=gnutls --disable-static --disable-nls"
+require cherokee.inc
 
 do_configure() {
         gnu-configize
         oe_runconf
         sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/*libtool
 }
-do_install_prepend () {
-        $BUILD_CC -DHAVE_SYS_STAT_H -o cherokee_replace cherokee_replace.c
-}
-do_install_append () {
-        install -m 0755 -d ${D}${sysconfdir}/init.d
-        install -m 755 ${WORKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee
-}
-
-PACKAGES =+ "cget libcherokee-server libcherokee-client libcherokee-base"
-
-FILES_cget = "${bindir}/cget"
-FILES_libcherokee-server = "${libdir}/libcherokee-server*"
-FILES_libcherokee-client = "${libdir}/libcherokee-client*"
-FILES_libcherokee-base = "${libdir}/libcherokee-base*"
-
-CONFFILES_${PN} = "${sysconfdir}/cherokee/mime.types \
-                   ${sysconfdir}/cherokee/mods-available/admin \
-                   ${sysconfdir}/cherokee/mods-available/ssl \
-                   ${sysconfdir}/cherokee/advanced.conf \
-                   ${sysconfdir}/cherokee/cherokee.conf \
-                   ${sysconfdir}/cherokee/mime.compression.types \
-                   ${sysconfdir}/cherokee/sites-available/example.com \
-                   ${sysconfdir}/cherokee/sites-available/default \
-                   ${sysconfdir}/cherokee/icons.conf"
-
-INITSCRIPT_NAME = "cherokee"
-INITSCRIPT_PARAMS = "defaults 91 91"
diff --git a/packages/cherokee/cherokee_0.5.5.bb b/packages/cherokee/cherokee_0.5.5.bb
index 7a6eb3a548..02d94db117 100644
--- a/packages/cherokee/cherokee_0.5.5.bb
+++ b/packages/cherokee/cherokee_0.5.5.bb
@@ -1,45 +1,6 @@
-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 = "GPL"
-DEPENDS = "libpcre gnutls"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "http://www.cherokee-project.com/download/0.5/${PV}/cherokee-${PV}.tar.gz \
-           file://configure.in.patch;patch=1 \
-           file://Makefile.am.patch;patch=1 \
-           file://cherokee.init"
+SRC_URI_append = "file://configure.in.patch;patch=1 \
+                  file://Makefile.am.patch;patch=1"
 
-inherit autotools pkgconfig binconfig update-rc.d
-
-EXTRA_OECONF = "--enable-tls=gnutls --disable-static --disable-nls"
-
-do_install_prepend () {
-        # It only needs this app during the install, so compile it natively
-        $BUILD_CC -DHAVE_SYS_STAT_H -o cherokee_replace cherokee_replace.c
-}
-do_install_append () {
-        install -m 0755 -d ${D}${sysconfdir}/init.d
-        install -m 755 ${WORKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee
-}
-
-PACKAGES =+ "cget libcherokee-server libcherokee-client libcherokee-base"
-
-FILES_cget = "${bindir}/cget"
-FILES_libcherokee-server = "${libdir}/libcherokee-server*"
-FILES_libcherokee-client = "${libdir}/libcherokee-client*"
-FILES_libcherokee-base = "${libdir}/libcherokee-base*"
-
-CONFFILES_${PN} = "${sysconfdir}/cherokee/mime.types \
-                   ${sysconfdir}/cherokee/mods-available/admin \
-                   ${sysconfdir}/cherokee/mods-available/ssl \
-                   ${sysconfdir}/cherokee/advanced.conf \
-                   ${sysconfdir}/cherokee/cherokee.conf \
-                   ${sysconfdir}/cherokee/mime.compression.types \
-                   ${sysconfdir}/cherokee/sites-available/example.com \
-                   ${sysconfdir}/cherokee/sites-available/default \
-                   ${sysconfdir}/cherokee/icons.conf"
-
-INITSCRIPT_NAME = "cherokee"
-INITSCRIPT_PARAMS = "defaults 91 91"
+require cherokee.inc