* [meta-webserver] [PATCH] cherokee: fix the installed but not shipped issue
@ 2013-10-23 9:14 Robert Yang
2013-10-25 2:36 ` Updated V2 " Robert Yang
2013-10-25 2:37 ` [meta-webserver V2] " Robert Yang
0 siblings, 2 replies; 6+ messages in thread
From: Robert Yang @ 2013-10-23 9:14 UTC (permalink / raw)
To: openembedded-devel
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 \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Updated V2 Re: [meta-webserver] [PATCH] cherokee: fix the installed but not shipped issue
2013-10-23 9:14 [meta-webserver] [PATCH] cherokee: fix the installed but not shipped issue Robert Yang
@ 2013-10-25 2:36 ` Robert Yang
2013-10-25 12:22 ` Khem Raj
2013-10-25 2:37 ` [meta-webserver V2] " Robert Yang
1 sibling, 1 reply; 6+ messages in thread
From: Robert Yang @ 2013-10-25 2:36 UTC (permalink / raw)
To: openembedded-devel
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 \
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [meta-webserver V2] [PATCH] cherokee: fix the installed but not shipped issue
2013-10-23 9:14 [meta-webserver] [PATCH] cherokee: fix the installed but not shipped issue Robert Yang
2013-10-25 2:36 ` Updated V2 " Robert Yang
@ 2013-10-25 2:37 ` Robert Yang
2013-10-26 5:59 ` [meta-webserver] [PATCH V3] " Robert Yang
1 sibling, 1 reply; 6+ messages in thread
From: Robert Yang @ 2013-10-25 2:37 UTC (permalink / raw)
To: openembedded-devel
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 | 4 ++++
1 file changed, 4 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..ddd93f1 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=${servicedir} \
"
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} += "${servicedir}"
+
CONFFILES_${PN} = " \
${sysconfdir}/cherokee/cherokee.conf \
${sysconfdir}/init.d/cherokee \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: Updated V2 Re: [meta-webserver] [PATCH] cherokee: fix the installed but not shipped issue
2013-10-25 2:36 ` Updated V2 " Robert Yang
@ 2013-10-25 12:22 ` Khem Raj
2013-10-26 5:58 ` Robert Yang
0 siblings, 1 reply; 6+ messages in thread
From: Khem Raj @ 2013-10-25 12:22 UTC (permalink / raw)
To: openembeded-devel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Updated V2 Re: [meta-webserver] [PATCH] cherokee: fix the installed but not shipped issue
2013-10-25 12:22 ` Khem Raj
@ 2013-10-26 5:58 ` Robert Yang
0 siblings, 0 replies; 6+ messages in thread
From: Robert Yang @ 2013-10-26 5:58 UTC (permalink / raw)
To: openembedded-devel
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
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [meta-webserver] [PATCH V3] cherokee: fix the installed but not shipped issue
2013-10-25 2:37 ` [meta-webserver V2] " Robert Yang
@ 2013-10-26 5:59 ` Robert Yang
0 siblings, 0 replies; 6+ messages in thread
From: Robert Yang @ 2013-10-26 5:59 UTC (permalink / raw)
To: openembedded-devel
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 | 4 ++++
1 file changed, 4 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..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 \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-10-26 5:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-23 9:14 [meta-webserver] [PATCH] cherokee: fix the installed but not shipped issue Robert Yang
2013-10-25 2:36 ` Updated V2 " Robert Yang
2013-10-25 12:22 ` Khem Raj
2013-10-26 5:58 ` Robert Yang
2013-10-25 2:37 ` [meta-webserver V2] " Robert Yang
2013-10-26 5:59 ` [meta-webserver] [PATCH V3] " Robert Yang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox