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.

(From OE-Core rev: 845a24e78835e93807cfb810fa99715ac4d14e21)

Signed-off-by: Martin Donnelly <martin.donnelly@ge.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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 5edd3b8..ab87e35 100644 (file)
--- 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");