diff options
author | Yu Ke <ke.yu@intel.com> | 2011-05-16 14:04:12 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-17 15:14:43 +0100 |
commit | 2ce14da681aa1fa56e687d16b529bd63622accf2 (patch) | |
tree | 59276d178084013919d464b320911cd3a5bd2c45 /meta/recipes-kernel/module-init-tools | |
parent | 0dbd791e5b837a096f020635c773715bae7b15f5 (diff) | |
download | poky-2ce14da681aa1fa56e687d16b529bd63622accf2.tar.gz |
Upstream-Status update for several recipes
- modutils
- module-init-tools
- libacpi
- keymaps
- initscripts
- console-tools
- mesa-demos
- xserver-xf86-lite
(From OE-Core rev: 46ea0444276c67b1489004e959bcf34970cd6c60)
Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/module-init-tools')
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 @@ | |||
2 | # | 2 | # |
3 | # by Kevin Tian <kevin.tian@intel.com>, 2010-07-21 | 3 | # by Kevin Tian <kevin.tian@intel.com>, 2010-07-21 |
4 | 4 | ||
5 | Upstream-Status: Inappropriate [disable feature] | ||
6 | |||
5 | diff --git a/Makefile.am b/Makefile.am | 7 | diff --git a/Makefile.am b/Makefile.am |
6 | index 6f83c12..32972a8 100644 | 8 | index 6f83c12..32972a8 100644 |
7 | --- a/Makefile.am | 9 | --- 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 @@ | |||
5 | # | 5 | # |
6 | # Kevin Tian <kevin.tian@intel.com>, 2010-08-06 | 6 | # Kevin Tian <kevin.tian@intel.com>, 2010-08-06 |
7 | 7 | ||
8 | Upstream-Status: Pending | ||
9 | |||
8 | diff --git a/depmod.c b/depmod.c | 10 | diff --git a/depmod.c b/depmod.c |
9 | index 647e5e6..46e03e0 100644 | 11 | index 647e5e6..46e03e0 100644 |
10 | --- a/depmod.c | 12 | --- 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 @@ | |||
2 | # | 2 | # |
3 | # comments added by Kevin Tian <kevin.tian@intel.com>, 2010-07-21 | 3 | # comments added by Kevin Tian <kevin.tian@intel.com>, 2010-07-21 |
4 | 4 | ||
5 | Upstream-Status: Pending | ||
6 | |||
5 | diff -ruN module-init-tools-3.12.orig/modprobe.8 module-init-tools-3.12/modprobe.8 | 7 | diff -ruN module-init-tools-3.12.orig/modprobe.8 module-init-tools-3.12/modprobe.8 |
6 | --- module-init-tools-3.12/modprobe.8.orig | 8 | --- module-init-tools-3.12/modprobe.8.orig |
7 | +++ module-init-tools-3.12/modprobe.8 | 9 | +++ 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 @@ | |||
1 | # poky uses new name to differentiate from modutils, so reflect this new name in source | 1 | # poky uses new name to differentiate from modutils, so reflect this new name in source |
2 | # | 2 | # |
3 | # comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-21 | 3 | # comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-21 |
4 | |||
5 | Upstream-Status: Inappropriate [embedded specific] | ||
6 | |||
4 | --- module-init-tools-3.0-pre10.orig/generate-modprobe.conf | 7 | --- module-init-tools-3.0-pre10.orig/generate-modprobe.conf |
5 | +++ module-init-tools-3.0-pre10/generate-modprobe.conf | 8 | +++ module-init-tools-3.0-pre10/generate-modprobe.conf |
6 | @@ -45,12 +45,12 @@ | 9 | @@ -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 @@ | |||
9 | # | 9 | # |
10 | # by Kevin Tian <kevin.tian@intel.com>, 2010-07-21 | 10 | # by Kevin Tian <kevin.tian@intel.com>, 2010-07-21 |
11 | 11 | ||
12 | Upstream-Status: Pending | ||
13 | |||
12 | Index: module-init-tools-3.2.2/Makefile.am | 14 | Index: module-init-tools-3.2.2/Makefile.am |
13 | =================================================================== | 15 | =================================================================== |
14 | --- module-init-tools-3.2.2.orig/Makefile.am 2010-05-26 15:43:16.000000000 -0400 | 16 | --- module-init-tools-3.2.2.orig/Makefile.am 2010-05-26 15:43:16.000000000 -0400 |