summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-04-23 16:42:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-25 17:19:20 +0100
commiteb76c48798bbcb632a110e54a984cfd7c241998c (patch)
treeb3797d3c457210638f0cb21dd98f63f826bbc0e5 /meta
parentcbf460735e47c4e16252b88bf80a0f27b037f1b0 (diff)
downloadpoky-eb76c48798bbcb632a110e54a984cfd7c241998c.tar.gz
Upstream-Status Cleanups
(From OE-Core rev: ea438b58c9a90e4c3147f99d63a9afc66963c5a1) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/bind/bind/dont-test-on-host.patch4
-rw-r--r--meta/recipes-core/udev/udev/add-install-ptest.patch2
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/force-nostabs.patch2
-rw-r--r--meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch4
-rw-r--r--meta/recipes-extended/ltp/ltp/ltp-Do-not-link-against-libfl.patch2
-rw-r--r--meta/recipes-extended/quota/quota/config-tcpwrappers.patch2
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch2
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/gst-ffmpeg-CVE-2013-3674.patch2
9 files changed, 15 insertions, 7 deletions
diff --git a/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch b/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
index 89207404b5..288e58bb60 100644
--- a/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
+++ b/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
@@ -1,3 +1,7 @@
1Upstream-Status: Pending
2
3Signed-off-by Saul Wold <sgw@linux.intel.com>
4
1Index: bind-9.9.5/bin/Makefile.in 5Index: bind-9.9.5/bin/Makefile.in
2=================================================================== 6===================================================================
3--- bind-9.9.5.orig/bin/Makefile.in 7--- bind-9.9.5.orig/bin/Makefile.in
diff --git a/meta/recipes-core/udev/udev/add-install-ptest.patch b/meta/recipes-core/udev/udev/add-install-ptest.patch
index 44365c69e6..0f8e9b6588 100644
--- a/meta/recipes-core/udev/udev/add-install-ptest.patch
+++ b/meta/recipes-core/udev/udev/add-install-ptest.patch
@@ -6,7 +6,7 @@ Adjustements for ptest:
6 6
7Signed-off-by: Björn Stenberg <bjst@enea.com> 7Signed-off-by: Björn Stenberg <bjst@enea.com>
8Signed-off-by: Alexandra Safta <alst@enea.com> 8Signed-off-by: Alexandra Safta <alst@enea.com>
9Upstream-status: Pending 9Upstream-Status: Pending
10 10
11--- a/Makefile.am 2012-03-18 16:28:14.000000000 +0100 11--- a/Makefile.am 2012-03-18 16:28:14.000000000 +0100
12+++ b/Makefile.am 2013-02-18 10:03:36.531101244 +0100 12+++ b/Makefile.am 2013-02-18 10:03:36.531101244 +0100
diff --git a/meta/recipes-devtools/valgrind/valgrind/force-nostabs.patch b/meta/recipes-devtools/valgrind/valgrind/force-nostabs.patch
index b644348bbc..849dfc50f9 100644
--- a/meta/recipes-devtools/valgrind/valgrind/force-nostabs.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/force-nostabs.patch
@@ -8,7 +8,7 @@ error:
8 ../package/usr/lib/valgrind/ptest/memcheck/tests/deep_templates 8 ../package/usr/lib/valgrind/ptest/memcheck/tests/deep_templates
9 ERROR: Function failed: split_and_strip_files 9 ERROR: Function failed: split_and_strip_files
10 10
11Upstream-status: Inappropriate [gstabs support is appropriate upstream, 11Upstream-Status: Inappropriate [gstabs support is appropriate upstream,
12 but not for this distro] 12 but not for this distro]
13 13
14Signed-off-by: Dave Lerner <dave.lerner@windriver.com> 14Signed-off-by: Dave Lerner <dave.lerner@windriver.com>
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch b/meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch
index 02dbd2031d..5a4149cfc0 100644
--- a/meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch
+++ b/meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch
@@ -1,3 +1,7 @@
1Upstream-Status: Inappropriate [Poky Specific this is gplv2 version]
2
3Signed-off-by Saul Wold <sgw@linux.intel.com>
4
1Index: grep-2.5.1a/doc/grep.texi 5Index: grep-2.5.1a/doc/grep.texi
2=================================================================== 6===================================================================
3--- grep-2.5.1a.orig/doc/grep.texi 7--- grep-2.5.1a.orig/doc/grep.texi
diff --git a/meta/recipes-extended/ltp/ltp/ltp-Do-not-link-against-libfl.patch b/meta/recipes-extended/ltp/ltp/ltp-Do-not-link-against-libfl.patch
index 3e4aa7308d..20fd4c3691 100644
--- a/meta/recipes-extended/ltp/ltp/ltp-Do-not-link-against-libfl.patch
+++ b/meta/recipes-extended/ltp/ltp/ltp-Do-not-link-against-libfl.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] ltp: Don't link against libfl
6We have already defined yywrap function in scan.l file. After this, we no longer need to 6We have already defined yywrap function in scan.l file. After this, we no longer need to
7link against libfl and so no longer get errors about undefined references to yylex. 7link against libfl and so no longer get errors about undefined references to yylex.
8 8
9Upstream-status: Pending 9Upstream-Status: Pending
10 10
11Signed-off-by: Chong Lu <Chong.Lu@windriver.com> 11Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
12--- 12---
diff --git a/meta/recipes-extended/quota/quota/config-tcpwrappers.patch b/meta/recipes-extended/quota/quota/config-tcpwrappers.patch
index 94dc3f5dff..5f47fbd183 100644
--- a/meta/recipes-extended/quota/quota/config-tcpwrappers.patch
+++ b/meta/recipes-extended/quota/quota/config-tcpwrappers.patch
@@ -1,4 +1,4 @@
1Upstream-status: Pending 1Upstream-Status: Pending
2 2
3--- quota-tools.orig/configure.in 3--- quota-tools.orig/configure.in
4+++ quota-tools/configure.in 4+++ quota-tools/configure.in
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch
index 351b24b82f..faef049fec 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch
@@ -4,7 +4,7 @@ Delete "<<<" syntax of bash in Makefile, else we would get following error:
4 4
5 Syntax error: redirection unexpected 5 Syntax error: redirection unexpected
6 6
7Upstream-status: Pending 7Upstream-Status: Pending
8 8
9Signed-off-by: Chong Lu <Chong.Lu@windriver.com> 9Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
10--- 10---
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch
index b1ebf49830..8e7c2a45f9 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch
@@ -4,7 +4,7 @@ Delete "<<<" syntax of bash in Makefile, else we would get following error:
4 4
5 Syntax error: redirection unexpected 5 Syntax error: redirection unexpected
6 6
7Upstream-status: Pending 7Upstream-Status: Pending
8 8
9Signed-off-by: Chong Lu <Chong.Lu@windriver.com> 9Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
10--- 10---
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/gst-ffmpeg-CVE-2013-3674.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/gst-ffmpeg-CVE-2013-3674.patch
index a28404b072..aa385f54c1 100644
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/gst-ffmpeg-CVE-2013-3674.patch
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/gst-ffmpeg-CVE-2013-3674.patch
@@ -4,7 +4,7 @@ Fixes out of array accesses
4 4
5Backported from:http://git.videolan.org/?p=ffmpeg.git;a=commit;h=ad002e1a13a8df934bd6cb2c84175a4780ab8942 5Backported from:http://git.videolan.org/?p=ffmpeg.git;a=commit;h=ad002e1a13a8df934bd6cb2c84175a4780ab8942
6 6
7Upstream-status: Backport 7Upstream-Status: Backport
8 8
9Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind 9Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
10Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 10Signed-off-by: Michael Niedermayer <michaelni@gmx.at>