[OE-core] [PATCH 2/2] shadow: remove grpconv argc check

Saul Wold sgw at linux.intel.com
Thu Feb 28 04:44:00 UTC 2013


On 02/27/2013 04:58 AM, Martin Donnelly wrote:
> 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 at ge.com>
> ---
>   .../shadow/files/add_root_cmd_options.patch        |   12 +++++++++++-
>   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 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

This patch needs a header also with Upstream-Status: Signed-off-by: and 
a brief explaination (if needed).

Please review:

http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines

Thanks
	Sau!

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




More information about the Openembedded-core mailing list