[oe-commits] Saul Wold : Upstream-Status Cleanups

git at git.openembedded.org git at git.openembedded.org
Fri Apr 25 16:20:06 UTC 2014


Module: openembedded-core.git
Branch: master-next
Commit: ea438b58c9a90e4c3147f99d63a9afc66963c5a1
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ea438b58c9a90e4c3147f99d63a9afc66963c5a1

Author: Saul Wold <sgw at linux.intel.com>
Date:   Wed Apr 23 16:42:39 2014 +0000

Upstream-Status Cleanups

Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-connectivity/bind/bind/dont-test-on-host.patch           | 4 ++++
 meta/recipes-core/udev/udev/add-install-ptest.patch                   | 2 +-
 meta/recipes-devtools/valgrind/valgrind/force-nostabs.patch           | 2 +-
 meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch      | 4 ++++
 meta/recipes-extended/ltp/ltp/ltp-Do-not-link-against-libfl.patch     | 2 +-
 meta/recipes-extended/quota/quota/config-tcpwrappers.patch            | 2 +-
 .../trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch   | 2 +-
 .../trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch     | 2 +-
 .../gstreamer/gst-ffmpeg-0.10.13/gst-ffmpeg-CVE-2013-3674.patch       | 2 +-
 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 8920740..288e58b 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 at 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 44365c6..0f8e9b6 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 at enea.com>
 Signed-off-by: Alexandra Safta <alst at 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 b644348..849dfc5 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 at 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 02dbd20..5a4149c 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 at 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 3e4aa73..20fd4c3 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 at windriver.com>
 ---
diff --git a/meta/recipes-extended/quota/quota/config-tcpwrappers.patch b/meta/recipes-extended/quota/quota/config-tcpwrappers.patch
index 94dc3f5..5f47fbd 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 351b24b..faef049 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 at 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 b1ebf49..8e7c2a4 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 at 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 a28404b..aa385f5 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 at gmx.at>



More information about the Openembedded-commits mailing list