[oe-commits] Robert Yang : cherokee: fix the installed but not shipped issue

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: b71a6567f84e13593aec6f3a6ad4f9e9e0c15c3f
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=b71a6567f84e13593aec6f3a6ad4f9e9e0c15c3f

Author: Robert Yang <liezhi.yang at windriver.com>
Date:   Sat Oct 26 01:59:26 2013 -0400

cherokee: fix the installed but not shipped issue

We will get the following ERROR/WARN if we enable the
installed-vs-shipped check in QA:

ERROR: QA Issue: cherokee: Files/directories were installed but not shipped
  /srv
  /srv/www
  /srv/www/htdocs
  /srv/www/htdocs/index.html
  /srv/www/htdocs/images
  /srv/www/htdocs/images/cherokee-logo.png
  /srv/www/htdocs/images/default-bg.png
  /srv/www/htdocs/images/favicon.ico
  /srv/www/htdocs/images/powered_by_cherokee.png

I think that we can pack these files into cherokee just like what
apache2 does.

Fedora 17 also packs them

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>

---

 .../recipes-httpd/cherokee/cherokee_1.2.98.bb      |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
index 2014ea1..2a732d5 100644
--- a/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
+++ b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
@@ -25,6 +25,7 @@ PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap"
 EXTRA_OECONF = "--disable-static \
                 --disable-nls \
                ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \
+               --with-wwwroot=${localstatedir}/www/cherokee \
 "
 
 do_install_append () {
@@ -48,6 +49,9 @@ FILES_libcherokee-server = "${libdir}/libcherokee-server${SOLIBS}"
 FILES_libcherokee-client = "${libdir}/libcherokee-client${SOLIBS}"
 FILES_libcherokee-base = "${libdir}/libcherokee-base${SOLIBS}"
 
+# Pack the htdocs
+FILES_${PN} += "${localstatedir}/www/cherokee"
+
 CONFFILES_${PN} = " \
                    ${sysconfdir}/cherokee/cherokee.conf \
                    ${sysconfdir}/init.d/cherokee \