aboutsummaryrefslogtreecommitdiffstats
path: root/meta-demoapps
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-12-28 15:41:08 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:31 +0000
commitece80fe035c49a192abbca2dd00e50699e786e95 (patch)
tree605be2dd67546c867b234c78148b393686021061 /meta-demoapps
parent70c18f205d07384548dcaff904f7f854e9c51cc5 (diff)
downloadpoky-ece80fe035c49a192abbca2dd00e50699e786e95.tar.gz
poky-ece80fe035c49a192abbca2dd00e50699e786e95.tar.bz2
poky-ece80fe035c49a192abbca2dd00e50699e786e95.zip
Add Upstream-Status to patches
(From OE-Core rev: 169e55d802883df763dbff4a4737e05e96358fa3) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-demoapps')
-rw-r--r--meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch2
-rw-r--r--meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch2
-rw-r--r--meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch2
-rw-r--r--meta-demoapps/recipes-connectivity/wbxml/files/no-doc-install.patch2
-rw-r--r--meta-demoapps/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch2
-rw-r--r--meta-demoapps/recipes-support/libfribidi/files/libtool-update.patch2
-rw-r--r--meta-demoapps/recipes-support/openobex/files/disable-cable-test.patch3
-rw-r--r--meta-demoapps/recipes-support/openobex/files/libusb_crosscompile_check.patch2
8 files changed, 16 insertions, 1 deletions
diff --git a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch b/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch
index e6da2eaa5f..ffebf2b504 100644
--- a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch
+++ b/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: openswan-2.4.7/Makefile.inc
===================================================================
--- openswan-2.4.7.orig/Makefile.inc 2006-12-25 18:05:40.608503250 +0100
diff --git a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch b/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch
index e3cc8762cc..92f3547f90 100644
--- a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch
+++ b/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- openswan-2.2.0.orig/programs/Makefile.program 2004-06-03 03:06:27.000000000 +0200
+++ openswan-2.2.0/programs/Makefile.program 2005-03-05 13:50:19.000000000 +0100
@@ -30,10 +30,6 @@
diff --git a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch b/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch
index b3863a584b..c24227c18f 100644
--- a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch
+++ b/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
diff -Nru openswan-2.4.7.orig/doc/Makefile openswan-2.4.7/doc/Makefile
--- openswan-2.4.7.orig/doc/Makefile 2005-11-08 23:32:45.000000000 +0200
+++ openswan-2.4.7/doc/Makefile 2006-12-06 22:46:54.732830840 +0200
diff --git a/meta-demoapps/recipes-connectivity/wbxml/files/no-doc-install.patch b/meta-demoapps/recipes-connectivity/wbxml/files/no-doc-install.patch
index 16084e60e6..1d9ea431c2 100644
--- a/meta-demoapps/recipes-connectivity/wbxml/files/no-doc-install.patch
+++ b/meta-demoapps/recipes-connectivity/wbxml/files/no-doc-install.patch
@@ -1,3 +1,5 @@
+
+Upstream-Status: Inappropriate [configuration]
--- wbxml2-0.9.2/Makefile.am.old 2007-01-03 19:50:24.000000000 +0000
+++ wbxml2-0.9.2/Makefile.am 2007-01-03 19:50:39.000000000 +0000
@@ -24,9 +24,9 @@
diff --git a/meta-demoapps/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch b/meta-demoapps/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch
index aeb02ab2c1..64a9affded 100644
--- a/meta-demoapps/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch
+++ b/meta-demoapps/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch
@@ -3,6 +3,8 @@
gcalctool/Makefile.am | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
+Upstream-Status: Inappropriate [configuration]
+
Index: gcalctool-5.8.17/gcalctool/Makefile.am
===================================================================
--- gcalctool-5.8.17.orig/gcalctool/Makefile.am 2005-12-19 15:46:57.000000000 +0000
diff --git a/meta-demoapps/recipes-support/libfribidi/files/libtool-update.patch b/meta-demoapps/recipes-support/libfribidi/files/libtool-update.patch
index c7031008fd..7fbbe28b8e 100644
--- a/meta-demoapps/recipes-support/libfribidi/files/libtool-update.patch
+++ b/meta-demoapps/recipes-support/libfribidi/files/libtool-update.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- fribidi-0.10.4/configure.in~ 2002-05-19 11:06:48.000000000 +0100
+++ fribidi-0.10.4/configure.in 2004-08-03 17:42:28.000000000 +0100
@@ -50,7 +50,7 @@
diff --git a/meta-demoapps/recipes-support/openobex/files/disable-cable-test.patch b/meta-demoapps/recipes-support/openobex/files/disable-cable-test.patch
index 95b636dd8f..4251138f73 100644
--- a/meta-demoapps/recipes-support/openobex/files/disable-cable-test.patch
+++ b/meta-demoapps/recipes-support/openobex/files/disable-cable-test.patch
@@ -1,7 +1,8 @@
#
# Patch managed by http://www.holgerschurig.de/patcher.html
-#
+#
+Upstream-Status: Inappropriate [configuration]
--- openobex-1.2/apps/Makefile.am~disable-cable-test
+++ openobex-1.2/apps/Makefile.am
diff --git a/meta-demoapps/recipes-support/openobex/files/libusb_crosscompile_check.patch b/meta-demoapps/recipes-support/openobex/files/libusb_crosscompile_check.patch
index 20ac70bd1e..18841a819a 100644
--- a/meta-demoapps/recipes-support/openobex/files/libusb_crosscompile_check.patch
+++ b/meta-demoapps/recipes-support/openobex/files/libusb_crosscompile_check.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: openobex-1.5/acinclude.m4
===================================================================
--- openobex-1.5.orig/acinclude.m4 2009-02-08 18:30:22.000000000 +0000