[PATCH 0/1] fix rootfs generation bug

[PATCH 0/1] fix rootfs generation bug

[Darren Hart]

Fix a rootfs generation bug introduced by commit
5e384038cbd5035377d61a1b77ad23ab69e0cac0.

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: dvhart/build
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/build

Thanks,
    Darren Hart <dvhart@linux.intel.com>
---


Darren Hart (1):
  rootfs_rpm: fix rootfs generation rm error

 meta/classes/rootfs_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

[PATCH 1/1] rootfs_rpm: fix rootfs generation rm error

[Darren Hart]

During a poky-image-minimal build I ran into the following error:
rm: cannot remove `/vol/1/dvhart/poky.git/build/tmp/work/atom-pc-poky-linux/poky-image-minimal-initramfs-1.0-r0/rootfs/install': Is a directory

This is caused by a missing -r (recursive) argument to rm. This patch
adds that to the rm command of rootfs_rpm.bbclass.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/rootfs_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 2f7d691..8646eec 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -206,7 +206,7 @@ EOF
 	mv ${IMAGE_ROOTFS}/install/*.manifest ${T}/
 
 	# Remove all remaining resolver files
-	rm -f ${IMAGE_ROOTFS}/install
+	rm -rf ${IMAGE_ROOTFS}/install
 
 	log_check rootfs
 
-- 
1.7.1

Re: [PATCH 1/1] rootfs_rpm: fix rootfs generation rm error

[Bruce Ashfield]

On Wed, Jan 5, 2011 at 7:57 PM, Darren Hart <dvhart@linux.intel.com> wrote:
> During a poky-image-minimal build I ran into the following error:
> rm: cannot remove `/vol/1/dvhart/poky.git/build/tmp/work/atom-pc-poky-linux/poky-image-minimal-initramfs-1.0-r0/rootfs/install': Is a directory
>
> This is caused by a missing -r (recursive) argument to rm. This patch
> adds that to the rm command of rootfs_rpm.bbclass.

Thanks Darren. Beat me to it!

Looks good to me, definitely fixed my problems earlier.

Bruce

>
> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
> CC: Bruce Ashfield <bruce.ashfield@windriver.com>
> ---
>  meta/classes/rootfs_rpm.bbclass |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
> index 2f7d691..8646eec 100644
> --- a/meta/classes/rootfs_rpm.bbclass
> +++ b/meta/classes/rootfs_rpm.bbclass
> @@ -206,7 +206,7 @@ EOF
>        mv ${IMAGE_ROOTFS}/install/*.manifest ${T}/
>
>        # Remove all remaining resolver files
> -       rm -f ${IMAGE_ROOTFS}/install
> +       rm -rf ${IMAGE_ROOTFS}/install
>
>        log_check rootfs
>
> --
> 1.7.1
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"

Re: [PATCH 0/1] fix rootfs generation bug

[Saul Wold]

On 01/05/2011 04:57 PM, Darren Hart wrote:
> Fix a rootfs generation bug introduced by commit
> 5e384038cbd5035377d61a1b77ad23ab69e0cac0.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>    Branch: dvhart/build
>    Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/build
>
> Thanks,
>      Darren Hart<dvhart@linux.intel.com>
> ---
>
>
> Darren Hart (1):
>    rootfs_rpm: fix rootfs generation rm error
>
>   meta/classes/rootfs_rpm.bbclass |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>

Pulled into Master

Thanks
    Sau!