summaryrefslogtreecommitdiff
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorMartin Donnelly <martin.donnelly@ge.com>2013-02-27 12:58:55 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-01 12:58:13 +0000
commit845a24e78835e93807cfb810fa99715ac4d14e21 (patch)
tree97364e1cb0c20d26522981109f580cc405b2f1c1 /meta/recipes-extended
parentbff4bda1fe86ddd218a192a14605924205a5300b (diff)
downloadopenembedded-core-845a24e78835e93807cfb810fa99715ac4d14e21.tar.gz
openembedded-core-845a24e78835e93807cfb810fa99715ac4d14e21.tar.bz2
openembedded-core-845a24e78835e93807cfb810fa99715ac4d14e21.zip
shadow: remove grpconv argc check
The patched version of grpconv takes arguments but the check on argc was not removed. This patch removes this check which otherwise results in a spurious warning during rootfs creation. Signed-off-by: Martin Donnelly <martin.donnelly@ge.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/shadow/files/add_root_cmd_options.patch12
1 files changed, 11 insertions, 1 deletions
diff --git a/meta/recipes-extended/shadow/files/add_root_cmd_options.patch b/meta/recipes-extended/shadow/files/add_root_cmd_options.patch
index 5edd3b8744..ab87e35535 100644
--- a/meta/recipes-extended/shadow/files/add_root_cmd_options.patch
+++ b/meta/recipes-extended/shadow/files/add_root_cmd_options.patch
@@ -528,7 +528,17 @@ diff -urN shadow-4.1.4.3.orig//src/grpconv.c shadow-4.1.4.3//src/grpconv.c
int main (int argc, char **argv)
{
const struct group *gr;
-@@ -100,6 +183,8 @@
+@@ -89,9 +172,6 @@
+ const struct sgrp *sg;
+ struct sgrp sgent;
+
+- if (1 != argc) {
+- (void) fputs (_("Usage: grpconv\n"), stderr);
+- }
+ Prog = Basename (argv[0]);
+
+ (void) setlocale (LC_ALL, "");
+@@ -100,6 +180,8 @@
OPENLOG ("grpconv");