| Message ID | 20251125103644.3585-1-liuyd.fnst@fujitsu.com |
|---|---|
| State | Under Review |
| Headers | show |
| Series | [meta-oe] php: upgrade 8.4.15 -> 8.5.0 | expand |
xdebug fails to build with this since it can only build with PHP upto 8.4, I would suggest you submit it along with xdebug 3.5.0 ( when it releases ) On Tue, Nov 25, 2025 at 2:36 AM Yiding Liu (Fujitsu) via lists.openembedded.org <liuyd.fnst=fujitsu.com@lists.openembedded.org> wrote: > 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 <liuyd.fnst@fujitsu.com> > --- > .../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<pver>\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" > > -- > 2.43.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#122053): > https://lists.openembedded.org/g/openembedded-devel/message/122053 > Mute This Topic: https://lists.openembedded.org/mt/116466909/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ > raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
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<pver>\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"
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 <liuyd.fnst@fujitsu.com> --- .../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%)