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>
This commit is contained in:
parent
0dbd791e5b
commit
2ce14da681
|
@ -1,3 +1,5 @@
|
|||
Upstream-Status: Inappropriate [licensing]
|
||||
|
||||
diff --git a/COPYING b/COPYING
|
||||
new file mode 100644
|
||||
index 0000000..d511905
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
Upstream-Status: Pending
|
||||
|
||||
---
|
||||
Makefile | 6 +++---
|
||||
config.mk | 3 ++-
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
Upstream-Status: Pending
|
||||
|
||||
#
|
||||
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
|
||||
|
|
|
@ -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 @@
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
Upstream-Status: Pending
|
||||
|
||||
#
|
||||
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
Patch from Matthias Goebl <oe@m.goebl.net>
|
||||
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 @@
|
||||
|
|
|
@ -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 @@
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
Upstream-Status: Inappropriate [licensing]
|
||||
|
||||
diff --git a/COPYING b/COPYING
|
||||
new file mode 100644
|
||||
index 0000000..d511905
|
||||
|
|
|
@ -11,6 +11,7 @@ This patch avoids these linking errors:
|
|||
Nitin A Kamble <nitin.a.kamble@intel.com>
|
||||
Date: 2011/02/03
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Index: mesa-demos-8.0.1/src/egl/opengl/Makefile.am
|
||||
===================================================================
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 @@
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
Upstream-Status: Inappropriate [licensing]
|
||||
|
||||
Index: modutils-initscripts-1.0/LICENSE
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
|
|
|
@ -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 @@
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
Upstream-Status: Pending
|
||||
|
||||
#
|
||||
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
Upstream-Status: Pending
|
||||
|
||||
Index: modutils-2.4.27/depmod/depmod.c
|
||||
===================================================================
|
||||
--- modutils-2.4.27.orig/depmod/depmod.c
|
||||
|
|
|
@ -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 @@
|
||||
|
|
|
@ -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 @@
|
||||
|
|
|
@ -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 @@
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue