diff options
| author | Kang Kai <kai.kang@windriver.com> | 2015-06-19 10:15:03 +0800 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-06-23 12:41:53 +0200 |
| commit | ee4e79caf9759d4fe2dc548e3cde44b5d0f1c730 (patch) | |
| tree | c5f13511a4b732ade9e6522e8320f6b0f9317c59 | |
| parent | 622c960ea6efb9b38b70e4d8c669a2f90b6b1b60 (diff) | |
| download | meta-openembedded-ee4e79caf9759d4fe2dc548e3cde44b5d0f1c730.tar.gz | |
php: upgrade from 5.5.24 to 5.5.26
Upgrade php from 5.5.24 to 5.5.26. Remove part 2 of phar-makefile.patch
which is useless.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-devtools/php/php/phar-makefile.patch | 9 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/php/php_5.5.26.bb (renamed from meta-oe/recipes-devtools/php/php_5.5.24.bb) | 4 |
2 files changed, 2 insertions, 11 deletions
diff --git a/meta-oe/recipes-devtools/php/php/phar-makefile.patch b/meta-oe/recipes-devtools/php/php/phar-makefile.patch index 2851b0f8df..2f7fe34c7f 100644 --- a/meta-oe/recipes-devtools/php/php/phar-makefile.patch +++ b/meta-oe/recipes-devtools/php/php/phar-makefile.patch | |||
| @@ -33,12 +33,3 @@ index 6516ddf..36e6cf4 100644 | |||
| 33 | 33 | ||
| 34 | $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc | 34 | $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc |
| 35 | -@test -d $(builddir)/phar || mkdir $(builddir)/phar | 35 | -@test -d $(builddir)/phar || mkdir $(builddir)/phar |
| 36 | @@ -39,7 +28,7 @@ install-pharcmd: pharcmd | ||
| 37 | -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) | ||
| 38 | $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir) | ||
| 39 | -@rm -f $(INSTALL_ROOT)$(bindir)/phar | ||
| 40 | - $(LN_S) -f $(INSTALL_ROOT)$(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar | ||
| 41 | + $(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar | ||
| 42 | @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 | ||
| 43 | @$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1 | ||
| 44 | @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1 | ||
diff --git a/meta-oe/recipes-devtools/php/php_5.5.24.bb b/meta-oe/recipes-devtools/php/php_5.5.26.bb index 4d23341a0d..1935ca1401 100644 --- a/meta-oe/recipes-devtools/php/php_5.5.24.bb +++ b/meta-oe/recipes-devtools/php/php_5.5.26.bb | |||
| @@ -30,8 +30,8 @@ SRC_URI_append_class-target += " \ | |||
| 30 | file://php-fpm.service \ | 30 | file://php-fpm.service \ |
| 31 | " | 31 | " |
| 32 | 32 | ||
| 33 | SRC_URI[md5sum] = "f9a8f3e4bb88b33b087bd63732b1402a" | 33 | SRC_URI[md5sum] = "383a4b35327809afd2822e1e5efc8ee1" |
| 34 | SRC_URI[sha256sum] = "801b5cf2e0c01b07314d4ac3c8a7c28d524bdd8263ebdd0e33a99008251316a2" | 34 | SRC_URI[sha256sum] = "816afffdb03ff4c542bc172a2f77f9c69b817df82d60cce05c1b4f578c2c926e" |
| 35 | 35 | ||
| 36 | S = "${WORKDIR}/php-${PV}" | 36 | S = "${WORKDIR}/php-${PV}" |
| 37 | 37 | ||
