From ca848609cb25fabb8555d62990545f10f1b02df3 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Thu, 19 Jan 2012 11:39:56 -0800 Subject: Fix Upstream-Status entries (From OE-Core rev: 0cd9314ef95168ba5452a01ed8d923585c8d54ae) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch | 2 +- meta/recipes-devtools/libtool/libtool/fix-rpath.patch | 2 +- meta/recipes-devtools/qemu/qemu-0.14.0/arm-bgr.patch | 2 +- meta/recipes-devtools/qemu/qemu-0.15.1/arm-bgr.patch | 2 +- meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch | 2 +- .../xserver-kdrive-1.7.99.2/error-address-work-around.patch | 2 ++ .../0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch | 2 +- .../libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch | 2 ++ .../shared-mime-info/shared-mime-info/parallelmake.patch | 2 +- 9 files changed, 11 insertions(+), 7 deletions(-) (limited to 'meta') 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 137d095..0578d78 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 @@ -Upstream-status: Backport +Upstream-Status: Backport Patch is taken from upstream http://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 d35bac0..1571178 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. RP 23/9/2011 -Upstream-status: Pending +Upstream-Status: Pending Index: libtool-2.4.2/libltdl/config/ltmain.m4sh =================================================================== 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 3b460d0..a8fe65a 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. RP 16/9/2011 -Upstream-status: Pending +Upstream-Status: Pending Index: qemu-0.14.0/hw/pl110.c =================================================================== 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 3b460d0..a8fe65a 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. RP 16/9/2011 -Upstream-status: Pending +Upstream-Status: Pending Index: qemu-0.14.0/hw/pl110.c =================================================================== diff --git a/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch b/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch index 9cd7a36..8d24ab0 100644 --- a/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch +++ b/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch @@ -1,6 +1,6 @@ zypp/Arch.cc: Add room for additional architecture compatibilities -Upstream-status: Pending +Upstream-Status: Pending Increase the size of the compatibility table from 9 to 30. There are already existing 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 3052372..98a946a 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 @@ +Upstream-Status: Inappropriate + diff -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 --- xorg-server-1.7.99.2.ORIG/dix/window.c 2012-01-04 13:12:40.417640130 -0700 +++ 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 334c94e..55e180a 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 Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459 -Upstream-status: Pending +Upstream-Status: Pending alsactl/Makefile.am | 2 +- 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 ad13bbd..79e2ab8 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 @@ +Upstream-Status: Pending + diff -rupN libsoup-2.2.105/tests/auth-test.c libsoup-2.2.105.new//tests/auth-test.c --- libsoup-2.2.105/tests/auth-test.c 2007-12-05 00:13:27.000000000 +0200 +++ 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 9e86a71..8b6f9e5 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. RP 10/10/2011 -Upstream-status: Pending +Upstream-Status: Pending Index: shared-mime-info-0.91/Makefile.am =================================================================== -- cgit v1.1