From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
.../php/php/fix-race-condition-during-install.patch | 10 ----------
.../php/{php_5.4.14.bbappend => php_5.5.21.bbappend} | 11 +++--------
2 files changed, 3 insertions(+), 18 deletions(-)
delete mode 100644
meta-arago-distro/recipes-devtools/php/php/fix-race-condition-during-install.patch
rename meta-arago-distro/recipes-devtools/php/{php_5.4.14.bbappend =>
php_5.5.21.bbappend} (70%)
diff --git
a/meta-arago-distro/recipes-devtools/php/php/fix-race-condition-during-install.patch
b/meta-arago-distro/recipes-devtools/php/php/fix-race-condition-during-install.patch
deleted file mode 100644
index f4f3fb6..0000000
---
a/meta-arago-distro/recipes-devtools/php/php/fix-race-condition-during-install.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -rupN php-5.4.14/sapi/cgi/Makefile.frag
php-5.4.14.0/sapi/cgi/Makefile.frag
---- php-5.4.14/sapi/cgi/Makefile.frag 2013-04-10 03:47:04.000000000 -0400
-+++ php-5.4.14.0/sapi/cgi/Makefile.frag 2015-05-08 11:41:10.389484079
-0400
-@@ -5,5 +5,6 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(P
-
- install-cgi: $(SAPI_CGI_PATH)
- @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/"
-+ @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
- @$(INSTALL) -m 0755 $(SAPI_CGI_PATH)
$(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
-
diff --git a/meta-arago-distro/recipes-devtools/php/php_5.4.14.bbappend
b/meta-arago-distro/recipes-devtools/php/php_5.5.21.bbappend
similarity index 70%
rename from meta-arago-distro/recipes-devtools/php/php_5.4.14.bbappend
rename to meta-arago-distro/recipes-devtools/php/php_5.5.21.bbappend
index 2cc5630..9ed88ef 100644
--- a/meta-arago-distro/recipes-devtools/php/php_5.4.14.bbappend
+++ b/meta-arago-distro/recipes-devtools/php/php_5.5.21.bbappend
@@ -1,16 +1,10 @@
# look for files in this layer first
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PR_append = "-arago4"
-
-SRC_URI_append = " file://fix-race-condition-during-install.patch"
+PR_append = "-arago1"
SRC_URI_append_virtclass-native = "
file://0001-php-native-Fix-host-contamination-issue.patch"
-python __anonymous () {
- d.setVar("SRC_URI",
d.getVar("SRC_URI").replace('http://www.php.net/distributions/php-${PV}.tar.bz2',
'http://museum.php.net/php5/php-${PV}.tar.bz2'))
-}
-
# Work around to address the fact that php-fpm and php-cgi can not coexist
# php-cgi is used by Matrix and php-fpm is in beta for this version of php.
# Once this issue is fix in meta-oe the below won't be needed.
@@ -24,5 +18,6 @@ PACKAGES_remove = "${PN}-fpm-apache2"
do_install_prepend_pn-php() {
# Add the below file even though we aren't going to use it.
# do_install will complain and fail if this file isn't found.
- touch ${S}/sapi/fpm/init.d.php-fpm
+ mkdir -p ${B}/sapi/fpm/
+ touch ${B}/sapi/fpm/init.d.php-fpm
}
--
2.2.0
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
