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-core | |
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-core')
6 files changed, 10 insertions, 0 deletions
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch index f6bd91e3e0..c287014767 100644 --- a/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch | |||
@@ -1,3 +1,4 @@ | |||
1 | Upstream-Status: Pending | ||
1 | 2 | ||
2 | # | 3 | # |
3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | 4 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher |
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch index 29012fe884..c93f511950 100644 --- a/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
1 | --- console-tools-0.3.2/kbdtools/showkey.c~compile 1999-08-25 17:20:08.000000000 -0400 | 3 | --- console-tools-0.3.2/kbdtools/showkey.c~compile 1999-08-25 17:20:08.000000000 -0400 |
2 | +++ console-tools-0.3.2/kbdtools/showkey.c 2004-05-09 03:03:23.000000000 -0400 | 4 | +++ console-tools-0.3.2/kbdtools/showkey.c 2004-05-09 03:03:23.000000000 -0400 |
3 | @@ -264,7 +264,6 @@ | 5 | @@ -264,7 +264,6 @@ |
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch index f5b75327e9..60ee8ffed5 100644 --- a/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch | |||
@@ -1,3 +1,4 @@ | |||
1 | Upstream-Status: Pending | ||
1 | 2 | ||
2 | # | 3 | # |
3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | 4 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher |
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch index 47d7ea54b9..f370be8592 100644 --- a/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch | |||
@@ -1,6 +1,8 @@ | |||
1 | Patch from Matthias Goebl <oe@m.goebl.net> | 1 | Patch from Matthias Goebl <oe@m.goebl.net> |
2 | Added via OE bugtracker: bug #478 | 2 | Added via OE bugtracker: bug #478 |
3 | 3 | ||
4 | Upstream-Status: Pending | ||
5 | |||
4 | --- console-tools-0.3.2/kbdtools/kbd_mode.c.orig | 6 | --- console-tools-0.3.2/kbdtools/kbd_mode.c.orig |
5 | +++ console-tools-0.3.2/kbdtools/kbd_mode.c | 7 | +++ console-tools-0.3.2/kbdtools/kbd_mode.c |
6 | @@ -29,11 +29,16 @@ | 8 | @@ -29,11 +29,16 @@ |
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch index c73d8a3d9e..0c95068a36 100644 --- a/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch +++ b/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch | |||
@@ -1,6 +1,8 @@ | |||
1 | Fixing the locale issues isn't enough, console-tools also does a couple of | 1 | Fixing the locale issues isn't enough, console-tools also does a couple of |
2 | other pretty stupid things (like FILE *f; f->_fileno instead of fileno(f)), | 2 | other pretty stupid things (like FILE *f; f->_fileno instead of fileno(f)), |
3 | 3 | ||
4 | Upstream-Status: Pending | ||
5 | |||
4 | --- console-tools-0.3.2/lib/cfont/fontstruct.c.ark 2005-05-22 19:12:38.000000000 +0000 | 6 | --- console-tools-0.3.2/lib/cfont/fontstruct.c.ark 2005-05-22 19:12:38.000000000 +0000 |
5 | +++ console-tools-0.3.2/lib/cfont/fontstruct.c 2005-05-22 19:13:23.000000000 +0000 | 7 | +++ console-tools-0.3.2/lib/cfont/fontstruct.c 2005-05-22 19:13:23.000000000 +0000 |
6 | @@ -50,8 +50,7 @@ | 8 | @@ -50,8 +50,7 @@ |
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/GPLv2.patch b/meta/recipes-core/initscripts/initscripts-1.0/GPLv2.patch index 2611f221b5..1ee8181f12 100644 --- a/meta/recipes-core/initscripts/initscripts-1.0/GPLv2.patch +++ b/meta/recipes-core/initscripts/initscripts-1.0/GPLv2.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [licensing] | ||
2 | |||
1 | diff --git a/COPYING b/COPYING | 3 | diff --git a/COPYING b/COPYING |
2 | new file mode 100644 | 4 | new file mode 100644 |
3 | index 0000000..d511905 | 5 | index 0000000..d511905 |