diff options
| author | Chris Larson <chris_larson@mentor.com> | 2010-05-24 13:01:00 -0700 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2010-05-25 12:54:52 -0700 |
| commit | 6fe7cef27069415f2eba36bc640cf59013d4979b (patch) | |
| tree | b0cb8845ddc6b8bcffc50e08a2eeae98e049be98 /recipes/php | |
| parent | bf7d0467a0788a7fcc1c96e0dc35a25ae09278a0 (diff) | |
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 <chris_larson@mentor.com>
Acked-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/php')
| -rw-r--r-- | recipes/php/php-native_5.3.2.bb | 2 | ||||
| -rw-r--r-- | recipes/php/php.inc | 4 | ||||
| -rw-r--r-- | recipes/php/php_5.2.13.bb | 6 | ||||
| -rw-r--r-- | recipes/php/php_5.2.6.bb | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/recipes/php/php-native_5.3.2.bb b/recipes/php/php-native_5.3.2.bb index 4ea0b6d651..d5ed932ad8 100644 --- a/recipes/php/php-native_5.3.2.bb +++ b/recipes/php/php-native_5.3.2.bb @@ -2,7 +2,7 @@ require php-native.inc PR = "r1" -SRC_URI += "file://CVE-2010-0397.patch;apply=yes" +SRC_URI += "file://CVE-2010-0397.patch" SRC_URI[src.md5sum] = "46f500816125202c48a458d0133254a4" SRC_URI[src.sha256sum] = "9a380a574adcb3a9abe3226e7c3a9bae619e8a1b90842ec2a7edf0ad92afdeda" diff --git a/recipes/php/php.inc b/recipes/php/php.inc index 9446b82611..bfee93c5cd 100644 --- a/recipes/php/php.inc +++ b/recipes/php/php.inc @@ -4,8 +4,8 @@ SECTION = "console/network" LICENSE = "PHP" SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2;name=src \ - file://acinclude-xml2-config.patch;apply=yes \ - file://php-m4-divert.patch;apply=yes" + file://acinclude-xml2-config.patch \ + file://php-m4-divert.patch" S = "${WORKDIR}/php-${PV}" diff --git a/recipes/php/php_5.2.13.bb b/recipes/php/php_5.2.13.bb index 1a85f463cc..2a31299308 100644 --- a/recipes/php/php_5.2.13.bb +++ b/recipes/php/php_5.2.13.bb @@ -5,9 +5,9 @@ DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ PR = "r6" -SRC_URI += "file://pear-makefile.patch;apply=yes \ - file://imap-fix-autofoo.patch;apply=yes \ - file://CVE-2010-0397.patch;apply=yes \ +SRC_URI += "file://pear-makefile.patch \ + file://imap-fix-autofoo.patch \ + file://CVE-2010-0397.patch \ " SRC_URI[src.md5sum] = "eb4d0766dc4fb9667f05a68b6041e7d1" SRC_URI[src.sha256sum] = "2b50a2535e3bb9a98cd4d1633f9452d877276c40b385915261f040d535c7eadb" diff --git a/recipes/php/php_5.2.6.bb b/recipes/php/php_5.2.6.bb index b57c3918b1..3b011ab1ac 100644 --- a/recipes/php/php_5.2.6.bb +++ b/recipes/php/php_5.2.6.bb @@ -4,8 +4,8 @@ DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql" PR = "r7" -SRC_URI += "file://pear-makefile.patch;apply=yes \ - file://string.c.patch;apply=yes " +SRC_URI += "file://pear-makefile.patch \ + file://string.c.patch " export THREADS="pthread" export LIBS=" -lpthread " |