summaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
authorDerek Straka <derek@asterius.io>2016-08-10 13:58:54 -0400
committerMartin Jansa <Martin.Jansa@gmail.com>2016-08-15 12:32:00 +0200
commit66e683069b1cedf7004ed38cb935f9d4b823d0f5 (patch)
tree46553b8abd2ecd6545943eeb43fafc7b349304ff /meta-webserver
parent1a8e7aac9ec7f108c5b6b775a39decf5c1e66ff9 (diff)
downloadmeta-openembedded-66e683069b1cedf7004ed38cb935f9d4b823d0f5.tar.gz
hiawatha: update to version 10.3
Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r--meta-webserver/recipes-httpd/hiawatha/hiawatha_10.3.bb (renamed from meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb)13
1 files changed, 6 insertions, 7 deletions
diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.3.bb
index 706217479..7b6ab2636 100644
--- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb
+++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.3.bb
@@ -10,8 +10,8 @@ SRC_URI = "http://hiawatha-webserver.org/files/${BP}.tar.gz \
10 file://hiawatha-init \ 10 file://hiawatha-init \
11 file://hiawatha.service " 11 file://hiawatha.service "
12 12
13SRC_URI[md5sum] = "a77f044634884c4cc5d21dab44e822a3" 13SRC_URI[md5sum] = "31567dfc18d435bd419be279f7970019"
14SRC_URI[sha256sum] = "5d9cdec51c618bb3efab747030e593d9bd49dfaf3236254c8e0cb60715716dbf" 14SRC_URI[sha256sum] = "99d185fb16bb1ab706724494d3cac86464f1485ed4b0fff09a192eca6da5ff8e"
15 15
16INITSCRIPT_NAME = "hiawatha" 16INITSCRIPT_NAME = "hiawatha"
17INITSCRIPT_PARAMS = "defaults 70" 17INITSCRIPT_PARAMS = "defaults 70"
@@ -33,10 +33,7 @@ EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \
33 -DCMAKE_INSTALL_SBINDIR=${sbindir} \ 33 -DCMAKE_INSTALL_SBINDIR=${sbindir} \
34 -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \ 34 -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \
35 -DCMAKE_INSTALL_LIBDIR=${libdir} \ 35 -DCMAKE_INSTALL_LIBDIR=${libdir} \
36 -DLOG_DIR=/var/log/hiawatha \ 36 -DCMAKE_INSTALL_FULL_LOCALSTATEDIR=${localstatedir}"
37 -DPID_DIR=/var/run \
38 -DWEBROOT_DIR=/var/www/hiawatha \
39 -DWORK_DIR=/var/lib/hiawatha "
40 37
41do_install_append() { 38do_install_append() {
42 # Copy over init script and sed in the correct sbin path 39 # Copy over init script and sed in the correct sbin path
@@ -53,7 +50,7 @@ do_install_append() {
53 install -m 644 ${WORKDIR}/hiawatha.service ${D}/${systemd_unitdir}/system 50 install -m 644 ${WORKDIR}/hiawatha.service ${D}/${systemd_unitdir}/system
54 fi 51 fi
55 52
56 rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" 53 rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" "${D}${localstatedir}/run"
57} 54}
58 55
59CONFFILES_${PN} = " \ 56CONFFILES_${PN} = " \
@@ -63,3 +60,5 @@ CONFFILES_${PN} = " \
63 ${sysconfdir}/hiawatha/mimetype.conf \ 60 ${sysconfdir}/hiawatha/mimetype.conf \
64 ${sysconfdir}/hiawatha/php-fcgi.conf \ 61 ${sysconfdir}/hiawatha/php-fcgi.conf \
65" 62"
63
64FILES_${PN}-dev = "${libdir}/hiawatha/*${SOLIBSDEV}"