summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2011-01-05 16:45:56 -0800
committerDarren Hart <dvhart@linux.intel.com>2011-01-05 16:50:43 -0800
commit21fafc889e81411735de7d04ffe504e5cff4830d (patch)
treea48bbf59bd685c4e07f58d29c1d691dc848fb3c9
parent5e384038cbd5035377d61a1b77ad23ab69e0cac0 (diff)
downloadopenembedded-core-21fafc889e81411735de7d04ffe504e5cff4830d.tar.gz
openembedded-core-21fafc889e81411735de7d04ffe504e5cff4830d.tar.bz2
openembedded-core-21fafc889e81411735de7d04ffe504e5cff4830d.tar.xz
openembedded-core-21fafc889e81411735de7d04ffe504e5cff4830d.zip
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>
-rw-r--r--meta/classes/rootfs_rpm.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 2f7d6916d..8646eec1e 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