From 6fe7cef27069415f2eba36bc640cf59013d4979b Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 24 May 2010 13:01:00 -0700 Subject: Make the do_patch apply=yes param implicit if extension is .diff/.patch For .diff/.patch you need to apply manually, you can specify apply=no. Signed-off-by: Chris Larson Acked-by: Denys Dmytriyenko Acked-by: Khem Raj --- recipes/classpath/classpath-initial_0.93.bb | 4 ++-- recipes/classpath/classpath-minimal_0.96.1.bb | 4 ++-- recipes/classpath/classpath-minimal_0.97.2.bb | 14 +++++++------- recipes/classpath/classpath-native_0.97.2.bb | 20 ++++++++++---------- recipes/classpath/classpath-native_0.98.bb | 12 ++++++------ recipes/classpath/classpath_0.95.bb | 6 +++--- recipes/classpath/classpath_0.96.1.bb | 6 +++--- recipes/classpath/classpath_0.97.2.bb | 20 ++++++++++---------- recipes/classpath/classpath_0.98.bb | 10 +++++----- recipes/classpath/inetlib_1.1.1.bb | 2 +- 10 files changed, 49 insertions(+), 49 deletions(-) (limited to 'recipes/classpath') diff --git a/recipes/classpath/classpath-initial_0.93.bb b/recipes/classpath/classpath-initial_0.93.bb index d56ada2d45..28e3277a64 100644 --- a/recipes/classpath/classpath-initial_0.93.bb +++ b/recipes/classpath/classpath-initial_0.93.bb @@ -10,8 +10,8 @@ PR = "r6" DEPENDS = "zip-native fastjar-native jikes-native gettext-native" SRC_URI += "\ - file://autotools.patch;apply=yes \ - file://miscompilation-0.93.patch;apply=yes \ + file://autotools.patch \ + file://miscompilation-0.93.patch \ " EXTRA_OECONF = "\ diff --git a/recipes/classpath/classpath-minimal_0.96.1.bb b/recipes/classpath/classpath-minimal_0.96.1.bb index 14c193c8c6..2bdca7ce0b 100644 --- a/recipes/classpath/classpath-minimal_0.96.1.bb +++ b/recipes/classpath/classpath-minimal_0.96.1.bb @@ -3,8 +3,8 @@ require classpath.inc PR = "r7" SRC_URI += "\ - file://gjar-prefix-patch.diff;apply=yes;striplevel=0 \ - file://xmlstream-fix.patch;apply=yes;striplevel=0 \ + file://gjar-prefix-patch.diff;striplevel=0 \ + file://xmlstream-fix.patch;striplevel=0 \ " PROVIDES = "${PN} classpath" diff --git a/recipes/classpath/classpath-minimal_0.97.2.bb b/recipes/classpath/classpath-minimal_0.97.2.bb index 4577987ce0..ce5eb20e64 100644 --- a/recipes/classpath/classpath-minimal_0.97.2.bb +++ b/recipes/classpath/classpath-minimal_0.97.2.bb @@ -3,13 +3,13 @@ require classpath.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/${PBN}-${PV}" SRC_URI += "\ - file://netif_16.patch;apply=yes;striplevel=0 \ - file://SimpleName.diff;apply=yes;striplevel=0 \ - file://javanet-local.patch;apply=yes;striplevel=0 \ - file://ecj_java_dir.patch;apply=yes \ - file://autotools.patch;apply=yes \ - file://decimalformat.patch;apply=yes \ - file://cp-byte-loophelper.patch;apply=yes;striplevel=0 \ + file://netif_16.patch;striplevel=0 \ + file://SimpleName.diff;striplevel=0 \ + file://javanet-local.patch;striplevel=0 \ + file://ecj_java_dir.patch \ + file://autotools.patch \ + file://decimalformat.patch \ + file://cp-byte-loophelper.patch;striplevel=0 \ " PR = "r3" diff --git a/recipes/classpath/classpath-native_0.97.2.bb b/recipes/classpath/classpath-native_0.97.2.bb index 39d951645c..19c07a0578 100644 --- a/recipes/classpath/classpath-native_0.97.2.bb +++ b/recipes/classpath/classpath-native_0.97.2.bb @@ -6,16 +6,16 @@ PR = "r7" # is usually not compiled. However if someone changes # to --enable-local-sockets it will. SRC_URI += "\ - file://netif_16.patch;apply=yes;striplevel=0 \ - file://SimpleName.diff;apply=yes;striplevel=0 \ - file://javanet-local.patch;apply=yes;striplevel=0 \ - file://sun-security-getproperty_0.96.1.patch;apply=yes;striplevel=0 \ - file://ecj_java_dir.patch;apply=yes \ - file://autotools.patch;apply=yes \ - file://decimalformat.patch;apply=yes \ - file://cp-byte-loophelper.patch;apply=yes;striplevel=0 \ - file://miscompilation.patch;apply=yes \ - file://toolwrapper-exithook.patch;apply=yes \ + file://netif_16.patch;striplevel=0 \ + file://SimpleName.diff;striplevel=0 \ + file://javanet-local.patch;striplevel=0 \ + file://sun-security-getproperty_0.96.1.patch;striplevel=0 \ + file://ecj_java_dir.patch \ + file://autotools.patch \ + file://decimalformat.patch \ + file://cp-byte-loophelper.patch;striplevel=0 \ + file://miscompilation.patch \ + file://toolwrapper-exithook.patch \ " do_unpackpost() { diff --git a/recipes/classpath/classpath-native_0.98.bb b/recipes/classpath/classpath-native_0.98.bb index dd64856006..a8d8276bcf 100644 --- a/recipes/classpath/classpath-native_0.98.bb +++ b/recipes/classpath/classpath-native_0.98.bb @@ -9,12 +9,12 @@ PR = "r3" # is usually not compiled. However if someone changes # to --enable-local-sockets it will. SRC_URI += "\ - file://SimpleName.diff;apply=yes;striplevel=0 \ - file://sun-security-getproperty.patch;apply=yes;striplevel=0 \ - file://ecj_java_dir.patch;apply=yes \ - file://autotools.patch;apply=yes \ - file://miscompilation.patch;apply=yes \ - file://toolwrapper-exithook.patch;apply=yes \ + file://SimpleName.diff;striplevel=0 \ + file://sun-security-getproperty.patch;striplevel=0 \ + file://ecj_java_dir.patch \ + file://autotools.patch \ + file://miscompilation.patch \ + file://toolwrapper-exithook.patch \ " do_unpackpost() { diff --git a/recipes/classpath/classpath_0.95.bb b/recipes/classpath/classpath_0.95.bb index 2514e39ac9..384636960f 100644 --- a/recipes/classpath/classpath_0.95.bb +++ b/recipes/classpath/classpath_0.95.bb @@ -1,9 +1,9 @@ require classpath.inc SRC_URI += "\ - file://gjar-prefix-patch.diff;apply=yes;striplevel=0 \ - file://xmlstream-fix.patch;apply=yes;striplevel=0 \ - file://javanet-local.patch;apply=yes;striplevel=0 \ + file://gjar-prefix-patch.diff;striplevel=0 \ + file://xmlstream-fix.patch;striplevel=0 \ + file://javanet-local.patch;striplevel=0 \ " PR = "r7" diff --git a/recipes/classpath/classpath_0.96.1.bb b/recipes/classpath/classpath_0.96.1.bb index 09734da2e0..9751bbe8c1 100644 --- a/recipes/classpath/classpath_0.96.1.bb +++ b/recipes/classpath/classpath_0.96.1.bb @@ -1,9 +1,9 @@ require classpath.inc SRC_URI += "\ - file://gjar-prefix-patch.diff;apply=yes;striplevel=0 \ - file://xmlstream-fix.patch;apply=yes;striplevel=0 \ - file://javanet-local.patch;apply=yes;striplevel=0 \ + file://gjar-prefix-patch.diff;striplevel=0 \ + file://xmlstream-fix.patch;striplevel=0 \ + file://javanet-local.patch;striplevel=0 \ " PR = "r9" diff --git a/recipes/classpath/classpath_0.97.2.bb b/recipes/classpath/classpath_0.97.2.bb index cccf9cf772..b53ba2b456 100644 --- a/recipes/classpath/classpath_0.97.2.bb +++ b/recipes/classpath/classpath_0.97.2.bb @@ -1,16 +1,16 @@ require classpath.inc SRC_URI += "\ - file://netif_16.patch;apply=yes;striplevel=0 \ - file://SimpleName.diff;apply=yes;striplevel=0 \ - file://javanet-local.patch;apply=yes;striplevel=0 \ - file://ecj_java_dir.patch;apply=yes \ - file://autotools.patch;apply=yes \ - file://decimalformat.patch;apply=yes \ - file://cp-byte-loophelper.patch;apply=yes;striplevel=0 \ - file://drawpolyline.patch;apply=yes;striplevel=0 \ - file://gtk-fix.patch;apply=yes;striplevel=0 \ - file://toolwrapper-exithook.patch;apply=yes \ + file://netif_16.patch;striplevel=0 \ + file://SimpleName.diff;striplevel=0 \ + file://javanet-local.patch;striplevel=0 \ + file://ecj_java_dir.patch \ + file://autotools.patch \ + file://decimalformat.patch \ + file://cp-byte-loophelper.patch;striplevel=0 \ + file://drawpolyline.patch;striplevel=0 \ + file://gtk-fix.patch;striplevel=0 \ + file://toolwrapper-exithook.patch \ " PR = "r10" diff --git a/recipes/classpath/classpath_0.98.bb b/recipes/classpath/classpath_0.98.bb index 534ee5c267..d64fa078bf 100644 --- a/recipes/classpath/classpath_0.98.bb +++ b/recipes/classpath/classpath_0.98.bb @@ -1,11 +1,11 @@ require classpath.inc SRC_URI += "\ - file://SimpleName.diff;apply=yes;striplevel=0 \ - file://ecj_java_dir.patch;apply=yes \ - file://autotools.patch;apply=yes \ - file://fix-gmp.patch;apply=yes \ - file://toolwrapper-exithook.patch;apply=yes \ + file://SimpleName.diff;striplevel=0 \ + file://ecj_java_dir.patch \ + file://autotools.patch \ + file://fix-gmp.patch \ + file://toolwrapper-exithook.patch \ " PR = "r3" diff --git a/recipes/classpath/inetlib_1.1.1.bb b/recipes/classpath/inetlib_1.1.1.bb index a82ce44be3..362d0aa1cf 100644 --- a/recipes/classpath/inetlib_1.1.1.bb +++ b/recipes/classpath/inetlib_1.1.1.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://gnu.org/software/classpath/inetlib.html" SRC_URI = "\ http://ftp.gnu.org/gnu/classpath/${BP}.tar.gz \ - file://datadir_java.patch;apply=yes \ + file://datadir_java.patch \ " inherit java-library autotools -- cgit 1.2.3-korg