Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

18 files changed, 34 insertions, 34 deletions

diff --git a/recipes/gdb/gdb-canadian-sdk_6.8.bb b/recipes/gdb/gdb-canadian-sdk_6.8.bb
index be05d50f0d..51731ff70a 100644
--- a/recipes/gdb/gdb-canadian-sdk_6.8.bb
+++ b/recipes/gdb/gdb-canadian-sdk_6.8.bb
@@ -1,11 +1,11 @@
 require gdb-canadian-cross.inc
 LICENSE = "GPLv3"
 
-SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \
-	    file://gdb-6.8-mingw-3.patch;patch=1 \
-	    file://gdb-6.8-pr9638-ppc-canadian-configh.patch;patch=1 \
-	    file://gdb-6.8-fix-compile-karmic.patch;patch=1 \
-	    file://gdb-6.8-mips-mingw-sim-fixup.patch;patch=1"
+SRC_URI += "file://gcc-4.3-build-error.patch;striplevel=0 \
+	    file://gdb-6.8-mingw-3.patch \
+	    file://gdb-6.8-pr9638-ppc-canadian-configh.patch \
+	    file://gdb-6.8-fix-compile-karmic.patch \
+	    file://gdb-6.8-mips-mingw-sim-fixup.patch"
 
 PR = "r1"
 
