Patchwork [meta-webserver] hiawatha: update to 8.6 and disable caching by default

login
register
mail settings
Submitter ml@communistcode.co.uk
Date Nov. 6, 2012, 11:47 a.m.
Message ID <1352202451-5869-1-git-send-email-ml@communistcode.co.uk>
Download mbox | patch
Permalink /patch/38797/
State Superseded
Headers show

Comments

ml@communistcode.co.uk - Nov. 6, 2012, 11:47 a.m.
From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>

Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
---
 .../recipes-httpd/hiawatha/hiawatha_8.5.bb         | 45 ----------------------
 .../recipes-httpd/hiawatha/hiawatha_8.6.bb         | 45 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 45 deletions(-)
 delete mode 100644 meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb
 create mode 100644 meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb
Andrei Gherzan - Nov. 6, 2012, 12:45 p.m.
On Tue, Nov 6, 2012 at 11:47 AM, <ml@communistcode.co.uk> wrote:

> From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
>
> Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
> ---
>  .../recipes-httpd/hiawatha/hiawatha_8.5.bb         | 45
> ----------------------
>  .../recipes-httpd/hiawatha/hiawatha_8.6.bb         | 45
> ++++++++++++++++++++++
>  2 files changed, 45 insertions(+), 45 deletions(-)
>  delete mode 100644 meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb
>  create mode 100644 meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb
>
> diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bbb/meta-webserver/recipes-httpd/hiawatha/
> hiawatha_8.5.bb
> deleted file mode 100644
> index 71cc885..0000000
> --- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb
> +++ /dev/null
> @@ -1,45 +0,0 @@
> -DESCRIPTION = "Lightweight secure web server"
> -HOMEPAGE = "http://www.hiawatha-webserver.org"
> -LICENSE = "GPLv2"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
> -DEPENDS = "libxml2 libxslt"
> -
> -SECTION = "net"
> -
> -SRC_URI = "http://hiawatha-webserver.org/files/${PN}-${PV}.tar.gz \
> -           file://hiawatha-init"
> -
> -SRC_URI[md5sum] = "71d3903657953c93fc930758d158097d"
> -SRC_URI[sha256sum] =
> "2567e6b4b4c6666388087b586238e6e91a4afd80e10a879920020a097fcdc946"
> -
> -inherit cmake update-rc.d
> -
> -INITSCRIPT_NAME = "hiawatha"
> -INITSCRIPT_PARAMS = "defaults 70"
> -
> -EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \
> -                  -DENABLE_CACHE=ON \
> -                  -DENABLE_DEBUG=OFF \
> -                  -DENABLE_SSL=OFF \
> -                  -DENABLE_TOOLKIT=OFF \
> -                  -DENABLE_CHROOT=OFF \
> -                  -DENABLE_XSLT=ON \
> -                  -DENABLE_TOMAHAWK=OFF \
> -                  -DCMAKE_INSTALL_MANDIR=${mandir} \
> -                  -DCMAKE_INSTALL_BINDIR=${bindir} \
> -                  -DCMAKE_INSTALL_SBINDIR=${sbindir} \
> -                  -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \
> -                  -DCMAKE_INSTALL_LIBDIR=${libdir} \
> -                  -DLOG_DIR=/var/log/hiawatha \
> -                  -DPID_DIR=/var/run \
> -                  -DWEBROOT_DIR=/var/www/hiawatha \
> -                  -DWORK_DIR=/var/lib/hiawatha "
> -
> -do_install_append() {
> -
> -    # Copy over init script and sed in the correct sbin path
> -    sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init
> -    mkdir -p ${D}${sysconfdir}/init.d
> -    install -m 0755 ${WORKDIR}/hiawatha-init
> ${D}${sysconfdir}/init.d/hiawatha
> -
> -}
> diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bbb/meta-webserver/recipes-httpd/hiawatha/
> hiawatha_8.6.bb
> new file mode 100644
> index 0000000..2e6955e
> --- /dev/null
> +++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb
> @@ -0,0 +1,45 @@
> +DESCRIPTION = "Lightweight secure web server"
> +HOMEPAGE = "http://www.hiawatha-webserver.org"
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
> +DEPENDS = "libxml2 libxslt"
> +
> +SECTION = "net"
> +
> +SRC_URI = "http://hiawatha-webserver.org/files/${PN}-${PV}.tar.gz \
> +           file://hiawatha-init"
> +
> +SRC_URI[md5sum] = "372ea9e8329ed36e4fb781fdc1a6734c"
> +SRC_URI[sha256sum] =
> "1a7fa98ce66beb54fc8490cc787461d719a98cb0e4a81caedfa18ac8b5ba3b3b"
> +
> +inherit cmake update-rc.d
> +
> +INITSCRIPT_NAME = "hiawatha"
> +INITSCRIPT_PARAMS = "defaults 70"
> +
> +EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \
> +                  -DENABLE_CACHE=OFF \
>

I would like to see this in a separate commit. One for update and for for
disabling caching.


