* [PATCH 1/2] shadow: add build dependency on shadow-native
@ 2013-02-27 12:58 Martin Donnelly
2013-02-27 12:58 ` [PATCH 2/2] shadow: remove grpconv argc check Martin Donnelly
0 siblings, 1 reply; 4+ messages in thread
From: Martin Donnelly @ 2013-02-27 12:58 UTC (permalink / raw)
To: openembedded-core
The postinst requires patched pwconv and grpconv from shadow-native,
without these the rootfs creation uses the host binaries and fails.
Signed-off-by: Martin Donnelly <martin.donnelly@ge.com>
---
meta/recipes-extended/shadow/shadow_4.1.4.3.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
index 4a0dbd9..8226a6e 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -7,7 +7,8 @@ LICENSE = "BSD | Artistic-1.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
file://src/passwd.c;beginline=8;endline=30;md5=d83888ea14ae61951982d77125947661"
-DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
+DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \
+ shadow-native"
RDEPENDS_${PN} = "shadow-securetty ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)} \
base-passwd"
PR = "r13"
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] shadow: remove grpconv argc check
2013-02-27 12:58 [PATCH 1/2] shadow: add build dependency on shadow-native Martin Donnelly
@ 2013-02-27 12:58 ` Martin Donnelly
2013-02-28 4:44 ` Saul Wold
0 siblings, 1 reply; 4+ messages in thread
From: Martin Donnelly @ 2013-02-27 12:58 UTC (permalink / raw)
To: openembedded-core
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>
---
.../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
@@ -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");
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] shadow: remove grpconv argc check
2013-02-27 12:58 ` [PATCH 2/2] shadow: remove grpconv argc check Martin Donnelly
@ 2013-02-28 4:44 ` Saul Wold
2013-02-28 15:18 ` Martin Donnelly
0 siblings, 1 reply; 4+ messages in thread
From: Saul Wold @ 2013-02-28 4:44 UTC (permalink / raw)
To: Martin Donnelly; +Cc: openembedded-core
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@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");
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] shadow: remove grpconv argc check
2013-02-28 4:44 ` Saul Wold
@ 2013-02-28 15:18 ` Martin Donnelly
0 siblings, 0 replies; 4+ messages in thread
From: Martin Donnelly @ 2013-02-28 15:18 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
On 28/02/2013 04:44, Saul Wold wrote:
> 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@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).
>
The existing patch already has the header and Upstream-Status in it, my
patch to it simply makes the behaviour of the modified pwconv and
grpconv in shadow-native consistent. I'll resend this patch with the
Signed-off-by added to the header if you still want that?
Thanks
Martin
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-02-28 15:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-27 12:58 [PATCH 1/2] shadow: add build dependency on shadow-native Martin Donnelly
2013-02-27 12:58 ` [PATCH 2/2] shadow: remove grpconv argc check Martin Donnelly
2013-02-28 4:44 ` Saul Wold
2013-02-28 15:18 ` Martin Donnelly
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.