[meta-oe, meta-webserver][PATCH 0/2] Move some recipes to meta-webserver

[meta-oe, meta-webserver][PATCH 0/2] Move some recipes to meta-webserver

[Paul Eggleton]

The following changes since commit bea2397361da080df1256046b927b454e2e5fc9a:

  libical: remove (2013-04-16 18:16:30 +0200)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib paule/meta-webserver-moves
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/meta-webserver-moves

Paul Eggleton (2):
  cherokee: move to meta-webserver and tweak
  nostromo: move to meta-webserver and tweak

 .../recipes-httpd}/cherokee/cherokee/cherokee.init              |    0
 .../recipes-httpd}/cherokee/cherokee_1.2.98.bb                  |    4 ++--
 ...0001-GNUmakefile-add-possibility-to-override-variables.patch |    0
 .../recipes-httpd}/nostromo/files/nhttpd.conf                   |    0
 .../recipes-httpd}/nostromo/files/nostromo                      |    0
 .../recipes-httpd}/nostromo/files/volatiles                     |    0
 .../recipes-httpd}/nostromo/nostromo_1.9.5.bb                   |    7 ++++---
 7 files changed, 6 insertions(+), 5 deletions(-)
 rename {meta-oe/recipes-connectivity => meta-webserver/recipes-httpd}/cherokee/cherokee/cherokee.init (100%)
 rename {meta-oe/recipes-connectivity => meta-webserver/recipes-httpd}/cherokee/cherokee_1.2.98.bb (93%)
 rename {meta-oe/recipes-extended => meta-webserver/recipes-httpd}/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch (100%)
 rename {meta-oe/recipes-extended => meta-webserver/recipes-httpd}/nostromo/files/nhttpd.conf (100%)
 rename {meta-oe/recipes-extended => meta-webserver/recipes-httpd}/nostromo/files/nostromo (100%)
 rename {meta-oe/recipes-extended => meta-webserver/recipes-httpd}/nostromo/files/volatiles (100%)
 rename {meta-oe/recipes-extended => meta-webserver/recipes-httpd}/nostromo/nostromo_1.9.5.bb (97%)

-- 
1.7.10.4

[meta-oe, meta-webserver][PATCH 1/2] cherokee: move to meta-webserver and tweak

[Paul Eggleton]

* Set SUMMARY instead of DESCRIPTION

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../recipes-httpd}/cherokee/cherokee/cherokee.init                 |    0
 .../recipes-httpd}/cherokee/cherokee_1.2.98.bb                     |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename {meta-oe/recipes-connectivity => meta-webserver/recipes-httpd}/cherokee/cherokee/cherokee.init (100%)
 rename {meta-oe/recipes-connectivity => meta-webserver/recipes-httpd}/cherokee/cherokee_1.2.98.bb (93%)

diff --git a/meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.init b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init
similarity index 100%
rename from meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.init
rename to meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init
diff --git a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
similarity index 93%
rename from meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
rename to meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
index 6c030a6..1510e70 100644
--- a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
+++ b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
@@ -1,5 +1,5 @@
-DESCRIPTION = "Cherokee Web Server fast and secure"
-DESCRIPTION_cget = "Small downloader based in the Cherokee client library"
+SUMMARY = "Cherokee Web Server fast and secure"
+SUMMARY_cget = "Small downloader based in the Cherokee client library"
 HOMEPAGE = "http://www.cherokee-project.com/"
 SECTION = "network"
 LICENSE = "GPLv2"
-- 
1.7.10.4

[meta-oe, meta-webserver][PATCH 2/2] nostromo: move to meta-webserver and tweak

[Paul Eggleton]

* Add SUMMARY
* Move SRC_URI checksums next to SRC_URI

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 ...0001-GNUmakefile-add-possibility-to-override-variables.patch |    0
 .../recipes-httpd}/nostromo/files/nhttpd.conf                   |    0
 .../recipes-httpd}/nostromo/files/nostromo                      |    0
 .../recipes-httpd}/nostromo/files/volatiles                     |    0
 .../recipes-httpd}/nostromo/nostromo_1.9.5.bb                   |    7 ++++---
 5 files changed, 4 insertions(+), 3 deletions(-)
 rename {meta-oe/recipes-extended => meta-webserver/recipes-httpd}/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch (100%)
 rename {meta-oe/recipes-extended => meta-webserver/recipes-httpd}/nostromo/files/nhttpd.conf (100%)
 rename {meta-oe/recipes-extended => meta-webserver/recipes-httpd}/nostromo/files/nostromo (100%)
 rename {meta-oe/recipes-extended => meta-webserver/recipes-httpd}/nostromo/files/volatiles (100%)
 rename {meta-oe/recipes-extended => meta-webserver/recipes-httpd}/nostromo/nostromo_1.9.5.bb (97%)

