From bf7d0467a0788a7fcc1c96e0dc35a25ae09278a0 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sun, 23 May 2010 20:23:53 -0700 Subject: Rename url params patch=/pnum= to apply={yes,no}/striplevel= I think this makes the behavior rather more clear. Signed-off-by: Chris Larson Acked-by: Denys Dmytriyenko Acked-by: Khem Raj --- recipes/jamvm/jamvm-initial_1.4.5.bb | 2 +- recipes/jamvm/jamvm-initial_1.5.0.bb | 2 +- recipes/jamvm/jamvm-native_1.5.3.bb | 2 +- recipes/jamvm/jamvm_1.4.5.bb | 2 +- recipes/jamvm/jamvm_1.5.0.bb | 2 +- recipes/jamvm/jamvm_1.5.2.bb | 2 +- recipes/jamvm/jamvm_1.5.3.bb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'recipes/jamvm') diff --git a/recipes/jamvm/jamvm-initial_1.4.5.bb b/recipes/jamvm/jamvm-initial_1.4.5.bb index 200c0168c1..f0c9f86033 100644 --- a/recipes/jamvm/jamvm-initial_1.4.5.bb +++ b/recipes/jamvm/jamvm-initial_1.4.5.bb @@ -11,7 +11,7 @@ PROVIDES = "virtual/java-initial" S = "${WORKDIR}/jamvm-${PV}" SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \ - file://jamvm_${PV}-initial.patch;patch=1;pnum=1 \ + file://jamvm_${PV}-initial.patch;apply=yes \ " # This uses 32 bit arm, so force the instruction set to arm, not thumb diff --git a/recipes/jamvm/jamvm-initial_1.5.0.bb b/recipes/jamvm/jamvm-initial_1.5.0.bb index a1d3566bcf..a1c68da843 100644 --- a/recipes/jamvm/jamvm-initial_1.5.0.bb +++ b/recipes/jamvm/jamvm-initial_1.5.0.bb @@ -11,7 +11,7 @@ PROVIDES = "virtual/java-initial" S = "${WORKDIR}/jamvm-${PV}" SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \ - file://jamvm_${PV}-initial.patch;patch=1;pnum=1 \ + file://jamvm_${PV}-initial.patch;apply=yes \ " # This uses 32 bit arm, so force the instruction set to arm, not thumb diff --git a/recipes/jamvm/jamvm-native_1.5.3.bb b/recipes/jamvm/jamvm-native_1.5.3.bb index 73b43fb064..754181edb5 100644 --- a/recipes/jamvm/jamvm-native_1.5.3.bb +++ b/recipes/jamvm/jamvm-native_1.5.3.bb @@ -4,7 +4,7 @@ require jamvm-native.inc PR = "r1" -SRC_URI += "file://jamvm-1.5.3-jni_h-noinst.patch;patch=1" +SRC_URI += "file://jamvm-1.5.3-jni_h-noinst.patch;apply=yes" SRC_URI[md5sum] = "ce886163658d748113b0570dfae12aea" diff --git a/recipes/jamvm/jamvm_1.4.5.bb b/recipes/jamvm/jamvm_1.4.5.bb index 0d353a7fd0..26ae4d59b5 100644 --- a/recipes/jamvm/jamvm_1.4.5.bb +++ b/recipes/jamvm/jamvm_1.4.5.bb @@ -2,7 +2,7 @@ require jamvm.inc PR = "r3" -SRC_URI += "file://jamvm-1.3.1-size-defaults.patch;patch=1" +SRC_URI += "file://jamvm-1.3.1-size-defaults.patch;apply=yes" SRC_URI[md5sum] = "3f538bab6e1c77aed331e5e71f754f5b" diff --git a/recipes/jamvm/jamvm_1.5.0.bb b/recipes/jamvm/jamvm_1.5.0.bb index be8cb4cc8b..420ea61bb1 100644 --- a/recipes/jamvm/jamvm_1.5.0.bb +++ b/recipes/jamvm/jamvm_1.5.0.bb @@ -1,6 +1,6 @@ require jamvm.inc -SRC_URI += "file://debian-jni.patch;patch=1;pnum=0" +SRC_URI += "file://debian-jni.patch;apply=yes;striplevel=0" PR = "r4" diff --git a/recipes/jamvm/jamvm_1.5.2.bb b/recipes/jamvm/jamvm_1.5.2.bb index 258629684c..dd0ce7f2fc 100644 --- a/recipes/jamvm/jamvm_1.5.2.bb +++ b/recipes/jamvm/jamvm_1.5.2.bb @@ -1,6 +1,6 @@ require jamvm.inc -SRC_URI += "file://debian-jni.patch;patch=1;pnum=0" +SRC_URI += "file://debian-jni.patch;apply=yes;striplevel=0" PR = "r0" diff --git a/recipes/jamvm/jamvm_1.5.3.bb b/recipes/jamvm/jamvm_1.5.3.bb index b3ca5df692..4569fd4242 100644 --- a/recipes/jamvm/jamvm_1.5.3.bb +++ b/recipes/jamvm/jamvm_1.5.3.bb @@ -1,6 +1,6 @@ require jamvm.inc -SRC_URI += "file://debian-jni.patch;patch=1;pnum=0" +SRC_URI += "file://debian-jni.patch;apply=yes;striplevel=0" PR = "r0" -- cgit v1.2.3 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/jamvm/jamvm-initial_1.4.5.bb | 2 +- recipes/jamvm/jamvm-initial_1.5.0.bb | 2 +- recipes/jamvm/jamvm-native_1.5.3.bb | 2 +- recipes/jamvm/jamvm_1.4.5.bb | 2 +- recipes/jamvm/jamvm_1.5.0.bb | 2 +- recipes/jamvm/jamvm_1.5.2.bb | 2 +- recipes/jamvm/jamvm_1.5.3.bb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'recipes/jamvm') diff --git a/recipes/jamvm/jamvm-initial_1.4.5.bb b/recipes/jamvm/jamvm-initial_1.4.5.bb index f0c9f86033..fb2f4bf330 100644 --- a/recipes/jamvm/jamvm-initial_1.4.5.bb +++ b/recipes/jamvm/jamvm-initial_1.4.5.bb @@ -11,7 +11,7 @@ PROVIDES = "virtual/java-initial" S = "${WORKDIR}/jamvm-${PV}" SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \ - file://jamvm_${PV}-initial.patch;apply=yes \ + file://jamvm_${PV}-initial.patch \ " # This uses 32 bit arm, so force the instruction set to arm, not thumb diff --git a/recipes/jamvm/jamvm-initial_1.5.0.bb b/recipes/jamvm/jamvm-initial_1.5.0.bb index a1c68da843..3986861a1a 100644 --- a/recipes/jamvm/jamvm-initial_1.5.0.bb +++ b/recipes/jamvm/jamvm-initial_1.5.0.bb @@ -11,7 +11,7 @@ PROVIDES = "virtual/java-initial" S = "${WORKDIR}/jamvm-${PV}" SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \ - file://jamvm_${PV}-initial.patch;apply=yes \ + file://jamvm_${PV}-initial.patch \ " # This uses 32 bit arm, so force the instruction set to arm, not thumb diff --git a/recipes/jamvm/jamvm-native_1.5.3.bb b/recipes/jamvm/jamvm-native_1.5.3.bb index 754181edb5..10036efd1f 100644 --- a/recipes/jamvm/jamvm-native_1.5.3.bb +++ b/recipes/jamvm/jamvm-native_1.5.3.bb @@ -4,7 +4,7 @@ require jamvm-native.inc PR = "r1" -SRC_URI += "file://jamvm-1.5.3-jni_h-noinst.patch;apply=yes" +SRC_URI += "file://jamvm-1.5.3-jni_h-noinst.patch" SRC_URI[md5sum] = "ce886163658d748113b0570dfae12aea" diff --git a/recipes/jamvm/jamvm_1.4.5.bb b/recipes/jamvm/jamvm_1.4.5.bb index 26ae4d59b5..0e9636622b 100644 --- a/recipes/jamvm/jamvm_1.4.5.bb +++ b/recipes/jamvm/jamvm_1.4.5.bb @@ -2,7 +2,7 @@ require jamvm.inc PR = "r3" -SRC_URI += "file://jamvm-1.3.1-size-defaults.patch;apply=yes" +SRC_URI += "file://jamvm-1.3.1-size-defaults.patch" SRC_URI[md5sum] = "3f538bab6e1c77aed331e5e71f754f5b" diff --git a/recipes/jamvm/jamvm_1.5.0.bb b/recipes/jamvm/jamvm_1.5.0.bb index 420ea61bb1..2231566bb0 100644 --- a/recipes/jamvm/jamvm_1.5.0.bb +++ b/recipes/jamvm/jamvm_1.5.0.bb @@ -1,6 +1,6 @@ require jamvm.inc -SRC_URI += "file://debian-jni.patch;apply=yes;striplevel=0" +SRC_URI += "file://debian-jni.patch;striplevel=0" PR = "r4" diff --git a/recipes/jamvm/jamvm_1.5.2.bb b/recipes/jamvm/jamvm_1.5.2.bb index dd0ce7f2fc..68949ab44d 100644 --- a/recipes/jamvm/jamvm_1.5.2.bb +++ b/recipes/jamvm/jamvm_1.5.2.bb @@ -1,6 +1,6 @@ require jamvm.inc -SRC_URI += "file://debian-jni.patch;apply=yes;striplevel=0" +SRC_URI += "file://debian-jni.patch;striplevel=0" PR = "r0" diff --git a/recipes/jamvm/jamvm_1.5.3.bb b/recipes/jamvm/jamvm_1.5.3.bb index 4569fd4242..19eabfd669 100644 --- a/recipes/jamvm/jamvm_1.5.3.bb +++ b/recipes/jamvm/jamvm_1.5.3.bb @@ -1,6 +1,6 @@ require jamvm.inc -SRC_URI += "file://debian-jni.patch;apply=yes;striplevel=0" +SRC_URI += "file://debian-jni.patch;striplevel=0" PR = "r0" -- cgit v1.2.3