diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2011-05-17 16:15:15 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-17 17:17:39 +0100 |
commit | 9fe00e1424bd82c48d0b9b58e11758039bb1048c (patch) | |
tree | 20f8d021726e66c5abe497ed8f18d8a8495282f4 /meta | |
parent | 7cc59107f944a2a786cf93e8589edf7dfd0f2d70 (diff) | |
download | poky-9fe00e1424bd82c48d0b9b58e11758039bb1048c.tar.gz |
recipes: Add upstream status information for patches
gypsy: Add upstream status information for gypsy's patch
alsa-utils: fix upstream status typo
pulseaudio: add upstream status for pulseaudio-0.9.15's patches
hostap: add upstream status for hostap's patch
glibc: add upstream status for glibc's patch
glib-2.0: add upstream status for glib-2.0's patch
mtd-utils: add upstream status for mtd-utils patches
add upstream status for opkg's patches
mark add_vercmp.patch as inappropriate since the added function is not
used.
(From OE-Core rev: b0052e9467608cdc2e3b85f5b718e6b9c03d44ca)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
17 files changed, 33 insertions, 1 deletions
diff --git a/meta/recipes-bsp/hostap/files/COPYING.patch b/meta/recipes-bsp/hostap/files/COPYING.patch index fe5471e14b..05c70c92e5 100644 --- a/meta/recipes-bsp/hostap/files/COPYING.patch +++ b/meta/recipes-bsp/hostap/files/COPYING.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [other] | ||
2 | |||
1 | diff -ruN hostap-conf-1.0-orig/COPYING hostap-conf-1.0/COPYING | 3 | diff -ruN hostap-conf-1.0-orig/COPYING hostap-conf-1.0/COPYING |
2 | --- hostap-conf-1.0-orig/COPYING 1970-01-01 08:00:00.000000000 +0800 | 4 | --- hostap-conf-1.0-orig/COPYING 1970-01-01 08:00:00.000000000 +0800 |
3 | +++ hostap-conf-1.0/COPYING 2010-12-09 16:36:48.000000000 +0800 | 5 | +++ hostap-conf-1.0/COPYING 2010-12-09 16:36:48.000000000 +0800 |
diff --git a/meta/recipes-connectivity/gypsy/files/fix-unused-but-set-variable-warning.patch b/meta/recipes-connectivity/gypsy/files/fix-unused-but-set-variable-warning.patch index d826970880..8dbf3ef228 100644 --- a/meta/recipes-connectivity/gypsy/files/fix-unused-but-set-variable-warning.patch +++ b/meta/recipes-connectivity/gypsy/files/fix-unused-but-set-variable-warning.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
1 | Index: gypsy-0.8/gypsy/gypsy-time.c | 3 | Index: gypsy-0.8/gypsy/gypsy-time.c |
2 | =================================================================== | 4 | =================================================================== |
3 | --- gypsy-0.8.orig/gypsy/gypsy-time.c | 5 | --- gypsy-0.8.orig/gypsy/gypsy-time.c |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch b/meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch index cca57d4f78..a1001922be 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch | |||
@@ -6,6 +6,8 @@ impact on case when they are available. | |||
6 | 6 | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
8 | 8 | ||
9 | Upstream-Status: Inappropriate [embedded specific] | ||
10 | |||
9 | 11 | ||
10 | Index: glib-2.26.1/glib/gconvert.c | 12 | Index: glib-2.26.1/glib/gconvert.c |
11 | =================================================================== | 13 | =================================================================== |
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch b/meta/recipes-core/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch index 09200dd43b..4ac6d8b56f 100644 --- a/meta/recipes-core/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch +++ b/meta/recipes-core/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [not used] | ||
2 | |||
1 | --- glibc-2.9.orig/configure.in 2009-10-22 15:38:13.000000000 +0200 | 3 | --- glibc-2.9.orig/configure.in 2009-10-22 15:38:13.000000000 +0200 |
2 | +++ glibc-2.9/configure.in 2009-10-22 15:37:33.000000000 +0200 | 4 | +++ glibc-2.9/configure.in 2009-10-22 15:37:33.000000000 +0200 |
3 | @@ -844,10 +844,10 @@ | 5 | @@ -844,10 +844,10 @@ |
diff --git a/meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch b/meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch index fb776fddce..57d6a30d82 100644 --- a/meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch +++ b/meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
1 | --- /tmp/mkfs.jffs2.c 2009-01-11 15:28:41.000000000 +0100 | 3 | --- /tmp/mkfs.jffs2.c 2009-01-11 15:28:41.000000000 +0100 |
2 | +++ git/mkfs.jffs2.c 2009-01-11 15:59:29.000000000 +0100 | 4 | +++ git/mkfs.jffs2.c 2009-01-11 15:59:29.000000000 +0100 |
3 | @@ -100,6 +100,11 @@ | 5 | @@ -100,6 +100,11 @@ |
diff --git a/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch b/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch index 5555654490..60edb8f9da 100644 --- a/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch +++ b/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
1 | --- | 3 | --- |
2 | mkfs.jffs2.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- | 4 | mkfs.jffs2.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- |
3 | 1 file changed, 42 insertions(+), 2 deletions(-) | 5 | 1 file changed, 42 insertions(+), 2 deletions(-) |
diff --git a/meta/recipes-devtools/mtd/mtd-utils/fix-ignoreerrors-git.patch b/meta/recipes-devtools/mtd/mtd-utils/fix-ignoreerrors-git.patch index bec60a18c1..f532a27e9d 100644 --- a/meta/recipes-devtools/mtd/mtd-utils/fix-ignoreerrors-git.patch +++ b/meta/recipes-devtools/mtd/mtd-utils/fix-ignoreerrors-git.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
1 | --- | 3 | --- |
2 | nanddump.c | 4 ++-- | 4 | nanddump.c | 4 ++-- |
3 | 1 file changed, 2 insertions(+), 2 deletions(-) | 5 | 1 file changed, 2 insertions(+), 2 deletions(-) |
diff --git a/meta/recipes-devtools/mtd/mtd-utils/remove-ubi.patch b/meta/recipes-devtools/mtd/mtd-utils/remove-ubi.patch index 4928db00be..24a4697222 100644 --- a/meta/recipes-devtools/mtd/mtd-utils/remove-ubi.patch +++ b/meta/recipes-devtools/mtd/mtd-utils/remove-ubi.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
1 | --- | 3 | --- |
2 | Makefile | 3 --- | 4 | Makefile | 3 --- |
3 | 1 file changed, 3 deletions(-) | 5 | 1 file changed, 3 deletions(-) |
diff --git a/meta/recipes-devtools/opkg/opkg-0.1.8/add_vercmp.patch b/meta/recipes-devtools/opkg/opkg-0.1.8/add_vercmp.patch index 540be83950..c3396d5890 100644 --- a/meta/recipes-devtools/opkg/opkg-0.1.8/add_vercmp.patch +++ b/meta/recipes-devtools/opkg/opkg-0.1.8/add_vercmp.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [other] | ||
2 | |||
1 | Index: trunk/libopkg/opkg.c | 3 | Index: trunk/libopkg/opkg.c |
2 | =================================================================== | 4 | =================================================================== |
3 | --- trunk.orig/libopkg/opkg.c 2010-01-26 20:32:19.000000000 +0000 | 5 | --- trunk.orig/libopkg/opkg.c 2010-01-26 20:32:19.000000000 +0000 |
diff --git a/meta/recipes-devtools/opkg/opkg-0.1.8/headerfix.patch b/meta/recipes-devtools/opkg/opkg-0.1.8/headerfix.patch index d0711ecd0e..b3515a0f8e 100644 --- a/meta/recipes-devtools/opkg/opkg-0.1.8/headerfix.patch +++ b/meta/recipes-devtools/opkg/opkg-0.1.8/headerfix.patch | |||
@@ -2,6 +2,8 @@ Without this, the FILE reference in this header can cause compile issues. | |||
2 | 2 | ||
3 | RP - 29/1/10 | 3 | RP - 29/1/10 |
4 | 4 | ||
5 | Upstream-Status: Pending | ||
6 | |||
5 | Index: trunk/libopkg/pkg_dest.h | 7 | Index: trunk/libopkg/pkg_dest.h |
6 | =================================================================== | 8 | =================================================================== |
7 | --- trunk.orig/libopkg/pkg_dest.h 2010-01-29 09:37:22.000000000 +0000 | 9 | --- trunk.orig/libopkg/pkg_dest.h 2010-01-29 09:37:22.000000000 +0000 |
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/uclibc-exp10-replacement.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/uclibc-exp10-replacement.patch index 038c90d600..b2a9a956cc 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/uclibc-exp10-replacement.patch +++ b/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/uclibc-exp10-replacement.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | uclibc does not have exp10 function which is glibc extension. | 1 | uclibc does not have exp10 function which is glibc extension. |
2 | Bur we can get the same behavior by using pow() | 2 | Bur we can get the same behavior by using pow() |
3 | 3 | ||
4 | Upstream-status: Pending | 4 | Upstream-Status: Pending |
5 | 5 | ||
6 | Khem Raj <raj.khem@gmail.com> | 6 | Khem Raj <raj.khem@gmail.com> |
7 | 7 | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/alsaerror.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/alsaerror.patch index 2efa3e89b8..0f09d2e646 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/alsaerror.patch +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/alsaerror.patch | |||
@@ -6,6 +6,8 @@ X-Git-Url: http://git.0pointer.de/?p=pulseaudio.git;a=commitdiff_plain;h=98a25c5 | |||
6 | alsa: properly convert return values of snd_strerror() to utf8 | 6 | alsa: properly convert return values of snd_strerror() to utf8 |
7 | --- | 7 | --- |
8 | 8 | ||
9 | Upstream-Status: Backport | ||
10 | |||
9 | diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c | 11 | diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c |
10 | index 2fbcd7b..41e8b47 100644 | 12 | index 2fbcd7b..41e8b47 100644 |
11 | --- a/src/modules/alsa/alsa-sink.c | 13 | --- a/src/modules/alsa/alsa-sink.c |
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/autoconf_version.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/autoconf_version.patch index 7a0759da13..158c883317 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/autoconf_version.patch +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/autoconf_version.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
1 | Index: pulseaudio-0.9.15/configure.ac | 3 | Index: pulseaudio-0.9.15/configure.ac |
2 | =================================================================== | 4 | =================================================================== |
3 | --- pulseaudio-0.9.15.orig/configure.ac 2009-04-14 00:09:53.000000000 +0100 | 5 | --- pulseaudio-0.9.15.orig/configure.ac 2009-04-14 00:09:53.000000000 +0100 |
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/buildfix.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/buildfix.patch index ca01e0d80f..da46d4b58b 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/buildfix.patch +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/buildfix.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
1 | Index: pulseaudio-0.9.11/src/pulsecore/atomic.h | 3 | Index: pulseaudio-0.9.11/src/pulsecore/atomic.h |
2 | =================================================================== | 4 | =================================================================== |
3 | --- pulseaudio-0.9.11.orig/src/pulsecore/atomic.h | 5 | --- pulseaudio-0.9.11.orig/src/pulsecore/atomic.h |
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/fallback.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/fallback.patch index 2fae0d4e78..5808d4126d 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/fallback.patch +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/fallback.patch | |||
@@ -10,6 +10,8 @@ only the raw 'hw' device exists but no 'front' although it's a proper | |||
10 | 2ch stereo device. | 10 | 2ch stereo device. |
11 | --- | 11 | --- |
12 | 12 | ||
13 | Upstream-Status: Backport | ||
14 | |||
13 | diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c | 15 | diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c |
14 | index 18d6880..a3a0450 100644 | 16 | index 18d6880..a3a0450 100644 |
15 | --- a/src/modules/alsa/alsa-util.c | 17 | --- a/src/modules/alsa/alsa-util.c |
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/gcc4-compile-fix.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/gcc4-compile-fix.patch index 34ad026e4d..f2296876cb 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/gcc4-compile-fix.patch +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/gcc4-compile-fix.patch | |||
@@ -3,6 +3,8 @@ | |||
3 | | pulsecore/core-util.c:547: error: label at end of compound statement | 3 | | pulsecore/core-util.c:547: error: label at end of compound statement |
4 | | Signed off: mickey@openmoko.org | 4 | | Signed off: mickey@openmoko.org |
5 | | | 5 | | |
6 | Upstream-Status: Pending | ||
7 | |||
6 | Index: pulseaudio-0.9.6/src/pulsecore/core-util.c | 8 | Index: pulseaudio-0.9.6/src/pulsecore/core-util.c |
7 | =================================================================== | 9 | =================================================================== |
8 | --- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c | 10 | --- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c |
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/periodfix.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/periodfix.patch index 3a1c605009..4fc6c15f02 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/periodfix.patch +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.15/periodfix.patch | |||
@@ -1,5 +1,7 @@ | |||
1 | X-Git-Url: http://git.0pointer.de/?p=pulseaudio.git;a=blobdiff_plain;f=src%2Fmodules%2Falsa%2Falsa-util.c;h=107bec357c7889f0197853f5e5f1951a5a2f5be0;hp=a3a045080dac0e1b30e8671443ce73a03337cf14;hb=4bffc7849f7898fa85dd6ac8e735db86b57814b3;hpb=d2b5ae5525e9036c4f91b1615879a5a07aac5bf2 | 1 | X-Git-Url: http://git.0pointer.de/?p=pulseaudio.git;a=blobdiff_plain;f=src%2Fmodules%2Falsa%2Falsa-util.c;h=107bec357c7889f0197853f5e5f1951a5a2f5be0;hp=a3a045080dac0e1b30e8671443ce73a03337cf14;hb=4bffc7849f7898fa85dd6ac8e735db86b57814b3;hpb=d2b5ae5525e9036c4f91b1615879a5a07aac5bf2 |
2 | 2 | ||
3 | Upstream-Status: Backport | ||
4 | |||
3 | diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c | 5 | diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c |
4 | index a3a0450..107bec3 100644 | 6 | index a3a0450..107bec3 100644 |
5 | --- a/src/modules/alsa/alsa-util.c | 7 | --- a/src/modules/alsa/alsa-util.c |