diff options
| author |   Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-11-20 22:19:31 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-11-22 18:28:25 +0100 |
| commit | e4721e70afa802ff301fc0ac511fcea26561c173 (patch) | |
| tree | 56f3a11f2f3832fdc3fa3a77383d2eaf5db6f61c /recipes/php | |
| parent | 7abb690089693b16e6334c39a88d9c6a32498616 (diff) | |
| download | openembedded-e4721e70afa802ff301fc0ac511fcea26561c173.tar.gz | |
php: fixed path
with the arrival of a new release the old php tarball moved to the
museum site, Fixed SRC_URI and moved it from the inc file to the bb file
so when adding the latest version there is no SRC_URI clash in the .inc
file.
Also introduced INC_PR
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/php')
| -rw-r--r-- | recipes/php/php-native_5.3.2.bb | 7 | ||||
| -rw-r--r-- | recipes/php/php.inc | 4 | ||||
| -rw-r--r-- | recipes/php/php_5.2.13.bb | 14 |
3 files changed, 15 insertions, 10 deletions
diff --git a/recipes/php/php-native_5.3.2.bb b/recipes/php/php-native_5.3.2.bb index d5ed932ad8..3a2299c307 100644 --- a/recipes/php/php-native_5.3.2.bb +++ b/recipes/php/php-native_5.3.2.bb @@ -1,8 +1,11 @@ require php-native.inc -PR = "r1" +PR = "${INC_PR}.1" -SRC_URI += "file://CVE-2010-0397.patch" +SRC_URI = "http://museum.php.net/php5/php-${PV}.tar.bz2;name=src \ + file://acinclude-xml2-config.patch \ + file://php-m4-divert.patch \ + 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 bfee93c5cd..a48827a048 100644 --- a/recipes/php/php.inc +++ b/recipes/php/php.inc @@ -3,9 +3,7 @@ HOMEPAGE = "http://www.php.net" SECTION = "console/network" LICENSE = "PHP" -SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2;name=src \ - file://acinclude-xml2-config.patch \ - file://php-m4-divert.patch" +INC_PR = "r7" S = "${WORKDIR}/php-${PV}" diff --git a/recipes/php/php_5.2.13.bb b/recipes/php/php_5.2.13.bb index 0f9317d3f4..5871dca157 100644 --- a/recipes/php/php_5.2.13.bb +++ b/recipes/php/php_5.2.13.bb @@ -3,12 +3,16 @@ require php.inc DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ libc-client openssl" -PR = "r7" - -SRC_URI += "file://pear-makefile.patch \ - file://imap-fix-autofoo.patch \ - file://CVE-2010-0397.patch \ +PR = "${INC_PR}.1" + +SRC_URI = "http://museum.php.net/php5/php-${PV}.tar.bz2;name=src \ + file://acinclude-xml2-config.patch \ + file://php-m4-divert.patch \ + file://pear-makefile.patch \ + file://imap-fix-autofoo.patch \ + file://CVE-2010-0397.patch \ " + SRC_URI[src.md5sum] = "eb4d0766dc4fb9667f05a68b6041e7d1" SRC_URI[src.sha256sum] = "2b50a2535e3bb9a98cd4d1633f9452d877276c40b385915261f040d535c7eadb" |