Patchwork [meta-oe] php: cleanup QA warnings

login
register
mail settings
Submitter Marcin Juszkiewicz
Date Jan. 17, 2013, 10:32 p.m.
Message ID <1358461961-5703-1-git-send-email-marcin.juszkiewicz@linaro.org>
Download mbox | patch
Permalink /patch/42829/
State Accepted, archived
Headers show

Comments

Marcin Juszkiewicz - Jan. 17, 2013, 10:32 p.m.
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>
---
 meta-oe/recipes-devtools/php/php.inc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
Martin Jansa - Jan. 19, 2013, 10:03 a.m.
On Thu, Jan 17, 2013 at 11:32:41PM +0100, Marcin Juszkiewicz wrote:
> 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

It's much better, thanks.

I think this /home is still there:
php-5.3.19: php: Files/directories were installed but not shipped
  /home
  /home/jenkins
  /home/jenkins/oe
  /home/jenkins/oe/shr-core-branches
  /home/jenkins/oe/shr-core-branches/shr-core

Cheers,

> 
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
>  meta-oe/recipes-devtools/php/php.inc | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
> index 5e5a087..928d3d2 100644
> --- a/meta-oe/recipes-devtools/php/php.inc
> +++ b/meta-oe/recipes-devtools/php/php.inc
> @@ -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
> -- 
> 1.8.0
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Marcin Juszkiewicz - Jan. 19, 2013, 10:20 a.m.
W dniu 19.01.2013 11:03, Martin Jansa pisze:
> I think this /home is still there:
> php-5.3.19: php: Files/directories were installed but not shipped
>   /home
>   /home/jenkins
>   /home/jenkins/oe
>   /home/jenkins/oe/shr-core-branches
>   /home/jenkins/oe/shr-core-branches/shr-core

It is ${TMPDIR} not /home/ - if you have idea how to find out where it
is and how to safely remove it...
Martin Jansa - Jan. 20, 2013, 2:53 p.m.
On Sat, Jan 19, 2013 at 11:20:56AM +0100, Marcin Juszkiewicz wrote:
> W dniu 19.01.2013 11:03, Martin Jansa pisze:
> > I think this /home is still there:
> > php-5.3.19: php: Files/directories were installed but not shipped
> >   /home
> >   /home/jenkins
> >   /home/jenkins/oe
> >   /home/jenkins/oe/shr-core-branches
> >   /home/jenkins/oe/shr-core-branches/shr-core
> 
> It is ${TMPDIR} not /home/ - if you have idea how to find out where it
> is and how to safely remove it...

Ah right. Last time I was touching php I was trying to prevent creating
this directory structure but failed, maybe something ugly like:

TMP=/OE/shr-core/tmp-eglibc/work/armv5te/php-5/OE/shr-core/tmp-eglibc/work;
WORKDIR=/OE/shr-core/tmp-eglibc/work/armv5te/php-5

while test ${TMP} != ${WORKDIR}; do
  rmdir ${TMP}
  TMP=`dirname ${TMP}`;
done

?
Martin Jansa - Jan. 22, 2013, 12:29 p.m.
On Sun, Jan 20, 2013 at 03:53:47PM +0100, Martin Jansa wrote:
> On Sat, Jan 19, 2013 at 11:20:56AM +0100, Marcin Juszkiewicz wrote:
> > W dniu 19.01.2013 11:03, Martin Jansa pisze:
> > > I think this /home is still there:
> > > php-5.3.19: php: Files/directories were installed but not shipped
> > >   /home
> > >   /home/jenkins
> > >   /home/jenkins/oe
> > >   /home/jenkins/oe/shr-core-branches
> > >   /home/jenkins/oe/shr-core-branches/shr-core
> > 
> > It is ${TMPDIR} not /home/ - if you have idea how to find out where it
> > is and how to safely remove it...
> 
> Ah right. Last time I was touching php I was trying to prevent creating
> this directory structure but failed, maybe something ugly like:
> 
> TMP=/OE/shr-core/tmp-eglibc/work/armv5te/php-5/OE/shr-core/tmp-eglibc/work;
> WORKDIR=/OE/shr-core/tmp-eglibc/work/armv5te/php-5
> 
> while test ${TMP} != ${WORKDIR}; do
>   rmdir ${TMP}
>   TMP=`dirname ${TMP}`;
> done

Merged with that while cycle added, thanks

Patch

diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index 5e5a087..928d3d2 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -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