From c467c5d609db3687cc3639849c287ff38c587dfe Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Fri, 21 Sep 2018 14:15:51 +0800 Subject: [PATCH] php: Upgrade 7.2.9 -< 7.2.10 1. Upgrade 7.2.9 -> 7.2.10 2. php 5.x not support valgrind config, so move it to php_7.x.bb Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/php/php.inc | 1 - meta-oe/recipes-devtools/php/{php_7.2.9.bb => php_7.2.10.bb} | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-devtools/php/{php_7.2.9.bb => php_7.2.10.bb} (80%) diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index 65dfd2d896..9eacabe03e 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc @@ -92,7 +92,6 @@ PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," PACKAGECONFIG[opcache] = "--enable-opcache,--disable-opcache" PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" -PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php" diff --git a/meta-oe/recipes-devtools/php/php_7.2.9.bb b/meta-oe/recipes-devtools/php/php_7.2.10.bb similarity index 80% rename from meta-oe/recipes-devtools/php/php_7.2.9.bb rename to meta-oe/recipes-devtools/php/php_7.2.10.bb index a5d5afecf3..8dc64bb89b 100644 --- a/meta-oe/recipes-devtools/php/php_7.2.9.bb +++ b/meta-oe/recipes-devtools/php/php_7.2.10.bb @@ -13,12 +13,13 @@ SRC_URI_append_class-target = " \ file://0001-opcache-config.m4-enable-opcache.patch \ " -SRC_URI[md5sum] = "175023bc43fd8f883e60849a02a03b93" -SRC_URI[sha256sum] = "e9e3aaa6c317b7fea78246a758b017544366049d2789ad5a44fe9398464c53a8" +SRC_URI[md5sum] = "0ce8ff615bfb9de7a89bab8d742c11c0" +SRC_URI[sha256sum] = "01b6129a0921a1636b07da9bc598a876669e45a462cef4b5844fc26862dbda9d" PACKAGECONFIG[mysql] = "--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ ,--without-mysqli --without-pdo-mysql \ ,mysql5" +PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default"