mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
php: cleanup QA warnings
php-native had: WARNING: The recipe php-native is trying to install files into a shared area when those files already exist. Those files and their manifest location are: /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.filemap /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.lock /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.depdblock /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.depdb /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.channels/pear.php.net.reg /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.channels/pecl.php.net.reg /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.channels/doc.php.net.reg /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.channels/__uri.reg /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.channels/.alias/pear.txt /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.channels/.alias/pecl.txt /home/hrw/HDD/devel/canonical/aarch64/openembedded/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/php/.channels/.alias/phpdocs.txt Please verify which package should provide the above files. php had: WARNING: QA Issue: php: Files/directories were installed but not shipped /.filemap /.lock /.depdblock /.depdb /var /.registry /.channels /home /var/run /var/log /var/volatile /var/volatile/run /var/volatile/log /etc/php-fpm.conf.default /.registry/.channel.pecl.php.net /.registry/.channel.doc.php.net /.registry/.channel.__uri /.channels/pear.php.net.reg /.channels/pecl.php.net.reg /.channels/doc.php.net.reg /.channels/__uri.reg /.channels/.alias /.channels/.alias/pear.txt /.channels/.alias/pecl.txt /.channels/.alias/phpdocs.txt /home/hrw /home/hrw/HDD /home/hrw/HDD/devel /home/hrw/HDD/devel/canonical /home/hrw/HDD/devel/canonical/aarch64 /home/hrw/HDD/devel/canonical/aarch64/openembedded /home/hrw/HDD/devel/canonical/aarch64/openembedded/build Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
165540cf6a
commit
fe354846be
|
|
@ -7,7 +7,7 @@ DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \
|
|||
libc-client openssl sqlite3"
|
||||
DEPENDS_virtclass-native = "zlib-native libxml2-native"
|
||||
|
||||
INC_PR = "r3"
|
||||
INC_PR = "r4"
|
||||
|
||||
SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2"
|
||||
|
||||
|
|
@ -55,14 +55,22 @@ do_install () {
|
|||
oe_runmake 'INSTALL_ROOT=${D}' install
|
||||
}
|
||||
|
||||
do_install_append_pn-php-native() {
|
||||
rm -rf ${D}/${libdir}/php/.registry
|
||||
rm -rf ${D}/${libdir}/php/.channels
|
||||
rm -rf ${D}/${libdir}/php/.[a-z]*
|
||||
}
|
||||
|
||||
# fixme
|
||||
do_install_append_pn-php() {
|
||||
install -d ${D}/${sysconfdir}/
|
||||
mv ${D}/${STAGING_DIR_NATIVE}/${sysconfdir}/* ${D}/${sysconfdir}/
|
||||
rm -rf ${D}/${STAGING_DIR_NATIVE}
|
||||
rm -rf ${D}/${TMPDIR}
|
||||
rm -rf ${D}/.registry
|
||||
rm -rf ${D}/.channels
|
||||
rm -rf ${D}/.[a-z]*
|
||||
rm -rf ${D}/var
|
||||
rm -f ${D}/${sysconfdir}/php-fpm.conf.default
|
||||
sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}/${sysconfdir}/pear.conf
|
||||
install -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf
|
||||
install -d ${D}/${sysconfdir}/apache2/conf.d
|
||||
|
|
@ -72,6 +80,11 @@ do_install_append_pn-php() {
|
|||
sed -i 's:=/etc:=${sysconfdir}:g' ${S}/sapi/fpm/init.d.php-fpm
|
||||
sed -i 's:=/var:=${localstatedir}:g' ${S}/sapi/fpm/init.d.php-fpm
|
||||
install -m 0755 ${S}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm
|
||||
TMP=`dirname ${D}/${TMPDIR}`
|
||||
while test ${TMP} != ${D}; do
|
||||
rmdir ${TMP}
|
||||
TMP=`dirname ${TMP}`;
|
||||
done
|
||||
}
|
||||
|
||||
PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user