summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/base-passwd/base-passwd/nobash.patch10
-rw-r--r--meta/recipes-core/base-passwd/base-passwd/noshadow.patch14
-rw-r--r--meta/recipes-core/base-passwd/base-passwd_3.5.29.bb1
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 6371576440..eed87db6cb 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 @@
1use /bin/sh instead of /bin/bash, since the latter may not be included in 1use /bin/sh instead of /bin/bash, since the latter may not be included in
2some images such as minimal 2some images such as minimal
3 3
4comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
5
6remove "*" for root since we don't have a /etc/shadow so far.
7
8by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
9
10Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
11
12Upstream-Status: Invalid [configuration] 4Upstream-Status: Invalid [configuration]
13 5
14Signed-off-by: Scott Garman <scott.a.garman@intel.com> 6Signed-off-by: Scott Garman <scott.a.garman@intel.com>
@@ -17,7 +9,7 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com>
17+++ base-passwd/passwd.master 9+++ base-passwd/passwd.master
18@@ -1,4 +1,4 @@ 10@@ -1,4 +1,4 @@
19-root:*:0:0:root:/root:/bin/bash 11-root:*:0:0:root:/root:/bin/bash
20+root::0:0:root:/root:/bin/sh 12+root:*:0:0:root:/root:/bin/sh
21 daemon:*:1:1:daemon:/usr/sbin:/bin/sh 13 daemon:*:1:1:daemon:/usr/sbin:/bin/sh
22 bin:*:2:2:bin:/bin:/bin/sh 14 bin:*:2:2:bin:/bin:/bin/sh
23 sys:*:3:3:sys:/dev:/bin/sh 15 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 0000000000..e1cded61d6
--- /dev/null
+++ b/meta/recipes-core/base-passwd/base-passwd/noshadow.patch
@@ -0,0 +1,14 @@
1remove "*" for root since we don't have a /etc/shadow so far.
2
3Upstream-Status: Invalid [configuration]
4
5Signed-off-by: Scott Garman <scott.a.garman@intel.com>
6
7--- base-passwd/passwd.master~nobash
8+++ base-passwd/passwd.master
9@@ -1,4 +1,4 @@
10-root:*:0:0:root:/root:/bin/sh
11+root::0:0:root:/root:/bin/sh
12 daemon:*:1:1:daemon:/usr/sbin:/bin/sh
13 bin:*:2:2:bin:/bin:/bin/sh
14 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 082037a2a3..5b31fce87f 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"
9SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \ 9SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
10 file://add_shutdown.patch \ 10 file://add_shutdown.patch \
11 file://nobash.patch \ 11 file://nobash.patch \
12 file://noshadow.patch \
12 file://input.patch \ 13 file://input.patch \
13 file://disable-docs.patch \ 14 file://disable-docs.patch \
14 " 15 "