[oe-commits] Laszlo Papp : meta/recipes-core/base-passwd/base-passwd/noshadow.patch: Split it into two parts

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 0ca984f32682151cfeff852167f0174aca20a8bc
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0ca984f32682151cfeff852167f0174aca20a8bc

Author: Laszlo Papp <lpapp at kde.org>
Date:   Thu Jan 30 18:41:35 2014 +0000

meta/recipes-core/base-passwd/base-passwd/noshadow.patch: Split it into two parts

The current change contains two different logics resulting that users like me
may need to partially override the behavior of it. It would be easier for end
users to keep one change while dropping the other if needed, like in our case.

Signed-off-by: Laszlo Papp <lpapp at kde.org>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-core/base-passwd/base-passwd/nobash.patch   | 10 +---------
 meta/recipes-core/base-passwd/base-passwd/noshadow.patch | 14 ++++++++++++++
 meta/recipes-core/base-passwd/base-passwd_3.5.29.bb      |  1 +
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-core/base-passwd/base-passwd/nobash.patch b/meta/recipes-core/base-passwd/base-passwd/nobash.patch
index 6371576..eed87db 100644
--- a/meta/recipes-core/base-passwd/base-passwd/nobash.patch
+++ b/meta/recipes-core/base-passwd/base-passwd/nobash.patch
@@ -1,14 +1,6 @@
 use /bin/sh instead of /bin/bash, since the latter may not be included in
 some images such as minimal
 
-comment added by Kevin Tian <kevin.tian at intel.com>, 2010-07-06
-
-remove "*" for root since we don't have a /etc/shadow so far.
-
-by Kevin Tian <kevin.tian at intel.com>, 2010-07-06
-
-Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-
 Upstream-Status: Invalid [configuration]
 
 Signed-off-by: Scott Garman <scott.a.garman at intel.com>
@@ -17,7 +9,7 @@ Signed-off-by: Scott Garman <scott.a.garman at intel.com>
 +++ base-passwd/passwd.master
 @@ -1,4 +1,4 @@
 -root:*:0:0:root:/root:/bin/bash
-+root::0:0:root:/root:/bin/sh
++root:*:0:0:root:/root:/bin/sh
  daemon:*:1:1:daemon:/usr/sbin:/bin/sh
  bin:*:2:2:bin:/bin:/bin/sh
  sys:*:3:3:sys:/dev:/bin/sh
diff --git a/meta/recipes-core/base-passwd/base-passwd/noshadow.patch b/meta/recipes-core/base-passwd/base-passwd/noshadow.patch
new file mode 100644
index 0000000..e1cded6
--- /dev/null
+++ b/meta/recipes-core/base-passwd/base-passwd/noshadow.patch
@@ -0,0 +1,14 @@
+remove "*" for root since we don't have a /etc/shadow so far.
+
+Upstream-Status: Invalid [configuration]
+
+Signed-off-by: Scott Garman <scott.a.garman at intel.com>
+
+--- base-passwd/passwd.master~nobash
++++ base-passwd/passwd.master
+@@ -1,4 +1,4 @@
+-root:*:0:0:root:/root:/bin/sh
++root::0:0:root:/root:/bin/sh
+ daemon:*:1:1:daemon:/usr/sbin:/bin/sh
+ bin:*:2:2:bin:/bin:/bin/sh
+ sys:*:3:3:sys:/dev:/bin/sh
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
index 082037a..5b31fce 100644
--- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
+++ b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
@@ -9,6 +9,7 @@ DEPENDS = "docbook-utils-native linuxdoc-tools-native"
 SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
            file://add_shutdown.patch \
            file://nobash.patch \
+           file://noshadow.patch \
            file://input.patch \
            file://disable-docs.patch \
           "