Patchwork [meta-webserver] cherokee: fix the installed but not shipped issue

login
register
mail settings
Submitter Robert Yang
Date Oct. 23, 2013, 9:14 a.m.
Message ID <1382519652-15717-1-git-send-email-liezhi.yang@windriver.com>
Download mbox | patch
Permalink /patch/60399/
State Superseded, archived
Headers show

Comments

Robert Yang - Oct. 23, 2013, 9:14 a.m.
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@windriver.com>
---
 meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb |    3 +++
 1 file changed, 3 insertions(+)
Robert Yang - Oct. 25, 2013, 2:36 a.m.
Changes of V2:

* Add the --with-wwwroot=${servicedir} to EXTRA_OECONF

// Robert

On 10/23/2013 05:14 PM, Robert Yang wrote:
> 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@windriver.com>
> ---
>   meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb |    3 +++
>   1 file changed, 3 insertions(+)
>
> 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..dff662a 100644
> --- a/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
> +++ b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
> @@ -48,6 +48,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} += "${servicedir}"
> +
>   CONFFILES_${PN} = " \
>                      ${sysconfdir}/cherokee/cherokee.conf \
>                      ${sysconfdir}/init.d/cherokee \
>
Khem Raj - Oct. 25, 2013, 12:22 p.m.
On Thu, Oct 24, 2013 at 7:36 PM, Robert Yang <liezhi.yang@windriver.com> wrote:
>> 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


while you are at it can you see if  /var/www is better known place for
this and add
the configure option to do so along with the packaging bits that you
already have
Robert Yang - Oct. 26, 2013, 5:58 a.m.
On 10/25/2013 08:22 PM, Khem Raj wrote:
> On Thu, Oct 24, 2013 at 7:36 PM, Robert Yang <liezhi.yang@windriver.com> wrote:
>>> 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
>
>
> while you are at it can you see if  /var/www is better known place for
> this and add

Good idea, the V3 is comming.

* Changes of V3:

- Use /var/www/cherokee rather than /srv for --with-wwwroot as Khem suggested,
   this also used by Fedora 17.

// Robert

> the configure option to do so along with the packaging bits that you
> already have
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>

Patch

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..dff662a 100644
--- a/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
+++ b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
@@ -48,6 +48,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} += "${servicedir}"
+
 CONFFILES_${PN} = " \
                    ${sysconfdir}/cherokee/cherokee.conf \
                    ${sysconfdir}/init.d/cherokee \