diff --git a/meta-oe/recipes-extended/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch b/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch
similarity index 100%
rename from meta-oe/recipes-extended/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch
rename to meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch
diff --git a/meta-oe/recipes-extended/nostromo/files/nhttpd.conf b/meta-webserver/recipes-httpd/nostromo/files/nhttpd.conf
similarity index 100%
rename from meta-oe/recipes-extended/nostromo/files/nhttpd.conf
rename to meta-webserver/recipes-httpd/nostromo/files/nhttpd.conf
diff --git a/meta-oe/recipes-extended/nostromo/files/nostromo b/meta-webserver/recipes-httpd/nostromo/files/nostromo
similarity index 100%
rename from meta-oe/recipes-extended/nostromo/files/nostromo
rename to meta-webserver/recipes-httpd/nostromo/files/nostromo
diff --git a/meta-oe/recipes-extended/nostromo/files/volatiles b/meta-webserver/recipes-httpd/nostromo/files/volatiles
similarity index 100%
rename from meta-oe/recipes-extended/nostromo/files/volatiles
rename to meta-webserver/recipes-httpd/nostromo/files/volatiles
diff --git a/meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb b/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb
similarity index 97%
rename from meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb
rename to meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb
index fa9645a..e66676e 100644
--- a/meta-oe/recipes-extended/nostromo/nostromo_1.9.5.bb
+++ b/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb
@@ -1,3 +1,4 @@
+SUMMARY = "A simple, fast and secure HTTP server"
 HOMEPAGE = "http://www.nazgul.ch/dev_nostromo.html"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://src/nhttpd/main.c;beginline=2;endline=14;md5=e5ec3fa723b29b7d59d205afd8d36938"
@@ -9,6 +10,9 @@ SRC_URI = "http://www.nazgul.ch/dev/${PN}-${PV}.tar.gz \
            file://nostromo \
 "
 
+SRC_URI[md5sum] = "dc6cfd6b5aae04c370c7f818fa7bde55"
+SRC_URI[sha256sum] = "5f62578285e02449406b46cf06a7888fe3dc4a90bedf58cc18523bad62f6b914"
+
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 DEPENDS = "openssl"
@@ -45,7 +49,4 @@ do_install() {
     chown -R www-data:www-data ${D}/${localstatedir}/nostromo ${D}/${localstatedir}/log/nostromo ${D}/${localstatedir}/run/nostromo
 }
 
-SRC_URI[md5sum] = "dc6cfd6b5aae04c370c7f818fa7bde55"
-SRC_URI[sha256sum] = "5f62578285e02449406b46cf06a7888fe3dc4a90bedf58cc18523bad62f6b914"
-
 CONFFILES_${PN} += "/var/nostromo/conf/mimes ${sysconfdir}/nhttpd.conf"
-- 
1.7.10.4

Re: [meta-oe, meta-webserver][PATCH 1/2] cherokee: move to meta-webserver and tweak

[Jack Mitchell]

On 18/04/13 07:39, Paul Eggleton wrote:
> * Set SUMMARY instead of DESCRIPTION
>
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>   .../recipes-httpd}/cherokee/cherokee/cherokee.init                 |    0
>   .../recipes-httpd}/cherokee/cherokee_1.2.98.bb                     |    4 ++--
>   2 files changed, 2 insertions(+), 2 deletions(-)
>   rename {meta-oe/recipes-connectivity => meta-webserver/recipes-httpd}/cherokee/cherokee/cherokee.init (100%)
>   rename {meta-oe/recipes-connectivity => meta-webserver/recipes-httpd}/cherokee/cherokee_1.2.98.bb (93%)
>
> diff --git a/meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.init b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init
> similarity index 100%
> rename from meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.init
> rename to meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init
> diff --git a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
> similarity index 93%
> rename from meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
> rename to meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
> index 6c030a6..1510e70 100644
> --- a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
> +++ b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
> @@ -1,5 +1,5 @@
> -DESCRIPTION = "Cherokee Web Server fast and secure"
> -DESCRIPTION_cget = "Small downloader based in the Cherokee client library"
> +SUMMARY = "Cherokee Web Server fast and secure"
> +SUMMARY_cget = "Small downloader based in the Cherokee client library"
>   HOMEPAGE = "http://www.cherokee-project.com/"
>   SECTION = "network"
>   LICENSE = "GPLv2"

Building this morning I received this warning:

WARNING: Unable to get checksum for cherokee SRC_URI entry 
cherokee.service: file could not be found

On a second build it disappeared, something to look into?

Cheers,



-- 

   Jack Mitchell (jack@embed.me.uk)
   Embedded Systems Engineer
   http://www.embed.me.uk

