From: Martin Donnelly <martin.donnelly@ge.com>
Date: Wed, 27 Feb 2013 12:58:55 +0000 (+0000)
Subject: shadow: remove grpconv argc check
X-Git-Tag: rev_ivi_2015_02_04~13542
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=535f1189fe4f1335b03a509c21637ad1d16793ce;p=scm%2Fbb%2Ftizen-distro.git

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
--- 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");