mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-15 16:07:26 +00:00
php: fix phar script packaging
Fix several issues with how the phar package is installed and packaged: * The symlink was pointing to an absolute path on the host, which naturally does not work on the target * The script itself had a shebang pointing to a path on the host * A file-rdeps warning was occurring due to rpmdeps detecting that the script requires the php binary; in order to prevent the main php package depending on php-cli which provides the php binary, move the phar script to its own package (I suspect most people won't need it anyway). Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
committed by
Martin Jansa
parent
061b7f1263
commit
4aafeeecef
@@ -183,9 +183,10 @@ php_sysroot_preprocess () {
|
||||
|
||||
MODPHP_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', '${PN}-modphp', '', d)}"
|
||||
|
||||
PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}"
|
||||
PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-phar ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}"
|
||||
|
||||
RDEPENDS_${PN}-pear = "${PN}"
|
||||
RDEPENDS_${PN}-phar = "${PN}-cli"
|
||||
RDEPENDS_${PN}-cli = "${PN}"
|
||||
RDEPENDS_${PN}-modphp = "${PN} apache2"
|
||||
RDEPENDS_${PN}-dev = "${PN}"
|
||||
@@ -197,6 +198,7 @@ FILES_${PN}-dbg =+ "${bindir}/.debug \
|
||||
${libdir}/apache2/modules/.debug"
|
||||
FILES_${PN}-doc += "${PHP_LIBDIR}/php/doc"
|
||||
FILES_${PN}-cli = "${bindir}/php"
|
||||
FILES_${PN}-phar = "${bindir}/phar*"
|
||||
FILES_${PN}-cgi = "${bindir}/php-cgi"
|
||||
FILES_${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm"
|
||||
FILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf"
|
||||
|
||||
Reference in New Issue
Block a user