summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/base-passwd
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-11-15 01:11:49 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-24 22:12:02 (GMT)
commit49c7815b6db58365601cf81fd55caa95d00c2cef (patch)
treeb53306d202bd5f8cb246a23868323ca805bd3d33 /meta/recipes-core/base-passwd
parent69791909d1339771a2db3605e62f74315a4e18e4 (diff)
downloadpoky-49c7815b6db58365601cf81fd55caa95d00c2cef.tar.gz
base-passwd: add Upstream-Status to patches, remove unused patch
mysql.patch is not used by the recipe anymore, so delete it. (From OE-Core rev: a60449f6110bc86dd0d976413c169bafc0ebcada) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/base-passwd')
-rw-r--r--meta/recipes-core/base-passwd/base-passwd-3.5.22/mysql.patch13
-rw-r--r--meta/recipes-core/base-passwd/base-passwd-3.5.22/nobash.patch25
-rw-r--r--meta/recipes-core/base-passwd/base-passwd-3.5.22/root-home.patch11
3 files changed, 22 insertions, 27 deletions
diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.22/mysql.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.22/mysql.patch
deleted file mode 100644
index 8bfd757..0000000
--- a/meta/recipes-core/base-passwd/base-passwd-3.5.22/mysql.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1# set correct uid/gid for mysql, from OE (8836cd807198c224ed23b05fa4f708f096881b27).
2# however poky doesn't include mysql so far. Remove it from patch list, but keep
3# this patch for a while
4#
5# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
6--- base-passwd/group.master.orig 2005-07-08 06:36:07.717990112 +0200
7+++ base-passwd/group.master 2005-07-08 06:36:32.000000000 +0200
8@@ -36,4 +36,5 @@
9 staff:*:50:
10 games:*:60:
11 users:*:100:
12+mysql:*:64001:
13 nogroup:*:65534:
diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.22/nobash.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.22/nobash.patch
index 5265016..6371576 100644
--- a/meta/recipes-core/base-passwd/base-passwd-3.5.22/nobash.patch
+++ b/meta/recipes-core/base-passwd/base-passwd-3.5.22/nobash.patch
@@ -1,14 +1,17 @@
1# use /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
2# some images such as minimal 2some images such as minimal
3# 3
4# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06 4comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
5# 5
6# remove "*" for root since we don't have a /etc/shadow so far. 6remove "*" for root since we don't have a /etc/shadow so far.
7# 7
8# by Kevin Tian <kevin.tian@intel.com>, 2010-07-06 8by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
9# 9
10# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher 10Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
11# 11
12Upstream-Status: Invalid [configuration]
13
14Signed-off-by: Scott Garman <scott.a.garman@intel.com>
12 15
13--- base-passwd/passwd.master~nobash 16--- base-passwd/passwd.master~nobash
14+++ base-passwd/passwd.master 17+++ base-passwd/passwd.master
diff --git a/meta/recipes-core/base-passwd/base-passwd-3.5.22/root-home.patch b/meta/recipes-core/base-passwd/base-passwd-3.5.22/root-home.patch
index 87c4655..eab77f1 100644
--- a/meta/recipes-core/base-passwd/base-passwd-3.5.22/root-home.patch
+++ b/meta/recipes-core/base-passwd/base-passwd-3.5.22/root-home.patch
@@ -1,6 +1,11 @@
1# poky uses /home/root instead of /root. 1we use /home/root instead of /root
2# 2
3# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06 3Comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
4
5Upstream-Status: Inappropriate [configuration]
6
7Signed-off-by: Scott Garman <scott.a.garman@intel.com>
8
4--- base-passwd/passwd.master.orig 2005-07-08 06:26:22.000000000 +0200 9--- base-passwd/passwd.master.orig 2005-07-08 06:26:22.000000000 +0200
5+++ base-passwd/passwd.master 2005-07-08 06:31:58.000000000 +0200 10+++ base-passwd/passwd.master 2005-07-08 06:31:58.000000000 +0200
6@@ -1,4 +1,4 @@ 11@@ -1,4 +1,4 @@