aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/module-init-tools
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-05-16 14:04:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-17 14:38:52 +0100
commit46ea0444276c67b1489004e959bcf34970cd6c60 (patch)
tree7e5d8059db7d80b98089c3ede8a6cb355303453c /meta/recipes-kernel/module-init-tools
parent0702602332ad63c2cfaa207516497bb0b75bfdf3 (diff)
downloadopenembedded-core-contrib-46ea0444276c67b1489004e959bcf34970cd6c60.tar.gz
Upstream-Status update for several recipes
- modutils - module-init-tools - libacpi - keymaps - initscripts - console-tools - mesa-demos - xserver-xf86-lite Signed-off-by: Yu Ke <ke.yu@intel.com>
Diffstat (limited to 'meta/recipes-kernel/module-init-tools')
-rw-r--r--meta/recipes-kernel/module-init-tools/files/disable_man.patch2
-rw-r--r--meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch2
-rw-r--r--meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch2
-rw-r--r--meta/recipes-kernel/module-init-tools/files/modutils_extension.patch3
-rw-r--r--meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch2
5 files changed, 11 insertions, 0 deletions
diff --git a/meta/recipes-kernel/module-init-tools/files/disable_man.patch b/meta/recipes-kernel/module-init-tools/files/disable_man.patch
index daf58248b1..95ad9cf92f 100644
--- a/meta/recipes-kernel/module-init-tools/files/disable_man.patch
+++ b/meta/recipes-kernel/module-init-tools/files/disable_man.patch
@@ -2,6 +2,8 @@
#
# by Kevin Tian <kevin.tian@intel.com>, 2010-07-21
+Upstream-Status: Inappropriate [disable feature]
+
diff --git a/Makefile.am b/Makefile.am
index 6f83c12..32972a8 100644
--- a/Makefile.am
diff --git a/meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch b/meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch
index 9550255315..31dc0e96b0 100644
--- a/meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch
+++ b/meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch
@@ -5,6 +5,8 @@
#
# Kevin Tian <kevin.tian@intel.com>, 2010-08-06
+Upstream-Status: Pending
+
diff --git a/depmod.c b/depmod.c
index 647e5e6..46e03e0 100644
--- a/depmod.c
diff --git a/meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch b/meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch
index 7b30824802..d29957d98b 100644
--- a/meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch
+++ b/meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch
@@ -2,6 +2,8 @@
#
# comments added by Kevin Tian <kevin.tian@intel.com>, 2010-07-21
+Upstream-Status: Pending
+
diff -ruN module-init-tools-3.12.orig/modprobe.8 module-init-tools-3.12/modprobe.8
--- module-init-tools-3.12/modprobe.8.orig
+++ module-init-tools-3.12/modprobe.8
diff --git a/meta/recipes-kernel/module-init-tools/files/modutils_extension.patch b/meta/recipes-kernel/module-init-tools/files/modutils_extension.patch
index 128c9531a1..4a6e0fedcc 100644
--- a/meta/recipes-kernel/module-init-tools/files/modutils_extension.patch
+++ b/meta/recipes-kernel/module-init-tools/files/modutils_extension.patch
@@ -1,6 +1,9 @@
# poky uses new name to differentiate from modutils, so reflect this new name in source
#
# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-21
+
+Upstream-Status: Inappropriate [embedded specific]
+
--- module-init-tools-3.0-pre10.orig/generate-modprobe.conf
+++ module-init-tools-3.0-pre10/generate-modprobe.conf
@@ -45,12 +45,12 @@
diff --git a/meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch b/meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch
index ca83ec0755..33fb6e0b04 100644
--- a/meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch
+++ b/meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch
@@ -9,6 +9,8 @@
#
# by Kevin Tian <kevin.tian@intel.com>, 2010-07-21
+Upstream-Status: Pending
+
Index: module-init-tools-3.2.2/Makefile.am
===================================================================
--- module-init-tools-3.2.2.orig/Makefile.am 2010-05-26 15:43:16.000000000 -0400