summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-01-19 11:39:56 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-24 11:54:16 +0000
commitca848609cb25fabb8555d62990545f10f1b02df3 (patch)
treebe3a9f0e44e97a828b17dbf1f2bc5a41504b8f26
parent79af7541e2d37dd92a3efc4eb3a9eb0aa33aa04f (diff)
downloadpoky-ca848609cb25fabb8555d62990545f10f1b02df3.tar.gz
Fix Upstream-Status entries
(From OE-Core rev: 0cd9314ef95168ba5452a01ed8d923585c8d54ae) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-core/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch2
-rw-r--r--meta/recipes-devtools/libtool/libtool/fix-rpath.patch2
-rw-r--r--meta/recipes-devtools/qemu/qemu-0.14.0/arm-bgr.patch2
-rw-r--r--meta/recipes-devtools/qemu/qemu-0.15.1/arm-bgr.patch2
-rw-r--r--meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/error-address-work-around.patch2
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch2
-rw-r--r--meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch2
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch2
9 files changed, 11 insertions, 7 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch b/meta/recipes-core/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch
index 137d095b6a..0578d78e9d 100644
--- a/meta/recipes-core/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch
+++ b/meta/recipes-core/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch
@@ -1,4 +1,4 @@
1Upstream-status: Backport 1Upstream-Status: Backport
2 2
3Patch is taken from upstream 3Patch is taken from upstream
4http://busybox.net/downloads/fixes-1.19.3/busybox-1.19.3-getty.patch 4http://busybox.net/downloads/fixes-1.19.3/busybox-1.19.3-getty.patch
diff --git a/meta/recipes-devtools/libtool/libtool/fix-rpath.patch b/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
index d35bac0e43..1571178a6a 100644
--- a/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
+++ b/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
@@ -4,7 +4,7 @@ filters libtools list and removes the ones we don't need.
4 4
5RP 23/9/2011 5RP 23/9/2011
6 6
7Upstream-status: Pending 7Upstream-Status: Pending
8 8
9Index: libtool-2.4.2/libltdl/config/ltmain.m4sh 9Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
10=================================================================== 10===================================================================
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/arm-bgr.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/arm-bgr.patch
index 3b460d04ce..a8fe65a1ea 100644
--- a/meta/recipes-devtools/qemu/qemu-0.14.0/arm-bgr.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/arm-bgr.patch
@@ -9,7 +9,7 @@ doesn't support the BGR bit.
9 9
10RP 16/9/2011 10RP 16/9/2011
11 11
12Upstream-status: Pending 12Upstream-Status: Pending
13 13
14Index: qemu-0.14.0/hw/pl110.c 14Index: qemu-0.14.0/hw/pl110.c
15=================================================================== 15===================================================================
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.1/arm-bgr.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/arm-bgr.patch
index 3b460d04ce..a8fe65a1ea 100644
--- a/meta/recipes-devtools/qemu/qemu-0.15.1/arm-bgr.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.15.1/arm-bgr.patch
@@ -9,7 +9,7 @@ doesn't support the BGR bit.
9 9
10RP 16/9/2011 10RP 16/9/2011
11 11
12Upstream-status: Pending 12Upstream-Status: Pending
13 13
14Index: qemu-0.14.0/hw/pl110.c 14Index: qemu-0.14.0/hw/pl110.c
15=================================================================== 15===================================================================
diff --git a/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch b/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch
index 9cd7a36422..8d24ab007c 100644
--- a/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch
+++ b/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch
@@ -1,6 +1,6 @@
1zypp/Arch.cc: Add room for additional architecture compatibilities 1zypp/Arch.cc: Add room for additional architecture compatibilities
2 2
3Upstream-status: Pending 3Upstream-Status: Pending
4 4
5Increase the size of the compatibility table from 9 to 30. There are already 5Increase the size of the compatibility table from 9 to 30. There are already
6existing checks within libzypp to ensure that we don't overflow the 64-bit 6existing checks within libzypp to ensure that we don't overflow the 64-bit
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/error-address-work-around.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/error-address-work-around.patch
index 3052372315..98a946aad6 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/error-address-work-around.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/error-address-work-around.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate
2
1diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/dix/window.c xorg-server-1.7.99.2/dix/window.c 3diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/dix/window.c xorg-server-1.7.99.2/dix/window.c
2--- xorg-server-1.7.99.2.ORIG/dix/window.c 2012-01-04 13:12:40.417640130 -0700 4--- xorg-server-1.7.99.2.ORIG/dix/window.c 2012-01-04 13:12:40.417640130 -0700
3+++ xorg-server-1.7.99.2/dix/window.c 2012-01-04 12:13:20.678605493 -0700 5+++ xorg-server-1.7.99.2/dix/window.c 2012-01-04 12:13:20.678605493 -0700
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
index 334c94e2fc..55e180aa0c 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
+++ b/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
@@ -10,7 +10,7 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
10 10
11Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459 11Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459
12 12
13Upstream-status: Pending 13Upstream-Status: Pending
14 14
15 alsactl/Makefile.am | 2 +- 15 alsactl/Makefile.am | 2 +-
16 alsactl/alsa-restore.service.in | 1 + 16 alsactl/alsa-restore.service.in | 1 +
diff --git a/meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch b/meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch
index ad13bbde47..79e2ab8f74 100644
--- a/meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch
+++ b/meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1diff -rupN libsoup-2.2.105/tests/auth-test.c libsoup-2.2.105.new//tests/auth-test.c 3diff -rupN libsoup-2.2.105/tests/auth-test.c libsoup-2.2.105.new//tests/auth-test.c
2--- libsoup-2.2.105/tests/auth-test.c 2007-12-05 00:13:27.000000000 +0200 4--- libsoup-2.2.105/tests/auth-test.c 2007-12-05 00:13:27.000000000 +0200
3+++ libsoup-2.2.105.new//tests/auth-test.c 2012-01-16 20:12:09.000000000 +0200 5+++ libsoup-2.2.105.new//tests/auth-test.c 2012-01-16 20:12:09.000000000 +0200
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
index 9e86a71795..8b6f9e524e 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
@@ -8,7 +8,7 @@ dependencies and stop itself racing itself.
8 8
9RP 10/10/2011 9RP 10/10/2011
10 10
11Upstream-status: Pending 11Upstream-Status: Pending
12 12
13Index: shared-mime-info-0.91/Makefile.am 13Index: shared-mime-info-0.91/Makefile.am
14=================================================================== 14===================================================================
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 23:36:00 +0000