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

6 files changed, 47 insertions, 47 deletions

diff --git a/recipes/klibc/klibc-common.inc b/recipes/klibc/klibc-common.inc
index 8fa815d1f0..7b7a3cb43e 100644
--- a/recipes/klibc/klibc-common.inc
+++ b/recipes/klibc/klibc-common.inc
@@ -24,8 +24,8 @@ KLIBC_ARCH_pentium = 'i386'
 # could be fixed, but for the moment:
 ARM_INSTRUCTION_SET = "arm"
 
-SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch;patch=1"
-SRC_URI_append_linux-uclibceabi = "file://klibc-config-eabi.patch;patch=1"
+SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch"
+SRC_URI_append_linux-uclibceabi = "file://klibc-config-eabi.patch"
 
 EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
                 'CROSS_COMPILE=${TARGET_PREFIX}' \
diff --git a/recipes/klibc/klibc_1.5.15+1.5.16.inc b/recipes/klibc/klibc_1.5.15+1.5.16.inc
index 1a1ab5b2bf..f638e14626 100644
--- a/recipes/klibc/klibc_1.5.15+1.5.16.inc
+++ b/recipes/klibc/klibc_1.5.15+1.5.16.inc
@@ -4,20 +4,20 @@ require klibc-common.inc
 # until 1.5.16 is released
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/${KLIBC_FETCHDIR}/klibc-1.5.15.tar.bz2 \
-            file://1.5.15+1.5.16.patch;patch=1 \
+            file://1.5.15+1.5.16.patch \
             "
 
-SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \
-            file://modprobe.patch;patch=1 \
-            file://losetup.patch;patch=1 \
-            file://dash_readopt.patch;patch=1 \
-            file://wc.patch;patch=1 \
-            file://staging.patch;patch=1 \
-            file://klibc_kexecsyscall.patch;patch=1 \
-            file://mntproc-definitions.patch;patch=1 \
-            file://signal-cleanup.patch;patch=1 \
-            file://isystem.patch;patch=1 \
-            file://socket.h.patch;patch=1 \
+SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \
+            file://modprobe.patch \
+            file://losetup.patch \
+            file://dash_readopt.patch \
+            file://wc.patch \
+            file://staging.patch \
+            file://klibc_kexecsyscall.patch \
+            file://mntproc-definitions.patch \
+            file://signal-cleanup.patch \
+            file://isystem.patch \
+            file://socket.h.patch \
             "
 
 S = "${WORKDIR}/klibc-1.5.15"
diff --git a/recipes/klibc/klibc_1.5.15.inc b/recipes/klibc/klibc_1.5.15.inc
index eb89e58262..22bd84ceef 100644
--- a/recipes/klibc/klibc_1.5.15.inc
+++ b/recipes/klibc/klibc_1.5.15.inc
@@ -1,15 +1,15 @@
 require klibc-common.inc
 
-SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \
-            file://modprobe.patch;patch=1 \
-            file://losetup.patch;patch=1 \
-            file://dash_readopt.patch;patch=1 \
-            file://wc.patch;patch=1 \
-            file://staging.patch;patch=1 \
-            file://klibc_kexecsyscall.patch;patch=1 \
-            file://mntproc-definitions.patch;patch=1 \
-            file://signal-cleanup.patch;patch=1 \
-            file://isystem.patch;patch=1 \
+SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \
+            file://modprobe.patch \
+            file://losetup.patch \
+            file://dash_readopt.patch \
+            file://wc.patch \
+            file://staging.patch \
+            file://klibc_kexecsyscall.patch \
+            file://mntproc-definitions.patch \
+            file://signal-cleanup.patch \
+            file://isystem.patch \
             "
 
 KLIBC_FETCHDIR = "1.5"
diff --git a/recipes/klibc/klibc_1.5.17.inc b/recipes/klibc/klibc_1.5.17.inc
index 21a3dd47f9..69d0dc7ea6 100644
--- a/recipes/klibc/klibc_1.5.17.inc
+++ b/recipes/klibc/klibc_1.5.17.inc
@@ -1,13 +1,13 @@
 require klibc-common.inc
 
-SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \
-            file://modprobe.patch;patch=1 \
-            file://dash_readopt.patch;patch=1 \
-            file://wc.patch;patch=1 \
-            file://staging.patch;patch=1 \
-            file://klibc_kexecsyscall.patch;patch=1 \
-            file://mntproc-definitions.patch;patch=1 \
-            file://isystem.patch;patch=1 \
+SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \
+            file://modprobe.patch \
+            file://dash_readopt.patch \
+            file://wc.patch \
+            file://staging.patch \
+            file://klibc_kexecsyscall.patch \
+            file://mntproc-definitions.patch \
+            file://isystem.patch \
 	    "
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/klibc/klibc_1.5.18.inc b/recipes/klibc/klibc_1.5.18.inc
index 760509251d..c426b066c1 100644
--- a/recipes/klibc/klibc_1.5.18.inc
+++ b/recipes/klibc/klibc_1.5.18.inc
@@ -1,13 +1,13 @@
 require klibc-common.inc
 
-SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \
-            file://modprobe.patch;patch=1 \
-            file://dash_readopt.patch;patch=1 \
-            file://wc.patch;patch=1 \
-            file://staging.patch;patch=1 \
-            file://klibc_kexecsyscall.patch;patch=1 \
-            file://mntproc-definitions.patch;patch=1 \
-            file://isystem.patch;patch=1 \
+SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \
+            file://modprobe.patch \
+            file://dash_readopt.patch \
+            file://wc.patch \
+            file://staging.patch \
+            file://klibc_kexecsyscall.patch \
+            file://mntproc-definitions.patch \
+            file://isystem.patch \
 	    "
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/klibc/klibc_1.5.inc b/recipes/klibc/klibc_1.5.inc
index 7847009efb..b00f02cc56 100644
--- a/recipes/klibc/klibc_1.5.inc
+++ b/recipes/klibc/klibc_1.5.inc
@@ -1,12 +1,12 @@
 require klibc-common.inc
 
-SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \
-            file://modprobe.patch;patch=1 \
-            file://losetup.patch;patch=1 \
-            file://dash_readopt.patch;patch=1 \
-            file://wc.patch;patch=1 \
-            file://staging.patch;patch=1 \
-            file://klibc_kexecsyscall.patch;patch=1 \
+SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \
+            file://modprobe.patch \
+            file://losetup.patch \
+            file://dash_readopt.patch \
+            file://wc.patch \
+            file://staging.patch \
+            file://klibc_kexecsyscall.patch \
             "
 
 KLIBC_FETCHDIR = "1.5"