Patchwork [09/19] tar: fix build with automake 1.12.x

login
register
mail settings
Submitter Nitin A Kamble
Date July 10, 2012, 4:02 p.m.
Message ID <988e8d84bfa34805c1749cfb77f64b9da2cd5e08.1341935782.git.nitin.a.kamble@intel.com>
Download mbox | patch
Permalink /patch/31657/
State New
Headers show

Comments

Nitin A Kamble - July 10, 2012, 4:02 p.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

automake 1.12.x automatically deletes empty directories, so
the additional rmdir from the do_install_append fails.

cleanup the do_install_append for automake 1.12.x

Avoid this error:
| rmdir: failed to remove `/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/tar-1.26-r1/image/usr/sbin/': No such file or directory
NOTE: package tar-1.26-r1: task do_install: Failed

no PR bump as no change in the output.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/recipes-extended/tar/tar.inc |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
Saul Wold - July 11, 2012, 10:15 p.m.
On 07/10/2012 09:02 AM, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>
> automake 1.12.x automatically deletes empty directories, so
> the additional rmdir from the do_install_append fails.
>
> cleanup the do_install_append for automake 1.12.x
>
> Avoid this error:
> | rmdir: failed to remove `/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/tar-1.26-r1/image/usr/sbin/': No such file or directory
> NOTE: package tar-1.26-r1: task do_install: Failed
>
> no PR bump as no change in the output.
>
> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> ---
>   meta/recipes-extended/tar/tar.inc |    2 --
>   1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc
> index 8c475df..203fb97 100644
> --- a/meta/recipes-extended/tar/tar.inc
> +++ b/meta/recipes-extended/tar/tar.inc
> @@ -18,8 +18,6 @@ do_install () {
>   do_install_extra () {
>       install -d ${D}${base_bindir}
>       mv ${D}${bindir}/tar ${D}${base_bindir}/tar
> -    rmdir ${D}${bindir}/
This needs to stay in actually since this directory is populated by 
default so automake will not remove it, this will cause a packaging 
regression.

See 2736, which I assigned to you.

Sau!

> -    rmdir ${D}${sbindir}/
>   }
>
>   inherit update-alternatives
>

Patch

diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc
index 8c475df..203fb97 100644
--- a/meta/recipes-extended/tar/tar.inc
+++ b/meta/recipes-extended/tar/tar.inc
@@ -18,8 +18,6 @@  do_install () {
 do_install_extra () {
     install -d ${D}${base_bindir}
     mv ${D}${bindir}/tar ${D}${base_bindir}/tar
-    rmdir ${D}${bindir}/
-    rmdir ${D}${sbindir}/
 }
 
 inherit update-alternatives