From: Darren Hart <dvhart@linux.intel.com>
Date: Thu, 6 Jan 2011 00:45:56 +0000 (-0800)
Subject: rootfs_rpm: fix rootfs generation rm error
X-Git-Tag: 2011-1~3025
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=21fafc889e81411735de7d04ffe504e5cff4830d;p=openembedded-core.git

rootfs_rpm: fix rootfs generation rm error

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>
---

diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 2f7d6916d9..8646eec1e1 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