Patchwork [meta-webserver,1/1] nostromo: make sure usr/group www-data exist

login
register
mail settings
Submitter Joe Slater
Date Aug. 9, 2013, 5:31 p.m.
Message ID <1376069480-19679-2-git-send-email-jslater@windriver.com>
Download mbox | patch
Permalink /patch/55435/
State Accepted, archived
Headers show

Comments

Joe Slater - Aug. 9, 2013, 5:31 p.m.
CQID: 422203

nostromo runs as user/group www-data and needs these
to exist when we install it.

Signed-off-by: Joe Slater <jslater@windriver.com>
---
 recipes-httpd/nostromo/nostromo_1.9.5.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
Paul Eggleton - Aug. 13, 2013, 7:52 a.m.
Hi Joe,

On Friday 09 August 2013 10:31:20 Joe Slater wrote:
> CQID: 422203
> 
> nostromo runs as user/group www-data and needs these
> to exist when we install it.
> 
> Signed-off-by: Joe Slater <jslater@windriver.com>
> ---
>  recipes-httpd/nostromo/nostromo_1.9.5.bb |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletions(-)
> 
> diff --git a/recipes-httpd/nostromo/nostromo_1.9.5.bb
> b/recipes-httpd/nostromo/nostromo_1.9.5.bb index 94c32d8..98195b1 100644
> --- a/recipes-httpd/nostromo/nostromo_1.9.5.bb
> +++ b/recipes-httpd/nostromo/nostromo_1.9.5.bb
> @@ -17,7 +17,7 @@ TARGET_CC_ARCH += "${LDFLAGS}"
> 
>  DEPENDS = "openssl"
> 
> -inherit update-rc.d
> +inherit update-rc.d useradd
> 
>  INITSCRIPT_NAME = "nostromo"
>  INITSCRIPT_PARAMS = "defaults 70"
> @@ -26,6 +26,11 @@ do_compile() {
>      oe_runmake
>  }
> 
> +# we need user/group www-data to exist when we install
> +#
> +USERADD_PACKAGES = "${PN}"
> +USERADD_PARAM_${PN} = "--system -g www-data www-data"
> +
>  do_install() {
>      install -d ${D}/${sbindir}
>      install -m 0755 src/nhttpd/nhttpd ${D}/${sbindir}/nhttpd

I've applied this, but it was actually against the wrong directory path. In 
future could you please send patches generated against meta-oe?

Thanks,
Paul

Patch

diff --git a/recipes-httpd/nostromo/nostromo_1.9.5.bb b/recipes-httpd/nostromo/nostromo_1.9.5.bb
index 94c32d8..98195b1 100644
--- a/recipes-httpd/nostromo/nostromo_1.9.5.bb
+++ b/recipes-httpd/nostromo/nostromo_1.9.5.bb
@@ -17,7 +17,7 @@  TARGET_CC_ARCH += "${LDFLAGS}"
 
 DEPENDS = "openssl"
 
-inherit update-rc.d
+inherit update-rc.d useradd
 
 INITSCRIPT_NAME = "nostromo"
 INITSCRIPT_PARAMS = "defaults 70"
@@ -26,6 +26,11 @@  do_compile() {
     oe_runmake
 }
 
+# we need user/group www-data to exist when we install
+#
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system -g www-data www-data"
+
 do_install() {
     install -d ${D}/${sbindir}
     install -m 0755 src/nhttpd/nhttpd ${D}/${sbindir}/nhttpd