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/openssl/openssl-native_0.9.7g.bb | 6 +++--- recipes/openssl/openssl-native_0.9.7m.bb | 6 +++--- recipes/openssl/openssl-native_0.9.8g.bb | 6 +++--- recipes/openssl/openssl-native_0.9.8m.bb | 6 +++--- recipes/openssl/openssl-native_1.0.0.bb | 8 ++++---- recipes/openssl/openssl_0.9.7e.bb | 6 +++--- recipes/openssl/openssl_0.9.7g.bb | 12 ++++++------ recipes/openssl/openssl_0.9.7m.bb | 12 ++++++------ recipes/openssl/openssl_0.9.8g.bb | 6 +++--- recipes/openssl/openssl_0.9.8m.bb | 8 ++++---- recipes/openssl/openssl_1.0.0.bb | 12 ++++++------ 11 files changed, 44 insertions(+), 44 deletions(-) (limited to 'recipes/openssl') diff --git a/recipes/openssl/openssl-native_0.9.7g.bb b/recipes/openssl/openssl-native_0.9.7g.bb index 79ea490b36..229a9b2078 100644 --- a/recipes/openssl/openssl-native_0.9.7g.bb +++ b/recipes/openssl/openssl-native_0.9.7g.bb @@ -4,9 +4,9 @@ require openssl.inc PR = "${INC_PR}.0" -SRC_URI += "file://debian.patch;apply=yes \ - file://armeb.patch;apply=yes;striplevel=0 \ - file://gnueabi-arm.patch;apply=yes" +SRC_URI += "file://debian.patch \ + file://armeb.patch;striplevel=0 \ + file://gnueabi-arm.patch" do_install() { : diff --git a/recipes/openssl/openssl-native_0.9.7m.bb b/recipes/openssl/openssl-native_0.9.7m.bb index 23f38dcf25..3b76dd5198 100644 --- a/recipes/openssl/openssl-native_0.9.7m.bb +++ b/recipes/openssl/openssl-native_0.9.7m.bb @@ -8,9 +8,9 @@ export BUILD_OPTIMIZATION = " " PR = "${INC_PR}.0" -SRC_URI += "file://debian.patch;apply=yes \ - file://armeb.patch;apply=yes;striplevel=0 \ - file://gnueabi-arm.patch;apply=yes" +SRC_URI += "file://debian.patch \ + file://armeb.patch;striplevel=0 \ + file://gnueabi-arm.patch" do_install() { : diff --git a/recipes/openssl/openssl-native_0.9.8g.bb b/recipes/openssl/openssl-native_0.9.8g.bb index 68372b45b5..bef8dfb563 100644 --- a/recipes/openssl/openssl-native_0.9.8g.bb +++ b/recipes/openssl/openssl-native_0.9.8g.bb @@ -8,9 +8,9 @@ PR = "${INC_PR}.0" export FULL_OPTIMIZATION = " " export BUILD_OPTIMIZATION = " " -SRC_URI += "file://debian.patch;apply=yes \ - file://configure-targets.patch;apply=yes \ - file://shared-libs.patch;apply=yes" +SRC_URI += "file://debian.patch \ + file://configure-targets.patch \ + file://shared-libs.patch" PARALLEL_MAKE = "" diff --git a/recipes/openssl/openssl-native_0.9.8m.bb b/recipes/openssl/openssl-native_0.9.8m.bb index e658063057..1b82645b78 100644 --- a/recipes/openssl/openssl-native_0.9.8m.bb +++ b/recipes/openssl/openssl-native_0.9.8m.bb @@ -10,9 +10,9 @@ PR = "${INC_PR}.2" export FULL_OPTIMIZATION = " " export BUILD_OPTIMIZATION = " " -SRC_URI += "file://configure-targets.patch;apply=yes \ - file://shared-libs.patch;apply=yes \ - file://debian.patch;apply=yes" +SRC_URI += "file://configure-targets.patch \ + file://shared-libs.patch \ + file://debian.patch" PARALLEL_MAKE = "" diff --git a/recipes/openssl/openssl-native_1.0.0.bb b/recipes/openssl/openssl-native_1.0.0.bb index 8614fb1a3a..7029bfe77d 100644 --- a/recipes/openssl/openssl-native_1.0.0.bb +++ b/recipes/openssl/openssl-native_1.0.0.bb @@ -14,10 +14,10 @@ export DIRS = "crypto ssl apps engines" export FULL_OPTIMIZATION = " " export BUILD_OPTIMIZATION = " " -SRC_URI += "file://configure-targets.patch;apply=yes \ - file://shared-libs.patch;apply=yes \ - file://debian.patch;apply=yes \ - file://libdeps-first.patch;apply=yes \ +SRC_URI += "file://configure-targets.patch \ + file://shared-libs.patch \ + file://debian.patch \ + file://libdeps-first.patch \ " PARALLEL_MAKE = "" diff --git a/recipes/openssl/openssl_0.9.7e.bb b/recipes/openssl/openssl_0.9.7e.bb index 5e873f5289..6b13717852 100644 --- a/recipes/openssl/openssl_0.9.7e.bb +++ b/recipes/openssl/openssl_0.9.7e.bb @@ -2,9 +2,9 @@ require openssl.inc PR = "${INC_PR}.0" -SRC_URI += "file://debian.patch;apply=yes \ - file://armeb.patch;apply=yes \ - file://gnueabi-arm.patch;apply=yes" +SRC_URI += "file://debian.patch \ + file://armeb.patch \ + file://gnueabi-arm.patch" SRC_URI[src.md5sum] = "a8777164bca38d84e5eb2b1535223474" SRC_URI[src.sha256sum] = "25121b5dbd2b830929519325e033086ce45861cff2d0000d928f48261b1e0b7c" diff --git a/recipes/openssl/openssl_0.9.7g.bb b/recipes/openssl/openssl_0.9.7g.bb index bac3c5dc89..bf1043ca25 100644 --- a/recipes/openssl/openssl_0.9.7g.bb +++ b/recipes/openssl/openssl_0.9.7g.bb @@ -4,12 +4,12 @@ require openssl.inc PR = "${INC_PR}.0" -SRC_URI += "file://debian.patch;apply=yes \ - file://armeb.patch;apply=yes;striplevel=0 \ - file://gnueabi-arm.patch;apply=yes \ - file://gnueabi-armeb.patch;apply=yes \ - file://uclibcgnueabi.patch;apply=yes \ - file://avr32.patch;apply=yes;striplevel=0" +SRC_URI += "file://debian.patch \ + file://armeb.patch;striplevel=0 \ + file://gnueabi-arm.patch \ + file://gnueabi-armeb.patch \ + file://uclibcgnueabi.patch \ + file://avr32.patch;striplevel=0" SRC_URI[src.md5sum] = "991615f73338a571b6a1be7d74906934" SRC_URI[src.sha256sum] = "e7e1a287141dd1be7f4b4fedd54ec29fa904655ed76a13ac87ae69a3fc76b062" diff --git a/recipes/openssl/openssl_0.9.7m.bb b/recipes/openssl/openssl_0.9.7m.bb index d429a50e7e..28283ade96 100644 --- a/recipes/openssl/openssl_0.9.7m.bb +++ b/recipes/openssl/openssl_0.9.7m.bb @@ -4,12 +4,12 @@ require openssl.inc PR = "${INC_PR}.0" -SRC_URI += "file://debian.patch;apply=yes \ - file://armeb.patch;apply=yes;striplevel=0 \ - file://gnueabi-arm.patch;apply=yes \ - file://gnueabi-armeb.patch;apply=yes \ - file://uclibcgnueabi.patch;apply=yes \ - file://avr32.patch;apply=yes;striplevel=0" +SRC_URI += "file://debian.patch \ + file://armeb.patch;striplevel=0 \ + file://gnueabi-arm.patch \ + file://gnueabi-armeb.patch \ + file://uclibcgnueabi.patch \ + file://avr32.patch;striplevel=0" SRC_URI[src.md5sum] = "74a4d1b87e1e6e1ec95dbe58cb4c5b9a" SRC_URI[src.sha256sum] = "c98b9703887e2dda6217b91405d0d94883f7c67e205fc4d7a81bb690d2e10572" diff --git a/recipes/openssl/openssl_0.9.8g.bb b/recipes/openssl/openssl_0.9.8g.bb index 7aac9eaba4..d90e8851e4 100644 --- a/recipes/openssl/openssl_0.9.8g.bb +++ b/recipes/openssl/openssl_0.9.8g.bb @@ -4,9 +4,9 @@ require openssl.inc PR = "${INC_PR}.0" -SRC_URI += "file://debian.patch;apply=yes \ - file://configure-targets.patch;apply=yes \ - file://shared-libs.patch;apply=yes" +SRC_URI += "file://debian.patch \ + file://configure-targets.patch \ + file://shared-libs.patch" PARALLEL_MAKE = "" diff --git a/recipes/openssl/openssl_0.9.8m.bb b/recipes/openssl/openssl_0.9.8m.bb index 20d4956162..a7eb332857 100644 --- a/recipes/openssl/openssl_0.9.8m.bb +++ b/recipes/openssl/openssl_0.9.8m.bb @@ -8,9 +8,9 @@ PR = "${INC_PR}.0" export OE_LDFLAGS="${LDFLAGS}" -SRC_URI += "file://configure-targets.patch;apply=yes \ - file://shared-libs.patch;apply=yes \ - file://debian.patch;apply=yes \ - file://oe-ldflags.patch;apply=yes" +SRC_URI += "file://configure-targets.patch \ + file://shared-libs.patch \ + file://debian.patch \ + file://oe-ldflags.patch" PARALLEL_MAKE = "" diff --git a/recipes/openssl/openssl_1.0.0.bb b/recipes/openssl/openssl_1.0.0.bb index e29f856f45..8013ce7a76 100644 --- a/recipes/openssl/openssl_1.0.0.bb +++ b/recipes/openssl/openssl_1.0.0.bb @@ -11,12 +11,12 @@ DEFAULT_PREFERENCE = "-1" export DIRS = "crypto ssl apps engines" export OE_LDFLAGS="${LDFLAGS}" -SRC_URI += "file://configure-targets.patch;apply=yes \ - file://shared-libs.patch;apply=yes \ - file://debian.patch;apply=yes \ - file://oe-ldflags.patch;apply=yes \ - file://libdeps-first.patch;apply=yes \ - file://engines-install-in-libdir-ssl.patch;apply=yes \ +SRC_URI += "file://configure-targets.patch \ + file://shared-libs.patch \ + file://debian.patch \ + file://oe-ldflags.patch \ + file://libdeps-first.patch \ + file://engines-install-in-libdir-ssl.patch \ " PARALLEL_MAKE = "" -- cgit 1.2.3-korg