aboutsummaryrefslogtreecommitdiffstats
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:18:46 +0100
commitea438b58c9a90e4c3147f99d63a9afc66963c5a1 (patch)
treeedca4fb132d60b806480645be25379adea3b57c7
parent1a91d791a903ab837a7695cfe47828618b8be6a6 (diff)
downloadopenembedded-core-contrib-ea438b58c9a90e4c3147f99d63a9afc66963c5a1.tar.gz
Upstream-Status Cleanups
Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 89207404b52..288e58bb60b 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 @@
+Upstream-Status: Pending
+
+Signed-off-by Saul Wold <sgw@linux.intel.com>
+
Index: bind-9.9.5/bin/Makefile.in
===================================================================
--- 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 44365c69e65..0f8e9b6588e 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:
Signed-off-by: Björn Stenberg <bjst@enea.com>
Signed-off-by: Alexandra Safta <alst@enea.com>
-Upstream-status: Pending
+Upstream-Status: Pending
--- a/Makefile.am 2012-03-18 16:28:14.000000000 +0100
+++ 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 b644348bbcf..849dfc50f92 100644
--- a/meta/recipes-devtools/valgrind/valgrind/force-nostabs.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/force-nostabs.patch
@@ -8,7 +8,7 @@ error:
../package/usr/lib/valgrind/ptest/memcheck/tests/deep_templates
ERROR: Function failed: split_and_strip_files
-Upstream-status: Inappropriate [gstabs support is appropriate upstream,
+Upstream-Status: Inappropriate [gstabs support is appropriate upstream,
but not for this distro]
Signed-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 02dbd2031d0..5a4149cfc01 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 @@
+Upstream-Status: Inappropriate [Poky Specific this is gplv2 version]
+
+Signed-off-by Saul Wold <sgw@linux.intel.com>
+
Index: grep-2.5.1a/doc/grep.texi
===================================================================
--- 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 3e4aa7308db..20fd4c36913 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
We have already defined yywrap function in scan.l file. After this, we no longer need to
link against libfl and so no longer get errors about undefined references to yylex.
-Upstream-status: Pending
+Upstream-Status: Pending
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
diff --git a/meta/recipes-extended/quota/quota/config-tcpwrappers.patch b/meta/recipes-extended/quota/quota/config-tcpwrappers.patch
index 94dc3f5dff6..5f47fbd1833 100644
--- a/meta/recipes-extended/quota/quota/config-tcpwrappers.patch
+++ b/meta/recipes-extended/quota/quota/config-tcpwrappers.patch
@@ -1,4 +1,4 @@
-Upstream-status: Pending
+Upstream-Status: Pending
--- quota-tools.orig/configure.in
+++ 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 351b24b82f1..faef049feca 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:
Syntax error: redirection unexpected
-Upstream-status: Pending
+Upstream-Status: Pending
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
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 b1ebf498306..8e7c2a45f90 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:
Syntax error: redirection unexpected
-Upstream-status: Pending
+Upstream-Status: Pending
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
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 a28404b072e..aa385f54c14 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
Backported from:http://git.videolan.org/?p=ffmpeg.git;a=commit;h=ad002e1a13a8df934bd6cb2c84175a4780ab8942
-Upstream-status: Backport
+Upstream-Status: Backport
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>