summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-08 11:42:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-08 11:43:23 +0100
commite4f0176b67fa16537f42a18b3f2d9ffb79f03c53 (patch)
treefa05f315d9d0b263c4a9836e439f68371c5e38d1
parentea2a85035a6667f29ae65558e6c3ae629d9f4530 (diff)
downloadpoky-e4f0176b67fa16537f42a18b3f2d9ffb79f03c53.tar.gz
gettext/shared-mime-info: Add missing patch upstream status field
(From OE-Core rev: d87ffe7bf7812c8732e792ee8720fe1626813a1d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch2
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch2
2 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch
index 4ca44cce88..f2c567d188 100644
--- a/meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch
+++ b/meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch
@@ -4,6 +4,8 @@ In a multiple job build, Makefile can simultaneously
4be installing and removing libgettextlib.a. We serialize 4be installing and removing libgettextlib.a. We serialize
5the operations. 5the operations.
6 6
7Upstream-Status: Pending
8
7Signed-off-by: Joe Slater <jslater@windriver.com> 9Signed-off-by: Joe Slater <jslater@windriver.com>
8 10
9--- a/gettext-tools/gnulib-lib/Makefile.am 11--- a/gettext-tools/gnulib-lib/Makefile.am
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
index 4c075f2549..3c9f1ea438 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
@@ -4,6 +4,8 @@ The definition of install-data-hook in Makefile.am leads
4to multiple, overlapping, executions of install-binPROGRAMS 4to multiple, overlapping, executions of install-binPROGRAMS
5target. We modify the definition to avoid that. 5target. We modify the definition to avoid that.
6 6
7Upstream-Status: Pending
8
7Signed-off-by: Joe Slater <jslater@windriver.com> 9Signed-off-by: Joe Slater <jslater@windriver.com>
8 10
9--- a/Makefile.am 11--- a/Makefile.am