--

Re: [meta-oe, meta-webserver][PATCH 1/2] cherokee: move to meta-webserver and tweak

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2702 bytes --]

On Fri, Apr 19, 2013 at 09:45:28AM +0100, Jack Mitchell wrote:
> On 18/04/13 07:39, Paul Eggleton wrote:
> > * Set SUMMARY instead of DESCRIPTION
> >
> > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> > ---
> >   .../recipes-httpd}/cherokee/cherokee/cherokee.init                 |    0
> >   .../recipes-httpd}/cherokee/cherokee_1.2.98.bb                     |    4 ++--
> >   2 files changed, 2 insertions(+), 2 deletions(-)
> >   rename {meta-oe/recipes-connectivity => meta-webserver/recipes-httpd}/cherokee/cherokee/cherokee.init (100%)
> >   rename {meta-oe/recipes-connectivity => meta-webserver/recipes-httpd}/cherokee/cherokee_1.2.98.bb (93%)
> >
> > diff --git a/meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.init b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init
> > similarity index 100%
> > rename from meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.init
> > rename to meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init
> > diff --git a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
> > similarity index 93%
> > rename from meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
> > rename to meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
> > index 6c030a6..1510e70 100644
> > --- a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
> > +++ b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
> > @@ -1,5 +1,5 @@
> > -DESCRIPTION = "Cherokee Web Server fast and secure"
> > -DESCRIPTION_cget = "Small downloader based in the Cherokee client library"
> > +SUMMARY = "Cherokee Web Server fast and secure"
> > +SUMMARY_cget = "Small downloader based in the Cherokee client library"
> >   HOMEPAGE = "http://www.cherokee-project.com/"
> >   SECTION = "network"
> >   LICENSE = "GPLv2"
> 
> Building this morning I received this warning:
> 
> WARNING: Unable to get checksum for cherokee SRC_URI entry 
> cherokee.service: file could not be found
> 
> On a second build it disappeared, something to look into?

Thanks for report..

pushing
$ git mv
./meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.service
meta-webserver/recipes-httpd/cherokee/cherokee/

now
> 
> Cheers,
> 
> 
> 
> -- 
> 
>    Jack Mitchell (jack@embed.me.uk)
>    Embedded Systems Engineer
>    http://www.embed.me.uk
> 
> --
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-oe, meta-webserver][PATCH 1/2] cherokee: move to meta-webserver and tweak

[Paul Eggleton]

On Friday 19 April 2013 11:33:25 Martin Jansa wrote:
> On Fri, Apr 19, 2013 at 09:45:28AM +0100, Jack Mitchell wrote:
> > On 18/04/13 07:39, Paul Eggleton wrote:
> > > * Set SUMMARY instead of DESCRIPTION
> > > 
> > > Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> > > ---
> > > 
> > >   .../recipes-httpd}/cherokee/cherokee/cherokee.init                 |  
> > >    0
> > >   .../recipes-httpd}/cherokee/cherokee_1.2.98.bb                     |  
> > >    4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-)
> > >   rename {meta-oe/recipes-connectivity =>
> > >   meta-webserver/recipes-httpd}/cherokee/cherokee/cherokee.init (100%)
> > >   rename {meta-oe/recipes-connectivity =>
> > >   meta-webserver/recipes-httpd}/cherokee/cherokee_1.2.98.bb (93%)> > 
> > > diff --git
> > > a/meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.init
> > > b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init
> > > similarity index 100%
> > > rename from meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.init
> > > rename to meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init
> > > diff --git a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
> > > b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb similarity
> > > index 93%
> > > rename from meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
> > > rename to meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
> > > index 6c030a6..1510e70 100644
> > > --- a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
> > > +++ b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
> > > @@ -1,5 +1,5 @@
> > > -DESCRIPTION = "Cherokee Web Server fast and secure"
> > > -DESCRIPTION_cget = "Small downloader based in the Cherokee client
> > > library"
> > > +SUMMARY = "Cherokee Web Server fast and secure"
> > > +SUMMARY_cget = "Small downloader based in the Cherokee client library"
> > > 
> > >   HOMEPAGE = "http://www.cherokee-project.com/"
> > >   SECTION = "network"
> > >   LICENSE = "GPLv2"
> > 
> > Building this morning I received this warning:
> > 
> > WARNING: Unable to get checksum for cherokee SRC_URI entry
> > cherokee.service: file could not be found
> > 
> > On a second build it disappeared, something to look into?
> 
> Thanks for report..
> 
> pushing
> $ git mv
> ./meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.service
> meta-webserver/recipes-httpd/cherokee/cherokee/

This was my fault for rebasing an earlier commit without checking, sorry about 
that.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre