summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/base-passwd
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-11-14 17:11:49 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-24 22:09:19 +0000
commita60449f6110bc86dd0d976413c169bafc0ebcada (patch)
tree42474ac24ebc79346096295744d3b2b395344781 /meta/recipes-core/base-passwd
parent735a3e5d3399e29e4d6fa82dabbdd1687eaa29e9 (diff)
downloadopenembedded-core-contrib-a60449f6110bc86dd0d976413c169bafc0ebcada.tar.gz
openembedded-core-contrib-a60449f6110bc86dd0d976413c169bafc0ebcada.tar.bz2
openembedded-core-contrib-a60449f6110bc86dd0d976413c169bafc0ebcada.zip
base-passwd: add Upstream-Status to patches, remove unused patch
mysql.patch is not used by the recipe anymore, so delete it. Signed-off-by: Scott Garman <scott.a.garman@intel.com>
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 8bfd757929..0000000000
--- a/meta/recipes-core/base-passwd/base-passwd-3.5.22/mysql.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# set correct uid/gid for mysql, from OE (8836cd807198c224ed23b05fa4f708f096881b27).
-# however poky doesn't include mysql so far. Remove it from patch list, but keep
-# this patch for a while
-#
-# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
---- base-passwd/group.master.orig 2005-07-08 06:36:07.717990112 +0200
-+++ base-passwd/group.master 2005-07-08 06:36:32.000000000 +0200
-@@ -36,4 +36,5 @@
- staff:*:50:
- games:*:60:
- users:*:100:
-+mysql:*:64001:
- 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 52650166f8..6371576440 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 @@
-# 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@intel.com>, 2010-07-06
-#
-# remove "*" for root since we don't have a /etc/shadow so far.
-#
-# by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
+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@intel.com>, 2010-07-06
+
+remove "*" for root since we don't have a /etc/shadow so far.
+
+by Kevin Tian <kevin.tian@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@intel.com>
--- base-passwd/passwd.master~nobash
+++ 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 87c4655a04..eab77f124f 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 @@
-# poky uses /home/root instead of /root.
-#
-# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
+we use /home/root instead of /root
+
+Comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
--- base-passwd/passwd.master.orig 2005-07-08 06:26:22.000000000 +0200
+++ base-passwd/passwd.master 2005-07-08 06:31:58.000000000 +0200
@@ -1,4 +1,4 @@