[oe-commits] org.oe.dev cherokee: Factor out common parts to cherokee.inc and fix up the packaging
lenehan commit
openembedded-commits at lists.openembedded.org
Sun Nov 19 02:12:53 UTC 2006
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.
Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: e853ab6b84bda472e6268c922f1ac797be81351c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e853ab6b84bda472e6268c922f1ac797be81351c
Files:
1
packages/cherokee/cherokee.inc
packages/cherokee/cherokee-nossl_0.5.3.bb
packages/cherokee/cherokee_0.5.3.bb
packages/cherokee/cherokee_0.5.5.bb
Diffs:
#
# mt diff -rddff3b08c35e365f40fb9425bb85b03152ddf2bb -re853ab6b84bda472e6268c922f1ac797be81351c
#
#
#
# add_file "packages/cherokee/cherokee.inc"
# content [047fa3248e92b084e792ac4fb96f0dea9542aac9]
#
# patch "packages/cherokee/cherokee-nossl_0.5.3.bb"
# from [5eb0f69d93df3733220b1d77c4a871c1fced5297]
# to [10d91890a5afac9d61511f70c634eaf0f4012351]
#
# patch "packages/cherokee/cherokee_0.5.3.bb"
# from [3e848b260d74dae1e34cae94942a3da96d7621f3]
# to [f979ff85ef67a34117da71164cf6708c60ff4e27]
#
# patch "packages/cherokee/cherokee_0.5.5.bb"
# from [77801e3a70f792946a52f5bc3ae3fdbaa6a1554e]
# to [5dcf44b3aeaa25facfc03454e0bd65f551ad0bff]
#
============================================================
--- packages/cherokee/cherokee.inc 047fa3248e92b084e792ac4fb96f0dea9542aac9
+++ packages/cherokee/cherokee.inc 047fa3248e92b084e792ac4fb96f0dea9542aac9
@@ -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"
============================================================
--- packages/cherokee/cherokee-nossl_0.5.3.bb 5eb0f69d93df3733220b1d77c4a871c1fced5297
+++ packages/cherokee/cherokee-nossl_0.5.3.bb 10d91890a5afac9d61511f70c634eaf0f4012351
@@ -7,3 +7,8 @@ EXTRA_OECONF = "--disable-tls --disable-
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"
============================================================
--- packages/cherokee/cherokee_0.5.3.bb 3e848b260d74dae1e34cae94942a3da96d7621f3
+++ packages/cherokee/cherokee_0.5.3.bb f979ff85ef67a34117da71164cf6708c60ff4e27
@@ -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
+require cherokee.inc
-EXTRA_OECONF = "--enable-tls=gnutls --disable-static --disable-nls"
-
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"
============================================================
--- packages/cherokee/cherokee_0.5.5.bb 77801e3a70f792946a52f5bc3ae3fdbaa6a1554e
+++ packages/cherokee/cherokee_0.5.5.bb 5dcf44b3aeaa25facfc03454e0bd65f551ad0bff
@@ -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"
+require cherokee.inc
-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"
More information about the Openembedded-commits
mailing list