summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-09-23 20:56:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-24 12:13:49 +0100
commit64ea131e3d7c1920abe059974d621ff7bc899346 (patch)
treee114563aa50252329be1d935f1f83ddbe85f08c4
parentd4384e126a95b1bf7bc9ef53a3c902a8057127e8 (diff)
downloadpoky-64ea131e3d7c1920abe059974d621ff7bc899346.tar.gz
Fix Upstream-Status
These were not getting fixed by orignal committer! (From OE-Core rev: 7db73c70351939c4be9867981a8cf97148bbe57e) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch2
-rw-r--r--meta/recipes-devtools/subversion/subversion-1.7.6/subversion-1.7.6_mod_dontdothat_svnserve_only.patch1
-rw-r--r--meta/recipes-gnome/libffi/0001-libffi-update-for-3.0.11.patch2
3 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch b/meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch
index b9d1ca5143..df61e5d104 100644
--- a/meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch
+++ b/meta/recipes-devtools/guile/files/change-install-data-hook-to-install-exec-hook-in-gui.patch
@@ -12,7 +12,7 @@ that will cause error sometimes.
12 12
13[YOCTO #2796] 13[YOCTO #2796]
14 14
15Upstream Status:Submitted 15Upstream-Status:Submitted
16Upstream Bugid :12015 email:12015@debbugs.gnu.org 16Upstream Bugid :12015 email:12015@debbugs.gnu.org
17guile bug maillist: bug-guile@gnu.org 17guile bug maillist: bug-guile@gnu.org
18 18
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.6/subversion-1.7.6_mod_dontdothat_svnserve_only.patch b/meta/recipes-devtools/subversion/subversion-1.7.6/subversion-1.7.6_mod_dontdothat_svnserve_only.patch
index 77f9135e1a..ad3e767377 100644
--- a/meta/recipes-devtools/subversion/subversion-1.7.6/subversion-1.7.6_mod_dontdothat_svnserve_only.patch
+++ b/meta/recipes-devtools/subversion/subversion-1.7.6/subversion-1.7.6_mod_dontdothat_svnserve_only.patch
@@ -57,6 +57,7 @@ Aarweg 15 web: http://it.oetiker.ch
57CH-4600 Olten switch board: +41 (62) 775 9900 57CH-4600 Olten switch board: +41 (62) 775 9900
58 58
59 59
60Upstream-Status: Backport [from ML]
60 61
61--- 62---
62 build-outputs.mk | 4 ++-- 63 build-outputs.mk | 4 ++--
diff --git a/meta/recipes-gnome/libffi/0001-libffi-update-for-3.0.11.patch b/meta/recipes-gnome/libffi/0001-libffi-update-for-3.0.11.patch
index 95920485be..2ff109bb8e 100644
--- a/meta/recipes-gnome/libffi/0001-libffi-update-for-3.0.11.patch
+++ b/meta/recipes-gnome/libffi/0001-libffi-update-for-3.0.11.patch
@@ -3,7 +3,7 @@ From: Andrei Dinu <andrei.adrianx.dinu@intel.com>
3Date: Wed, 12 Sep 2012 17:42:29 +0300 3Date: Wed, 12 Sep 2012 17:42:29 +0300
4Subject: [PATCH] libffi update for 3.0.11 4Subject: [PATCH] libffi update for 3.0.11
5 5
6Upstream status : Pending 6Upstream-Status : Pending
7 7
8Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com> 8Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
9--- 9---