summaryrefslogtreecommitdiffstats
path: root/meta-demoapps/recipes-support/openobex/files
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/recipes-support/openobex/files
parent70c18f205d07384548dcaff904f7f854e9c51cc5 (diff)
downloadpoky-ece80fe035c49a192abbca2dd00e50699e786e95.tar.gz
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/recipes-support/openobex/files')
-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
2 files changed, 4 insertions, 1 deletions
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 @@
1 1
2# 2#
3# Patch managed by http://www.holgerschurig.de/patcher.html 3# Patch managed by http://www.holgerschurig.de/patcher.html
4# 4#
5Upstream-Status: Inappropriate [configuration]
5 6
6--- openobex-1.2/apps/Makefile.am~disable-cable-test 7--- openobex-1.2/apps/Makefile.am~disable-cable-test
7+++ openobex-1.2/apps/Makefile.am 8+++ 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 @@
1Upstream-Status: Inappropriate [configuration]
2
1Index: openobex-1.5/acinclude.m4 3Index: openobex-1.5/acinclude.m4
2=================================================================== 4===================================================================
3--- openobex-1.5.orig/acinclude.m4 2009-02-08 18:30:22.000000000 +0000 5--- openobex-1.5.orig/acinclude.m4 2009-02-08 18:30:22.000000000 +0000