1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 00:59:48 +00:00

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>
This commit is contained in:
Saul Wold
2014-04-23 16:42:39 +00:00
committed by Richard Purdie
parent cbf460735e
commit eb76c48798
9 changed files with 15 additions and 7 deletions
@@ -1,3 +1,7 @@
Upstream-Status: Pending
Signed-off-by Saul Wold <sgw@linux.intel.com>
Index: bind-9.9.5/bin/Makefile.in Index: bind-9.9.5/bin/Makefile.in
=================================================================== ===================================================================
--- bind-9.9.5.orig/bin/Makefile.in --- bind-9.9.5.orig/bin/Makefile.in
@@ -6,7 +6,7 @@ Adjustements for ptest:
Signed-off-by: Björn Stenberg <bjst@enea.com> Signed-off-by: Björn Stenberg <bjst@enea.com>
Signed-off-by: Alexandra Safta <alst@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 --- a/Makefile.am 2012-03-18 16:28:14.000000000 +0100
+++ b/Makefile.am 2013-02-18 10:03:36.531101244 +0100 +++ b/Makefile.am 2013-02-18 10:03:36.531101244 +0100
@@ -8,7 +8,7 @@ error:
../package/usr/lib/valgrind/ptest/memcheck/tests/deep_templates ../package/usr/lib/valgrind/ptest/memcheck/tests/deep_templates
ERROR: Function failed: split_and_strip_files 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] but not for this distro]
Signed-off-by: Dave Lerner <dave.lerner@windriver.com> Signed-off-by: Dave Lerner <dave.lerner@windriver.com>
@@ -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 Index: grep-2.5.1a/doc/grep.texi
=================================================================== ===================================================================
--- grep-2.5.1a.orig/doc/grep.texi --- grep-2.5.1a.orig/doc/grep.texi
@@ -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 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. 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> Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
--- ---
@@ -1,4 +1,4 @@
Upstream-status: Pending Upstream-Status: Pending
--- quota-tools.orig/configure.in --- quota-tools.orig/configure.in
+++ quota-tools/configure.in +++ quota-tools/configure.in
@@ -4,7 +4,7 @@ Delete "<<<" syntax of bash in Makefile, else we would get following error:
Syntax error: redirection unexpected Syntax error: redirection unexpected
Upstream-status: Pending Upstream-Status: Pending
Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
--- ---
@@ -4,7 +4,7 @@ Delete "<<<" syntax of bash in Makefile, else we would get following error:
Syntax error: redirection unexpected Syntax error: redirection unexpected
Upstream-status: Pending Upstream-Status: Pending
Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
--- ---
@@ -4,7 +4,7 @@ Fixes out of array accesses
Backported from:http://git.videolan.org/?p=ffmpeg.git;a=commit;h=ad002e1a13a8df934bd6cb2c84175a4780ab8942 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 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>