diff --git a/recipes/gdb/gdb-canadian-sdk_7.0.bb b/recipes/gdb/gdb-canadian-sdk_7.0.bb
index d09530720a..2178c97261 100644
--- a/recipes/gdb/gdb-canadian-sdk_7.0.bb
+++ b/recipes/gdb/gdb-canadian-sdk_7.0.bb
@@ -2,9 +2,9 @@ require gdb-canadian-cross.inc
 LICENSE = "GPLv3"
 
 SRC_URI += "\
-	    file://gdb-6.8-mingw-3.patch;patch=1 \
-	    file://gdb-6.8-pr9638-ppc-canadian-configh.patch;patch=1 \
-	    file://gdb-6.8-fix-compile-karmic.patch;patch=1 \
+	    file://gdb-6.8-mingw-3.patch \
+	    file://gdb-6.8-pr9638-ppc-canadian-configh.patch \
+	    file://gdb-6.8-fix-compile-karmic.patch \
 	    "
 do_stage() {
 	:
diff --git a/recipes/gdb/gdb-canadian-sdk_7.1.bb b/recipes/gdb/gdb-canadian-sdk_7.1.bb
index 66e41f1d92..334d5557c3 100644
--- a/recipes/gdb/gdb-canadian-sdk_7.1.bb
+++ b/recipes/gdb/gdb-canadian-sdk_7.1.bb
@@ -2,9 +2,9 @@ require gdb-canadian-cross.inc
 LICENSE = "GPLv3"
 
 SRC_URI += "\
-	    file://gdb-6.8-mingw-3.patch;patch=1 \
-	    file://gdb-6.8-pr9638-ppc-canadian-configh.patch;patch=1 \
-	    file://gdb-6.8-fix-compile-karmic.patch;patch=1 \
+	    file://gdb-6.8-mingw-3.patch \
+	    file://gdb-6.8-pr9638-ppc-canadian-configh.patch \
+	    file://gdb-6.8-fix-compile-karmic.patch \
 	    "
 do_stage() {
 	:
diff --git a/recipes/gdb/gdb-cross-sdk_6.6.bb b/recipes/gdb/gdb-cross-sdk_6.6.bb
index 62b9f825c7..fb81c5ee19 100644
--- a/recipes/gdb/gdb-cross-sdk_6.6.bb
+++ b/recipes/gdb/gdb-cross-sdk_6.6.bb
@@ -7,7 +7,7 @@ DEPENDS = "ncurses-sdk zlib-sdk flex-native"
 
 PR = "r3"
 
-SRC_URI += "file://early_debug_in_nptl.patch;patch=1;pnum=0"
+SRC_URI += "file://early_debug_in_nptl.patch;striplevel=0"
 
 do_stage() {
 	:
diff --git a/recipes/gdb/gdb-cross-sdk_6.8.bb b/recipes/gdb/gdb-cross-sdk_6.8.bb
index ff27808f23..34108c8315 100644
--- a/recipes/gdb/gdb-cross-sdk_6.8.bb
+++ b/recipes/gdb/gdb-cross-sdk_6.8.bb
@@ -1,8 +1,8 @@
 require gdb-cross.inc
 LICENSE = "GPLv3"
 
-SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \
-            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
+SRC_URI += "file://gcc-4.3-build-error.patch;striplevel=0 \
+            file://gdb-6.8-fix-compile-karmic.patch"
 
 DEPENDS = "ncurses-sdk zlib-sdk flex-native"
 
diff --git a/recipes/gdb/gdb-cross-sdk_7.0.bb b/recipes/gdb/gdb-cross-sdk_7.0.bb
index 16f3a56986..238ce15017 100644
--- a/recipes/gdb/gdb-cross-sdk_7.0.bb
+++ b/recipes/gdb/gdb-cross-sdk_7.0.bb
@@ -2,7 +2,7 @@ require gdb-cross.inc
 LICENSE = "GPLv3"
 
 SRC_URI += "\
-            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
+            file://gdb-6.8-fix-compile-karmic.patch"
 
 DEPENDS = "ncurses-sdk zlib-sdk flex-native"
 
diff --git a/recipes/gdb/gdb-cross-sdk_7.1.bb b/recipes/gdb/gdb-cross-sdk_7.1.bb
index bf58a5a7ac..54cc1130d3 100644
--- a/recipes/gdb/gdb-cross-sdk_7.1.bb
+++ b/recipes/gdb/gdb-cross-sdk_7.1.bb
@@ -2,7 +2,7 @@ require gdb-cross.inc
 LICENSE = "GPLv3"
 
 SRC_URI += "\
-            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
+            file://gdb-6.8-fix-compile-karmic.patch"
 
 DEPENDS = "ncurses-sdk zlib-sdk flex-native"
 
diff --git a/recipes/gdb/gdb-cross_6.3.bb b/recipes/gdb/gdb-cross_6.3.bb
index 3371225f67..937b669cbe 100644
--- a/recipes/gdb/gdb-cross_6.3.bb
+++ b/recipes/gdb/gdb-cross_6.3.bb
@@ -3,8 +3,8 @@ LICENSE = "GPLv2"
 
 PR = "r3"
 
-SRC_URI += "file://sim-install-makefile.patch;patch=1 \
-	file://sim-install-makefile-common.patch;patch=1"
+SRC_URI += "file://sim-install-makefile.patch \
+	file://sim-install-makefile-common.patch"
 
 SRC_URI[md5sum] = "812de9e756d53c749ea5516d9ffa5905"
 SRC_URI[sha256sum] = "c06bf9715436b3a28c189163aa5ca42b46af8286659827f033eaaf7d8b1fc342"
diff --git a/recipes/gdb/gdb-cross_6.6.bb b/recipes/gdb/gdb-cross_6.6.bb
index 30ac4a2c16..b9a9f5fee8 100644
--- a/recipes/gdb/gdb-cross_6.6.bb
+++ b/recipes/gdb/gdb-cross_6.6.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 
 PR = "r3"
 
-SRC_URI += "file://early_debug_in_nptl.patch;patch=1;pnum=0"
+SRC_URI += "file://early_debug_in_nptl.patch;striplevel=0"
 
 
 SRC_URI[md5sum] = "18be4e7a1ac713bda93d00fee20bbef8"
diff --git a/recipes/gdb/gdb-cross_6.8.bb b/recipes/gdb/gdb-cross_6.8.bb
index 275009d08f..f943bc27bc 100644
--- a/recipes/gdb/gdb-cross_6.8.bb
+++ b/recipes/gdb/gdb-cross_6.8.bb
@@ -1,8 +1,8 @@
 require gdb-cross.inc
 LICENSE = "GPLv3"
 
-SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \
-            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
+SRC_URI += "file://gcc-4.3-build-error.patch;striplevel=0 \
+            file://gdb-6.8-fix-compile-karmic.patch"
 
 PR = "r3"
 
diff --git a/recipes/gdb/gdb-cross_7.0.bb b/recipes/gdb/gdb-cross_7.0.bb
index c9beb3c33d..421403aa00 100644
--- a/recipes/gdb/gdb-cross_7.0.bb
+++ b/recipes/gdb/gdb-cross_7.0.bb
@@ -2,7 +2,7 @@ require gdb-cross.inc
 LICENSE = "GPLv3"
 
 SRC_URI += " \
-            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
+            file://gdb-6.8-fix-compile-karmic.patch"
 
 SRC_URI[md5sum] = "67b4144db385620d7b93f7b0c26800f7"
 SRC_URI[sha256sum] = "ccff6cab0e847c486d30b70bdddac4e6646bafcecaa3b63134d6e3d4d5a4b91d"
diff --git a/recipes/gdb/gdb-cross_7.1.bb b/recipes/gdb/gdb-cross_7.1.bb
index 07233fc4bd..2c022db054 100644
--- a/recipes/gdb/gdb-cross_7.1.bb
+++ b/recipes/gdb/gdb-cross_7.1.bb
@@ -2,7 +2,7 @@ require gdb-cross.inc
 LICENSE = "GPLv3"
 
 SRC_URI += " \
-            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
+            file://gdb-6.8-fix-compile-karmic.patch"
 
 SRC_URI[md5sum] = "01a6ce13bab5307cfac5c405e4afd1cf"
 SRC_URI[sha256sum] = "fc839b5226b94e58a5c7a526e67b7f8f93c7829d05dae1b6247f1bfe3829f291"
diff --git a/recipes/gdb/gdb.inc b/recipes/gdb/gdb.inc
index 1dfaa89284..3500e1accb 100644
--- a/recipes/gdb/gdb.inc
+++ b/recipes/gdb/gdb.inc
@@ -16,9 +16,9 @@ RRECOMMENDS_gdb_append_linux-spe = " uclibc-thread-db "
 
 inherit gettext
 
-SRC_URI += "file://kill_arm_map_symbols.patch;patch=1 \
-            file://gdbserver-cflags-last.diff;patch=1;pnum=0"
-#FIXME	   file://uclibc.patch;patch=1 \
+SRC_URI += "file://kill_arm_map_symbols.patch \
+            file://gdbserver-cflags-last.diff;striplevel=0"
+#FIXME	   file://uclibc.patch \
 
 EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
 
diff --git a/recipes/gdb/gdb_6.6.bb b/recipes/gdb/gdb_6.6.bb
index 5ed504a357..7f18882079 100644
--- a/recipes/gdb/gdb_6.6.bb
+++ b/recipes/gdb/gdb_6.6.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 
 PR = "r5"
 
-SRC_URI += "file://early_debug_in_nptl.patch;patch=1;pnum=0"
+SRC_URI += "file://early_debug_in_nptl.patch;striplevel=0"
 
 SRC_URI[md5sum] = "18be4e7a1ac713bda93d00fee20bbef8"
 SRC_URI[sha256sum] = "c119ce82f0e42d3412420c42c1ead75e0b9de67131a5c9dd3cdab509f65ddfdd"
diff --git a/recipes/gdb/gdb_6.8.bb b/recipes/gdb/gdb_6.8.bb
index 00d1a67a0b..9d6d54fb81 100644
--- a/recipes/gdb/gdb_6.8.bb
+++ b/recipes/gdb/gdb_6.8.bb
@@ -1,8 +1,8 @@
 require gdb.inc
 LICENSE = "GPLv3"
 
-SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \
-            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
+SRC_URI += "file://gcc-4.3-build-error.patch;striplevel=0 \
+            file://gdb-6.8-fix-compile-karmic.patch"
 
 PR = "r3"
 
diff --git a/recipes/gdb/gdb_7.0.bb b/recipes/gdb/gdb_7.0.bb
index ba40e25b64..72a78db134 100644
--- a/recipes/gdb/gdb_7.0.bb
+++ b/recipes/gdb/gdb_7.0.bb
@@ -2,7 +2,7 @@ require gdb.inc
 LICENSE = "GPLv3"
 
 SRC_URI += "\
-            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
+            file://gdb-6.8-fix-compile-karmic.patch"
 
 # Work-around problems while creating libbfd.a
 EXTRA_OECONF += "--enable-static"
diff --git a/recipes/gdb/gdb_7.1.bb b/recipes/gdb/gdb_7.1.bb
index fdc78c9e1d..5489c80b61 100644
--- a/recipes/gdb/gdb_7.1.bb
+++ b/recipes/gdb/gdb_7.1.bb
@@ -2,7 +2,7 @@ require gdb.inc
 LICENSE = "GPLv3"
 
 SRC_URI += "\
-            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
+            file://gdb-6.8-fix-compile-karmic.patch"
 
 # Work-around problems while creating libbfd.a
 EXTRA_OECONF += "--enable-static"
diff --git a/recipes/gdb/gdbserver.inc b/recipes/gdb/gdbserver.inc
index f477c3aa9c..115f293578 100644
--- a/recipes/gdb/gdbserver.inc
+++ b/recipes/gdb/gdbserver.inc
@@ -17,9 +17,9 @@ inherit gettext
 
 FILESPATHPKG =. "gdb-${PV}:"
 
-SRC_URI += "file://kill_arm_map_symbols.patch;patch=1 \
-            file://gdbserver-cflags-last.diff;patch=1;pnum=0"
-#FIXME	   file://uclibc.patch;patch=1 \
+SRC_URI += "file://kill_arm_map_symbols.patch \
+            file://gdbserver-cflags-last.diff;striplevel=0"
+#FIXME	   file://uclibc.patch \
 
 EXTRA_OEMAKE = "gdbserver"