summaryrefslogtreecommitdiffstats
path: root/meta
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 15:14:43 +0100
commit2ce14da681aa1fa56e687d16b529bd63622accf2 (patch)
tree59276d178084013919d464b320911cd3a5bd2c45 /meta
parent0dbd791e5b837a096f020635c773715bae7b15f5 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-bsp/keymaps/files/GPLv2.patch2
-rw-r--r--meta/recipes-bsp/libacpi/files/makefile-fix.patch2
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch1
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch2
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch1
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch2
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch2
-rw-r--r--meta/recipes-core/initscripts/initscripts-1.0/GPLv2.patch2
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/dso_linking_change_build_fix.patch1
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch2
-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
-rw-r--r--meta/recipes-kernel/modutils/files/PD.patch2
-rw-r--r--meta/recipes-kernel/modutils/files/armeb.patch2
-rw-r--r--meta/recipes-kernel/modutils/files/configure.patch1
-rw-r--r--meta/recipes-kernel/modutils/files/gcc4.patch2
-rw-r--r--meta/recipes-kernel/modutils/files/lex.l.diff2
-rw-r--r--meta/recipes-kernel/modutils/files/modutils-notest.patch2
-rw-r--r--meta/recipes-kernel/modutils/files/program_prefix.patch2
-rw-r--r--meta/recipes-kernel/modutils/modutils-cross/module.h.diff2
23 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-bsp/keymaps/files/GPLv2.patch b/meta/recipes-bsp/keymaps/files/GPLv2.patch
index 2611f221b5..1ee8181f12 100644
--- a/meta/recipes-bsp/keymaps/files/GPLv2.patch
+++ b/meta/recipes-bsp/keymaps/files/GPLv2.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [licensing]
2
1diff --git a/COPYING b/COPYING 3diff --git a/COPYING b/COPYING
2new file mode 100644 4new file mode 100644
3index 0000000..d511905 5index 0000000..d511905
diff --git a/meta/recipes-bsp/libacpi/files/makefile-fix.patch b/meta/recipes-bsp/libacpi/files/makefile-fix.patch
index 9193929767..c34ef34e09 100644
--- a/meta/recipes-bsp/libacpi/files/makefile-fix.patch
+++ b/meta/recipes-bsp/libacpi/files/makefile-fix.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1--- 3---
2 Makefile | 6 +++--- 4 Makefile | 6 +++---
3 config.mk | 3 ++- 5 config.mk | 3 ++-
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 @@
1Upstream-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 @@
1Upstream-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 @@
1Upstream-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 @@
1Patch from Matthias Goebl <oe@m.goebl.net> 1Patch from Matthias Goebl <oe@m.goebl.net>
2Added via OE bugtracker: bug #478 2Added via OE bugtracker: bug #478
3 3
4Upstream-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 @@
1Fixing the locale issues isn't enough, console-tools also does a couple of 1Fixing the locale issues isn't enough, console-tools also does a couple of
2other pretty stupid things (like FILE *f; f->_fileno instead of fileno(f)), 2other pretty stupid things (like FILE *f; f->_fileno instead of fileno(f)),
3 3
4Upstream-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 @@
1Upstream-Status: Inappropriate [licensing]
2
1diff --git a/COPYING b/COPYING 3diff --git a/COPYING b/COPYING
2new file mode 100644 4new file mode 100644
3index 0000000..d511905 5index 0000000..d511905
diff --git a/meta/recipes-graphics/mesa/mesa-demos/dso_linking_change_build_fix.patch b/meta/recipes-graphics/mesa/mesa-demos/dso_linking_change_build_fix.patch
index aa2faf9d13..9b5e952186 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/dso_linking_change_build_fix.patch
+++ b/meta/recipes-graphics/mesa/mesa-demos/dso_linking_change_build_fix.patch
@@ -11,6 +11,7 @@ This patch avoids these linking errors:
11Nitin A Kamble <nitin.a.kamble@intel.com> 11Nitin A Kamble <nitin.a.kamble@intel.com>
12Date: 2011/02/03 12Date: 2011/02/03
13 13
14Upstream-Status: Pending
14 15
15Index: mesa-demos-8.0.1/src/egl/opengl/Makefile.am 16Index: mesa-demos-8.0.1/src/egl/opengl/Makefile.am
16=================================================================== 17===================================================================
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch
index 565832eed8..2f629724c9 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1Index: git/os/osdep.h 3Index: git/os/osdep.h
2=================================================================== 4===================================================================
3--- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100 5--- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100
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
5Upstream-Status: Inappropriate [disable feature]
6
5diff --git a/Makefile.am b/Makefile.am 7diff --git a/Makefile.am b/Makefile.am
6index 6f83c12..32972a8 100644 8index 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
8Upstream-Status: Pending
9
8diff --git a/depmod.c b/depmod.c 10diff --git a/depmod.c b/depmod.c
9index 647e5e6..46e03e0 100644 11index 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
5Upstream-Status: Pending
6
5diff -ruN module-init-tools-3.12.orig/modprobe.8 module-init-tools-3.12/modprobe.8 7diff -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
5Upstream-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
12Upstream-Status: Pending
13
12Index: module-init-tools-3.2.2/Makefile.am 14Index: 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
diff --git a/meta/recipes-kernel/modutils/files/PD.patch b/meta/recipes-kernel/modutils/files/PD.patch
index 6e7b76a3e9..21ac49cbd8 100644
--- a/meta/recipes-kernel/modutils/files/PD.patch
+++ b/meta/recipes-kernel/modutils/files/PD.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [licensing]
2
1Index: modutils-initscripts-1.0/LICENSE 3Index: modutils-initscripts-1.0/LICENSE
2=================================================================== 4===================================================================
3--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/meta/recipes-kernel/modutils/files/armeb.patch b/meta/recipes-kernel/modutils/files/armeb.patch
index a26a3a24eb..3198553421 100644
--- a/meta/recipes-kernel/modutils/files/armeb.patch
+++ b/meta/recipes-kernel/modutils/files/armeb.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1--- modutils-2.4.27/include/elf_arm.h.orig 2004-09-21 18:37:00.000000000 -0400 3--- modutils-2.4.27/include/elf_arm.h.orig 2004-09-21 18:37:00.000000000 -0400
2+++ modutils-2.4.27/include/elf_arm.h 2004-09-21 18:38:18.000000000 -0400 4+++ modutils-2.4.27/include/elf_arm.h 2004-09-21 18:38:18.000000000 -0400
3@@ -1,7 +1,11 @@ 5@@ -1,7 +1,11 @@
diff --git a/meta/recipes-kernel/modutils/files/configure.patch b/meta/recipes-kernel/modutils/files/configure.patch
index cdf501593f..63e80d7191 100644
--- a/meta/recipes-kernel/modutils/files/configure.patch
+++ b/meta/recipes-kernel/modutils/files/configure.patch
@@ -1,3 +1,4 @@
1Upstream-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-kernel/modutils/files/gcc4.patch b/meta/recipes-kernel/modutils/files/gcc4.patch
index 53750bc617..4507b0338b 100644
--- a/meta/recipes-kernel/modutils/files/gcc4.patch
+++ b/meta/recipes-kernel/modutils/files/gcc4.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1Index: modutils-2.4.27/depmod/depmod.c 3Index: modutils-2.4.27/depmod/depmod.c
2=================================================================== 4===================================================================
3--- modutils-2.4.27.orig/depmod/depmod.c 5--- modutils-2.4.27.orig/depmod/depmod.c
diff --git a/meta/recipes-kernel/modutils/files/lex.l.diff b/meta/recipes-kernel/modutils/files/lex.l.diff
index 65904b6b02..b2419a4814 100644
--- a/meta/recipes-kernel/modutils/files/lex.l.diff
+++ b/meta/recipes-kernel/modutils/files/lex.l.diff
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1--- modutils-2.4.26.orig/genksyms/lex.l 3--- modutils-2.4.26.orig/genksyms/lex.l
2+++ modutils-2.4.26/genksyms/lex.l 4+++ modutils-2.4.26/genksyms/lex.l
3@@ -130,6 +130,7 @@ 5@@ -130,6 +130,7 @@
diff --git a/meta/recipes-kernel/modutils/files/modutils-notest.patch b/meta/recipes-kernel/modutils/files/modutils-notest.patch
index 0e15a1014c..ab100f2dcc 100644
--- a/meta/recipes-kernel/modutils/files/modutils-notest.patch
+++ b/meta/recipes-kernel/modutils/files/modutils-notest.patch
@@ -2,6 +2,8 @@ This test disables the annoying
2 Note: /etc/modules.conf is more recent than /lib/modules/2.4.19-rmk6-pxa1/modules.dep 2 Note: /etc/modules.conf is more recent than /lib/modules/2.4.19-rmk6-pxa1/modules.dep
3message. 3message.
4 4
5Upstream-Status: Inappropriate [disable feature]
6
5--- modutils-2.4.6/insmod/modprobe.c~notest Mon Feb 26 02:07:17 2001 7--- modutils-2.4.6/insmod/modprobe.c~notest Mon Feb 26 02:07:17 2001
6+++ modutils-2.4.6/insmod/modprobe.c Wed Feb 19 14:31:52 2003 8+++ modutils-2.4.6/insmod/modprobe.c Wed Feb 19 14:31:52 2003
7@@ -785,7 +785,6 @@ 9@@ -785,7 +785,6 @@
diff --git a/meta/recipes-kernel/modutils/files/program_prefix.patch b/meta/recipes-kernel/modutils/files/program_prefix.patch
index 2927a23a22..973705ee27 100644
--- a/meta/recipes-kernel/modutils/files/program_prefix.patch
+++ b/meta/recipes-kernel/modutils/files/program_prefix.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1--- modutils-2.4.25/Makefile.common.in Sun Nov 24 21:23:35 2002 3--- modutils-2.4.25/Makefile.common.in Sun Nov 24 21:23:35 2002
2+++ modutils-2.4.25/Makefile.common.in Thu Jan 29 17:16:30 2004 4+++ modutils-2.4.25/Makefile.common.in Thu Jan 29 17:16:30 2004
3@@ -7,6 +7,7 @@ 5@@ -7,6 +7,7 @@
diff --git a/meta/recipes-kernel/modutils/modutils-cross/module.h.diff b/meta/recipes-kernel/modutils/modutils-cross/module.h.diff
index 077baaf3eb..e9f1224490 100644
--- a/meta/recipes-kernel/modutils/modutils-cross/module.h.diff
+++ b/meta/recipes-kernel/modutils/modutils-cross/module.h.diff
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1diff -urN modutils-2.4.27.orig/include/module.h modutils-2.4.27/include/module.h 3diff -urN modutils-2.4.27.orig/include/module.h modutils-2.4.27/include/module.h
2--- modutils-2.4.27.orig/include/module.h 2003-01-27 11:22:02.000000000 -0500 4--- modutils-2.4.27.orig/include/module.h 2003-01-27 11:22:02.000000000 -0500
3+++ modutils-2.4.27/include/module.h 2004-08-23 19:52:34.756772712 -0400 5+++ modutils-2.4.27/include/module.h 2004-08-23 19:52:34.756772712 -0400
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 02:12:52 +0000