From 46ea0444276c67b1489004e959bcf34970cd6c60 Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Mon, 16 May 2011 14:04:12 +0800 Subject: 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 --- meta/recipes-bsp/keymaps/files/GPLv2.patch | 2 ++ meta/recipes-bsp/libacpi/files/makefile-fix.patch | 2 ++ meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch | 1 + meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch | 2 ++ meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch | 1 + meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch | 2 ++ .../recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch | 2 ++ meta/recipes-core/initscripts/initscripts-1.0/GPLv2.patch | 2 ++ .../mesa/mesa-demos/dso_linking_change_build_fix.patch | 1 + .../xserver-xf86-lite/fix_open_max_preprocessor_error.patch | 2 ++ meta/recipes-kernel/module-init-tools/files/disable_man.patch | 2 ++ meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch | 2 ++ .../recipes-kernel/module-init-tools/files/ignore_arch_directory.patch | 2 ++ meta/recipes-kernel/module-init-tools/files/modutils_extension.patch | 3 +++ meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch | 2 ++ meta/recipes-kernel/modutils/files/PD.patch | 2 ++ meta/recipes-kernel/modutils/files/armeb.patch | 2 ++ meta/recipes-kernel/modutils/files/configure.patch | 1 + meta/recipes-kernel/modutils/files/gcc4.patch | 2 ++ meta/recipes-kernel/modutils/files/lex.l.diff | 2 ++ meta/recipes-kernel/modutils/files/modutils-notest.patch | 2 ++ meta/recipes-kernel/modutils/files/program_prefix.patch | 2 ++ meta/recipes-kernel/modutils/modutils-cross/module.h.diff | 2 ++ 23 files changed, 43 insertions(+) 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 @@ +Upstream-Status: Inappropriate [licensing] + diff --git a/COPYING b/COPYING new file mode 100644 index 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 @@ +Upstream-Status: Pending + --- Makefile | 6 +++--- 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 @@ +Upstream-Status: Pending # # 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 @@ +Upstream-Status: Pending + --- console-tools-0.3.2/kbdtools/showkey.c~compile 1999-08-25 17:20:08.000000000 -0400 +++ console-tools-0.3.2/kbdtools/showkey.c 2004-05-09 03:03:23.000000000 -0400 @@ -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 @@ +Upstream-Status: Pending # # 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 @@ Patch from Matthias Goebl Added via OE bugtracker: bug #478 +Upstream-Status: Pending + --- console-tools-0.3.2/kbdtools/kbd_mode.c.orig +++ console-tools-0.3.2/kbdtools/kbd_mode.c @@ -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 @@ Fixing the locale issues isn't enough, console-tools also does a couple of other pretty stupid things (like FILE *f; f->_fileno instead of fileno(f)), +Upstream-Status: Pending + --- console-tools-0.3.2/lib/cfont/fontstruct.c.ark 2005-05-22 19:12:38.000000000 +0000 +++ console-tools-0.3.2/lib/cfont/fontstruct.c 2005-05-22 19:13:23.000000000 +0000 @@ -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 @@ +Upstream-Status: Inappropriate [licensing] + diff --git a/COPYING b/COPYING new file mode 100644 index 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: Nitin A Kamble Date: 2011/02/03 +Upstream-Status: Pending Index: mesa-demos-8.0.1/src/egl/opengl/Makefile.am =================================================================== 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 @@ +Upstream-Status: Pending + Index: git/os/osdep.h =================================================================== --- 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 @@ # # by Kevin Tian , 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 , 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 , 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 , 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 , 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 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 @@ +Upstream-Status: Inappropriate [licensing] + Index: modutils-initscripts-1.0/LICENSE =================================================================== --- /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 @@ +Upstream-Status: Pending + --- modutils-2.4.27/include/elf_arm.h.orig 2004-09-21 18:37:00.000000000 -0400 +++ modutils-2.4.27/include/elf_arm.h 2004-09-21 18:38:18.000000000 -0400 @@ -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 @@ +Upstream-Status: Pending # # 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 @@ +Upstream-Status: Pending + Index: modutils-2.4.27/depmod/depmod.c =================================================================== --- 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 @@ +Upstream-Status: Pending + --- modutils-2.4.26.orig/genksyms/lex.l +++ modutils-2.4.26/genksyms/lex.l @@ -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 Note: /etc/modules.conf is more recent than /lib/modules/2.4.19-rmk6-pxa1/modules.dep message. +Upstream-Status: Inappropriate [disable feature] + --- modutils-2.4.6/insmod/modprobe.c~notest Mon Feb 26 02:07:17 2001 +++ modutils-2.4.6/insmod/modprobe.c Wed Feb 19 14:31:52 2003 @@ -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 @@ +Upstream-Status: Pending + --- modutils-2.4.25/Makefile.common.in Sun Nov 24 21:23:35 2002 +++ modutils-2.4.25/Makefile.common.in Thu Jan 29 17:16:30 2004 @@ -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 @@ +Upstream-Status: Pending + diff -urN modutils-2.4.27.orig/include/module.h modutils-2.4.27/include/module.h --- modutils-2.4.27.orig/include/module.h 2003-01-27 11:22:02.000000000 -0500 +++ modutils-2.4.27/include/module.h 2004-08-23 19:52:34.756772712 -0400 -- cgit 1.2.3-korg