diff options
| author | Derek Straka <derek@asterius.io> | 2016-07-29 10:25:07 -0400 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-08-08 13:46:48 +0200 |
| commit | aac86aa1b06932d262fa02e2125e4a40cd6d8c11 (patch) | |
| tree | 8149ceb23dffaa4069a23af5d5ea31277892b8fc | |
| parent | da81d9ef8d052c1884abd8dc0d5354f2e9a23cc4 (diff) | |
| download | meta-openembedded-aac86aa1b06932d262fa02e2125e4a40cd6d8c11.tar.gz | |
nostromo: remove useradd of a user already provided by base-passwd
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb b/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb index e06a6965fc..7d660ce0a3 100644 --- a/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb +++ b/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb | |||
| @@ -18,7 +18,7 @@ TARGET_CC_ARCH += "${LDFLAGS}" | |||
| 18 | 18 | ||
| 19 | DEPENDS = "openssl" | 19 | DEPENDS = "openssl" |
| 20 | 20 | ||
| 21 | inherit update-rc.d useradd | 21 | inherit update-rc.d |
| 22 | 22 | ||
| 23 | INITSCRIPT_NAME = "nostromo" | 23 | INITSCRIPT_NAME = "nostromo" |
| 24 | INITSCRIPT_PARAMS = "defaults 70" | 24 | INITSCRIPT_PARAMS = "defaults 70" |
| @@ -27,11 +27,6 @@ do_compile() { | |||
| 27 | oe_runmake | 27 | oe_runmake |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | # we need user/group www-data to exist when we install | ||
| 31 | # | ||
| 32 | USERADD_PACKAGES = "${PN}" | ||
| 33 | USERADD_PARAM_${PN} = "--system -g www-data www-data" | ||
| 34 | |||
| 35 | do_install() { | 30 | do_install() { |
| 36 | install -d ${D}/${sbindir} | 31 | install -d ${D}/${sbindir} |
| 37 | install -m 0755 src/nhttpd/nhttpd ${D}/${sbindir}/nhttpd | 32 | install -m 0755 src/nhttpd/nhttpd ${D}/${sbindir}/nhttpd |