> +                  -DENABLE_DEBUG=OFF \
> +                  -DENABLE_SSL=OFF \
> +                  -DENABLE_TOOLKIT=OFF \
> +                  -DENABLE_CHROOT=OFF \
> +                  -DENABLE_XSLT=ON \
> +                  -DENABLE_TOMAHAWK=OFF \
> +                  -DCMAKE_INSTALL_MANDIR=${mandir} \
> +                  -DCMAKE_INSTALL_BINDIR=${bindir} \
> +                  -DCMAKE_INSTALL_SBINDIR=${sbindir} \
> +                  -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \
> +                  -DCMAKE_INSTALL_LIBDIR=${libdir} \
> +                  -DLOG_DIR=/var/log/hiawatha \
> +                  -DPID_DIR=/var/run \
> +                  -DWEBROOT_DIR=/var/www/hiawatha \
> +                  -DWORK_DIR=/var/lib/hiawatha "
> +
> +do_install_append() {
> +
> +    # Copy over init script and sed in the correct sbin path
> +    sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init
> +    mkdir -p ${D}${sysconfdir}/init.d
> +    install -m 0755 ${WORKDIR}/hiawatha-init
> ${D}${sysconfdir}/init.d/hiawatha
> +
> +}
> --
> 1.8.0
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Patch

diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb
deleted file mode 100644
index 71cc885..0000000
--- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.5.bb
+++ /dev/null
@@ -1,45 +0,0 @@ 
-DESCRIPTION = "Lightweight secure web server"
-HOMEPAGE = "http://www.hiawatha-webserver.org"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
-DEPENDS = "libxml2 libxslt"
-
-SECTION = "net"
-
-SRC_URI = "http://hiawatha-webserver.org/files/${PN}-${PV}.tar.gz \
-           file://hiawatha-init"
-
-SRC_URI[md5sum] = "71d3903657953c93fc930758d158097d"
-SRC_URI[sha256sum] = "2567e6b4b4c6666388087b586238e6e91a4afd80e10a879920020a097fcdc946"
-
-inherit cmake update-rc.d
-
-INITSCRIPT_NAME = "hiawatha"
-INITSCRIPT_PARAMS = "defaults 70"
-
-EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \
-                  -DENABLE_CACHE=ON \
-                  -DENABLE_DEBUG=OFF \
-                  -DENABLE_SSL=OFF \
-                  -DENABLE_TOOLKIT=OFF \
-                  -DENABLE_CHROOT=OFF \
-                  -DENABLE_XSLT=ON \
-                  -DENABLE_TOMAHAWK=OFF \
-                  -DCMAKE_INSTALL_MANDIR=${mandir} \
-                  -DCMAKE_INSTALL_BINDIR=${bindir} \
-                  -DCMAKE_INSTALL_SBINDIR=${sbindir} \
-                  -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \
-                  -DCMAKE_INSTALL_LIBDIR=${libdir} \
-                  -DLOG_DIR=/var/log/hiawatha \
-                  -DPID_DIR=/var/run \
-                  -DWEBROOT_DIR=/var/www/hiawatha \
-                  -DWORK_DIR=/var/lib/hiawatha "
-
-do_install_append() {
-
-    # Copy over init script and sed in the correct sbin path
-    sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init
-    mkdir -p ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/hiawatha-init ${D}${sysconfdir}/init.d/hiawatha
-
-}
diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb
new file mode 100644
index 0000000..2e6955e
--- /dev/null
+++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb
@@ -0,0 +1,45 @@ 
+DESCRIPTION = "Lightweight secure web server"
+HOMEPAGE = "http://www.hiawatha-webserver.org"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
+DEPENDS = "libxml2 libxslt"
+
+SECTION = "net"
+
+SRC_URI = "http://hiawatha-webserver.org/files/${PN}-${PV}.tar.gz \
+           file://hiawatha-init"
+
+SRC_URI[md5sum] = "372ea9e8329ed36e4fb781fdc1a6734c"
+SRC_URI[sha256sum] = "1a7fa98ce66beb54fc8490cc787461d719a98cb0e4a81caedfa18ac8b5ba3b3b"
+
+inherit cmake update-rc.d
+
+INITSCRIPT_NAME = "hiawatha"
+INITSCRIPT_PARAMS = "defaults 70"
+
+EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \
+                  -DENABLE_CACHE=OFF \
+                  -DENABLE_DEBUG=OFF \
+                  -DENABLE_SSL=OFF \
+                  -DENABLE_TOOLKIT=OFF \
+                  -DENABLE_CHROOT=OFF \
+                  -DENABLE_XSLT=ON \
+                  -DENABLE_TOMAHAWK=OFF \
+                  -DCMAKE_INSTALL_MANDIR=${mandir} \
+                  -DCMAKE_INSTALL_BINDIR=${bindir} \
+                  -DCMAKE_INSTALL_SBINDIR=${sbindir} \
+                  -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \
+                  -DCMAKE_INSTALL_LIBDIR=${libdir} \
+                  -DLOG_DIR=/var/log/hiawatha \
+                  -DPID_DIR=/var/run \
+                  -DWEBROOT_DIR=/var/www/hiawatha \
+                  -DWORK_DIR=/var/lib/hiawatha "
+
+do_install_append() {
+
+    # Copy over init script and sed in the correct sbin path
+    sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init
+    mkdir -p ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/hiawatha-init ${D}${sysconfdir}/init.d/hiawatha
+
+}