From patchwork Fri Dec 5 03:05:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Yiding X-Patchwork-Id: 75922 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00513D2CE17 for ; Fri, 5 Dec 2025 03:05:31 +0000 (UTC) Received: from esa9.hc1455-7.c3s2.iphmx.com (esa9.hc1455-7.c3s2.iphmx.com [139.138.36.223]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.61771.1764903929100568139 for ; Thu, 04 Dec 2025 19:05:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@fujitsu.com header.s=fj2 header.b=OMVowRKf; spf=pass (domain: fujitsu.com, ip: 139.138.36.223, mailfrom: liuyd.fnst@fujitsu.com) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=fujitsu.com; i=@fujitsu.com; q=dns/txt; s=fj2; t=1764903929; x=1796439929; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=MmH2HxCW0tMzeJdJtyyGKSw/UfybSdqIaU7GV5NTcME=; b=OMVowRKfAKEO3jetAfBub08CRd9XbsEjS0oDms5smd9WKYq0eTCH0Ikk TKpgqzNnj1+ncErJB8JgvuykD9mWxIPi+5n4e2V3CXEAjPEo0SIgBZXDc y3GVEIrbC0kll88yqFuVoMH5cyeRotwAAA9VPCKavKcXaFfEXEsIstjsi zZhoNwVoPSAvLUU6kCMe4tHdRxSkfUqzhxUTtIWxGPAR3hKpLgX85bBrQ CopRV8Oy/5Zya1fIzjMic6xhLMrfCm4YvBpVwHSPT0G2IDUaqgkugU/1d 061+nJMUKeeX0bUmxJ5DL9t+cEtj8ieJ8XctsAWsPeBljeRqWKvTJ3U4A Q==; X-CSE-ConnectionGUID: TV6atFi5RuixHeDfYqLnxg== X-CSE-MsgGUID: NDdcQA+hSE+agUeCuQ0mAw== X-IronPort-AV: E=McAfee;i="6800,10657,11632"; a="210110632" X-IronPort-AV: E=Sophos;i="6.20,250,1758553200"; d="scan'208";a="210110632" Received: from unknown (HELO az2nlsmgr3.o.css.fujitsu.com) ([20.61.8.234]) by esa9.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Dec 2025 12:05:28 +0900 Received: from az2nlsmgm1.o.css.fujitsu.com (unknown [10.150.26.203]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by az2nlsmgr3.o.css.fujitsu.com (Postfix) with ESMTPS id 6F3AC1000367 for ; Fri, 5 Dec 2025 03:05:27 +0000 (UTC) Received: from az2uksmom3.o.css.fujitsu.com (az2uksmom3.o.css.fujitsu.com [10.151.22.205]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by az2nlsmgm1.o.css.fujitsu.com (Postfix) with ESMTPS id 21F11C01613 for ; Fri, 5 Dec 2025 03:05:27 +0000 (UTC) Received: from G08FNSTD190101.g08.fujitsu.local (unknown [10.193.135.3]) by az2uksmom3.o.css.fujitsu.com (Postfix) with ESMTP id BC9AF1001CF7 for ; Fri, 5 Dec 2025 03:05:24 +0000 (UTC) From: Liu Yiding To: openembedded-devel@lists.openembedded.org Subject: [oe][meta-oe][PATCH 2/2] php: upgrade 8.4.15 -> 8.5.0 Date: Fri, 5 Dec 2025 11:05:13 +0800 Message-ID: <20251205030513.16987-1-liuyd.fnst@fujitsu.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 05 Dec 2025 03:05:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/122333 1. Changelog: https://github.com/php/php-src/releases/tag/php-8.5.0 2. Remove opcache-related options as it was not in 8.5.0. 3. Fix FILES:${PN}-fpm to resolve following error: ERROR: php-8.5.0-r0 do_package: QA Issue: php: Files/directories were installed but not shipped in any package: /usr/share/php /usr/share/php/fpm /usr/share/php/fpm/status.html Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. Signed-off-by: Liu Yiding --- .../php/{php_8.4.15.bb => php_8.5.0.bb} | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) rename meta-oe/recipes-devtools/php/{php_8.4.15.bb => php_8.5.0.bb} (94%) diff --git a/meta-oe/recipes-devtools/php/php_8.4.15.bb b/meta-oe/recipes-devtools/php/php_8.5.0.bb similarity index 94% rename from meta-oe/recipes-devtools/php/php_8.4.15.bb rename to meta-oe/recipes-devtools/php/php_8.5.0.bb index 629eef0519..412ffd9f06 100644 --- a/meta-oe/recipes-devtools/php/php_8.4.15.bb +++ b/meta-oe/recipes-devtools/php/php_8.5.0.bb @@ -32,7 +32,7 @@ UPSTREAM_CHECK_REGEX = "releases/tag/php-(?P\d+(\.\d+)+)" S = "${UNPACKDIR}/php-${PV}" -SRC_URI[sha256sum] = "b7155bdd498d60d63e4bc320dc224863976d31b5bd9339699726c961255a3197" +SRC_URI[sha256sum] = "cd16cb045b34a6cec6a83008e1b335f365c7a832fcc483df82308664c6d021f9" CVE_STATUS_GROUPS += "CVE_STATUS_PHP" CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored." @@ -91,7 +91,7 @@ EXTRA_OECONF:class-native = " \ ${COMMON_EXTRA_OECONF} \ " -PACKAGECONFIG ??= "mysql sqlite3 opcache openssl \ +PACKAGECONFIG ??= "mysql sqlite3 openssl \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ " PACKAGECONFIG:class-native = "" @@ -104,7 +104,6 @@ PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \ --with-pdo-mysql=mysqlnd \ ,--without-mysqli --without-pdo-mysql \ ,mysql5" -PACKAGECONFIG[opcache] = "--enable-opcache,--disable-opcache" PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" PACKAGECONFIG[pam] = ",,libpam" PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql" @@ -230,13 +229,12 @@ php_sysroot_preprocess () { MODPHP_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', '${PN}-modphp', '', d)}" -PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-phpdbg ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-opcache ${PN}" +PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-phpdbg ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}" RDEPENDS:${PN} += "libgcc" RDEPENDS:${PN}-pear = "${PN}" RDEPENDS:${PN}-cli = "${PN}" RDEPENDS:${PN}-modphp = "${PN} apache2" -RDEPENDS:${PN}-opcache = "${PN}" ALLOW_EMPTY:${PN} = "1" @@ -244,9 +242,7 @@ INITSCRIPT_PACKAGES = "${PN}-fpm" inherit update-rc.d # WARNING: lib32-php-8.0.12-r0 do_package_qa: QA Issue: lib32-php: ELF binary /usr/libexec/apache2/modules/libphp.so has relocations in .text [textrel] -#WARNING: lib32-php-8.0.12-r0 do_package_qa: QA Issue: lib32-php-opcache: ELF binary /usr/lib/php8/extensions/no-debug-zts-20200930/opcache.so has relocations in .text [textrel] INSANE_SKIP:${PN}:append:x86 = " textrel" -INSANE_SKIP:${PN}-opcache:append:x86 = " textrel" FILES:${PN}-dbg =+ "${bindir}/.debug \ ${libexecdir}/apache2/modules/.debug" @@ -254,7 +250,7 @@ FILES:${PN}-doc += "${PHP_LIBDIR}/php/doc" FILES:${PN}-cli = "${bindir}/php" FILES:${PN}-phpdbg = "${bindir}/phpdbg" FILES:${PN}-cgi = "${bindir}/php-cgi" -FILES:${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm ${sysconfdir}/php-fpm.d/www.conf.default" +FILES:${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/php/fpm ${sysconfdir}/init.d/php-fpm ${sysconfdir}/php-fpm.d/www.conf.default" FILES:${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" CONFFILES:${PN}-fpm = "${sysconfdir}/php-fpm.conf" CONFFILES:${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" @@ -273,7 +269,6 @@ FILES:${PN}-dev = "${includedir}/php ${PHP_LIBDIR}/build ${bindir}/phpize \ ${PHP_LIBDIR}/php/.depdblock ${PHP_LIBDIR}/php/.filemap \ ${PHP_LIBDIR}/php/.lock ${PHP_LIBDIR}/php/test" FILES:${PN}-staticdev += "${PHP_LIBDIR}/extensions/*/*.a" -FILES:${PN}-opcache = "${PHP_LIBDIR}/extensions/*/opcache${SOLIBSDEV}" FILES:${PN} = "${PHP_LIBDIR}/php" FILES:${PN} += "${bindir} ${libexecdir}/apache2"