summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff2
-rw-r--r--meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff2
-rw-r--r--meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff2
-rw-r--r--meta/recipes-extended/iputils/files/debian/targets.diff2
-rw-r--r--meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff2
-rw-r--r--meta/recipes-extended/mktemp/files/disable-strip.patch2
-rw-r--r--meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch2
-rw-r--r--meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch2
-rw-r--r--meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch2
-rw-r--r--meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch2
-rw-r--r--meta/recipes-graphics/mesa/qemugl/remove-x11r6-lib-dir.patch2
-rw-r--r--meta/recipes-graphics/mesa/qemugl/versionfix.patch2
-rw-r--r--meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch2
-rw-r--r--meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch2
-rw-r--r--meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch2
-rw-r--r--meta/recipes-graphics/xorg-app/xset/disable-xkb.patch2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-blacklist-tv-out.patch4
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-force-plain-mode.patch2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-CRTC-limit.patch2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-virtual-size.patch2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omapfb-neon.diff2
21 files changed, 42 insertions, 2 deletions
diff --git a/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff b/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff
index 86bbf0d39a..40070c346d 100644
--- a/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff
+++ b/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff
@@ -1,3 +1,5 @@
1Upstream-Status: Pending [from other distro Debian]
2
1Index: trunk/ping.c 3Index: trunk/ping.c
2=================================================================== 4===================================================================
3--- trunk.orig/ping.c 2010-05-07 23:13:54.000000000 -0700 5--- trunk.orig/ping.c 2010-05-07 23:13:54.000000000 -0700
diff --git a/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff b/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff
index 9f05769f71..3e34788a5a 100644
--- a/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff
+++ b/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff
@@ -1,3 +1,5 @@
1Upstream-Status: Pending [from other distro Debian]
2
1Index: trunk/arping.c 3Index: trunk/arping.c
2=================================================================== 4===================================================================
3--- trunk.orig/arping.c 2010-05-07 23:13:52.000000000 -0700 5--- trunk.orig/arping.c 2010-05-07 23:13:52.000000000 -0700
diff --git a/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff b/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff
index 2a924258da..fda42bf028 100644
--- a/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff
+++ b/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff
@@ -1,3 +1,5 @@
1Upstream-Status: Pending [from other distro Debian]
2
1Index: trunk/ping_common.c 3Index: trunk/ping_common.c
2=================================================================== 4===================================================================
3--- trunk.orig/ping_common.c 2010-05-07 23:13:51.000000000 -0700 5--- trunk.orig/ping_common.c 2010-05-07 23:13:51.000000000 -0700
diff --git a/meta/recipes-extended/iputils/files/debian/targets.diff b/meta/recipes-extended/iputils/files/debian/targets.diff
index b5e907a8d0..6b899cb39e 100644
--- a/meta/recipes-extended/iputils/files/debian/targets.diff
+++ b/meta/recipes-extended/iputils/files/debian/targets.diff
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [disable feature]
2
1Index: trunk/Makefile 3Index: trunk/Makefile
2=================================================================== 4===================================================================
3--- trunk.orig/Makefile 2010-05-07 23:43:00.000000000 -0700 5--- trunk.orig/Makefile 2010-05-07 23:43:00.000000000 -0700
diff --git a/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff b/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff
index 7e6c97c14a..1d01e151eb 100644
--- a/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff
+++ b/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff
@@ -1,3 +1,5 @@
1Upstream-Status: Pending [from other distro Debian]
2
1Index: trunk/tracepath.c 3Index: trunk/tracepath.c
2=================================================================== 4===================================================================
3--- trunk.orig/tracepath.c 2010-05-07 23:13:52.000000000 -0700 5--- trunk.orig/tracepath.c 2010-05-07 23:13:52.000000000 -0700
diff --git a/meta/recipes-extended/mktemp/files/disable-strip.patch b/meta/recipes-extended/mktemp/files/disable-strip.patch
index d6bc528a21..e06869e3ad 100644
--- a/meta/recipes-extended/mktemp/files/disable-strip.patch
+++ b/meta/recipes-extended/mktemp/files/disable-strip.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1diff --git a/Makefile.in b/Makefile.in 3diff --git a/Makefile.in b/Makefile.in
2index 37b3cc9..f1026f3 100644 4index 37b3cc9..f1026f3 100644
3--- a/Makefile.in 5--- a/Makefile.in
diff --git a/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch b/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch
index 8602a88702..cd6e6c1078 100644
--- a/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch
+++ b/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending [from other distro Debian]
2
1From d588b6530e1382a624898b3f4307f636c72c80a9 Mon Sep 17 00:00:00 2001 3From d588b6530e1382a624898b3f4307f636c72c80a9 Mon Sep 17 00:00:00 2001
2From: Pierre Habouzit <madcoder@debian.org> 4From: Pierre Habouzit <madcoder@debian.org>
3Date: Wed, 28 Nov 2007 10:13:08 +0100 5Date: Wed, 28 Nov 2007 10:13:08 +0100
diff --git a/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch b/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch
index d243692769..8e59cdcaae 100644
--- a/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch
+++ b/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending [from other distro Debian]
2
1From a3410b0bc81ab03a889d9ffc14e351badf8372f1 Mon Sep 17 00:00:00 2001 3From a3410b0bc81ab03a889d9ffc14e351badf8372f1 Mon Sep 17 00:00:00 2001
2From: Pierre Habouzit <madcoder@debian.org> 4From: Pierre Habouzit <madcoder@debian.org>
3Date: Mon, 26 Nov 2007 16:02:04 +0100 5Date: Mon, 26 Nov 2007 16:02:04 +0100
diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch b/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch
index 2b76fe3d41..2365ca123b 100644
--- a/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch
+++ b/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending [from other distro Debian]
2
1From f44b218ccc779ab3f4aed072390ccf129d94b58d Mon Sep 17 00:00:00 2001 3From f44b218ccc779ab3f4aed072390ccf129d94b58d Mon Sep 17 00:00:00 2001
2From: David Madore <david@pleiades.stars> 4From: David Madore <david@pleiades.stars>
3Date: Mon, 24 Mar 2008 12:45:36 +0100 5Date: Mon, 24 Mar 2008 12:45:36 +0100
diff --git a/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch b/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch
index 2704ee6c6b..1f39719a07 100644
--- a/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch
+++ b/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch
@@ -1,6 +1,6 @@
1tests: also install tests app 1tests: also install tests app
2 2
3Upstream-Status: Pending 3Upstream-Status: Inappropriate [configuration]
4 4
5Signed-off-by: Yu Ke <ke.yu@intel.com> 5Signed-off-by: Yu Ke <ke.yu@intel.com>
6 6
diff --git a/meta/recipes-graphics/mesa/qemugl/remove-x11r6-lib-dir.patch b/meta/recipes-graphics/mesa/qemugl/remove-x11r6-lib-dir.patch
index d14ce891c0..d24d0455d9 100644
--- a/meta/recipes-graphics/mesa/qemugl/remove-x11r6-lib-dir.patch
+++ b/meta/recipes-graphics/mesa/qemugl/remove-x11r6-lib-dir.patch
@@ -2,6 +2,8 @@ Remove X11R6 lib directory
2 2
3"-L/usr/X11R6/lib" is obsolate in poky. Poky currently use Xserver from X.org (X11R7.x), which puts lib in standard /usr/lib, so no need to specify the extra -L/usr/X11R6/lib. Meanwhile, the -L/usr/X11R6/lib will cause warning: library search path "/usr/X11R6/lib" is unsafe for cross-compilation. so better to remove it. 3"-L/usr/X11R6/lib" is obsolate in poky. Poky currently use Xserver from X.org (X11R7.x), which puts lib in standard /usr/lib, so no need to specify the extra -L/usr/X11R6/lib. Meanwhile, the -L/usr/X11R6/lib will cause warning: library search path "/usr/X11R6/lib" is unsafe for cross-compilation. so better to remove it.
4 4
5Upstream-Status: Pending
6
5Signed-off-by: Yu Ke <ke.yu@intel.com> 7Signed-off-by: Yu Ke <ke.yu@intel.com>
6 8
7diff --git a/Makefile b/Makefile 9diff --git a/Makefile b/Makefile
diff --git a/meta/recipes-graphics/mesa/qemugl/versionfix.patch b/meta/recipes-graphics/mesa/qemugl/versionfix.patch
index a3d33e8303..614b816d14 100644
--- a/meta/recipes-graphics/mesa/qemugl/versionfix.patch
+++ b/meta/recipes-graphics/mesa/qemugl/versionfix.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1Index: git/Makefile 3Index: git/Makefile
2=================================================================== 4===================================================================
3--- git.orig/Makefile 2009-01-19 23:37:36.000000000 +0000 5--- git.orig/Makefile 2009-01-19 23:37:36.000000000 +0000
diff --git a/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch b/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch
index ec93253347..eff975e341 100644
--- a/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch
+++ b/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch
@@ -4,6 +4,8 @@ this is a local file recipe and the license file is missing.In order
4to pass the license checksum checking, the license file is needed. So 4to pass the license checksum checking, the license file is needed. So
5this patch add the GPLv2 license file. 5this patch add the GPLv2 license file.
6 6
7Upstream-Status: Inappropriate [licensing]
8
7Signed-off-by: Yu Ke <ke.yu@intel.com> 9Signed-off-by: Yu Ke <ke.yu@intel.com>
8 10
9diff --git a/COPYING b/COPYING 11diff --git a/COPYING b/COPYING
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch b/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch
index ec93253347..eff975e341 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch
@@ -4,6 +4,8 @@ this is a local file recipe and the license file is missing.In order
4to pass the license checksum checking, the license file is needed. So 4to pass the license checksum checking, the license file is needed. So
5this patch add the GPLv2 license file. 5this patch add the GPLv2 license file.
6 6
7Upstream-Status: Inappropriate [licensing]
8
7Signed-off-by: Yu Ke <ke.yu@intel.com> 9Signed-off-by: Yu Ke <ke.yu@intel.com>
8 10
9diff --git a/COPYING b/COPYING 11diff --git a/COPYING b/COPYING
diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch b/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch
index 24af21f4fc..b10143df48 100644
--- a/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch
+++ b/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1--- xdpyinfo-1.0.1/configure.ac.orig 2006-03-08 16:33:05.000000000 +0100 3--- xdpyinfo-1.0.1/configure.ac.orig 2006-03-08 16:33:05.000000000 +0100
2+++ xdpyinfo-1.0.1/configure.ac 2006-03-08 16:41:59.000000000 +0100 4+++ xdpyinfo-1.0.1/configure.ac 2006-03-08 16:41:59.000000000 +0100
3@@ -45,11 +45,15 @@ 5@@ -45,11 +45,15 @@
diff --git a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
index 2e728cfe0a..97d13a30df 100644
--- a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
+++ b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
@@ -1,5 +1,7 @@
1add "-disable-xkb" option 1add "-disable-xkb" option
2 2
3Upstream-Status: Pending
4
3Rebase for 1.2.1 by: Yu Ke <ke.yu@intel.com> 5Rebase for 1.2.1 by: Yu Ke <ke.yu@intel.com>
4 6
5diff --git a/configure.ac b/configure.ac 7diff --git a/configure.ac b/configure.ac
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-blacklist-tv-out.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-blacklist-tv-out.patch
index 506e174cb1..9b1ee06ece 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-blacklist-tv-out.patch
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-blacklist-tv-out.patch
@@ -5,7 +5,9 @@ Date: Wed Jan 26 13:21:12 2011 +0100
5 blacklist tv out 5 blacklist tv out
6 6
7 The tv-out gets added last and the driver tries to reconfigure dvi to TV resolutions, which fails. so blacklist it 7 The tv-out gets added last and the driver tries to reconfigure dvi to TV resolutions, which fails. so blacklist it
8 8
9 Upstream-Status: Pending
10
9 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 11 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
10 12
11diff --git a/src/omapfb-output-dss.c b/src/omapfb-output-dss.c 13diff --git a/src/omapfb-output-dss.c b/src/omapfb-output-dss.c
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-force-plain-mode.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-force-plain-mode.patch
index 201a8b9588..bb298b0e6d 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-force-plain-mode.patch
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-force-plain-mode.patch
@@ -6,6 +6,8 @@ Date: Wed Jan 26 13:20:20 2011 +0100
6 6
7 The new DSS mode breaks XV, so force plain mode 7 The new DSS mode breaks XV, so force plain mode
8 8
9 Upstream-Status: Pending
10
9 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 11 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
10 12
11diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c 13diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-CRTC-limit.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-CRTC-limit.patch
index 6a9e9058b9..97bf022ab0 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-CRTC-limit.patch
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-CRTC-limit.patch
@@ -8,6 +8,8 @@ Date: Wed Jan 26 12:04:36 2011 +0100
8 8
9 Virtual size too big, revert the commit 9c4d7592dcb7dc20a48a6f941d9d94bd73d34153. 9 Virtual size too big, revert the commit 9c4d7592dcb7dc20a48a6f941d9d94bd73d34153.
10 10
11 Upstream-Status: Pending
12
11diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c 13diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c
12index 9aaa52f..cbeff35 100644 14index 9aaa52f..cbeff35 100644
13--- a/src/omapfb-crtc.c 15--- a/src/omapfb-crtc.c
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-virtual-size.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-virtual-size.patch
index a3fd0d5f90..8a6eef5cc2 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-virtual-size.patch
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-virtual-size.patch
@@ -8,6 +8,8 @@ Date: Wed Jan 26 13:27:20 2011 +0100
8 8
9 This reverts commit 2653ef07883fbd1a5e7025f9300cf89b79ba429a. 9 This reverts commit 2653ef07883fbd1a5e7025f9300cf89b79ba429a.
10 10
11 Upstream-Status: Pending
12
11diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c 13diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c
12index cbeff35..9655db2 100644 14index cbeff35..9655db2 100644
13--- a/src/omapfb-crtc.c 15--- a/src/omapfb-crtc.c
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omapfb-neon.diff b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omapfb-neon.diff
index 325ca66f0c..fb3ac8c594 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omapfb-neon.diff
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omapfb-neon.diff
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1--- /tmp/image-format-conversions.h 2009-02-03 10:18:04.000000000 +0100 3--- /tmp/image-format-conversions.h 2009-02-03 10:18:04.000000000 +0100
2+++ git/src/image-format-conversions.h 2009-02-03 10:19:18.000000000 +0100 4+++ git/src/image-format-conversions.h 2009-02-03 10:19:18.000000000 +0100
3@@ -30,6 +30,8 @@ 5@@ -30,6 +30,8 @@