Skip to contentSkip to conversation

fix rootfs generation bug

PATCH In review Darren Hart 3 participants 4 messages Jan 6, 2011

lore
Share & tools
lore

Darren Hart

author
#0 lore raw

cover fix rootfs generation bug

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 <[email protected]>
---

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

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

PATCH 1/1 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 <[email protected]>
CC Bruce Ashfield <[email protected]>
---
 meta/classes/rootfs_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/rootfs_rpm.bbclass +1 -1
index 2f7d691..8646eec 100644
@@ -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
Signature · 1 line
1.7.1
#2 lore raw

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

Quoted 5 lines · 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.

Thanks Darren. Beat me to it!

Looks good to me, definitely fixed my problems earlier.

Bruce

Quoted 28 lines
Signed-off-by Darren Hart <[email protected]>
CC Bruce Ashfield <[email protected]>

---
 meta/classes/rootfs_rpm.bbclass |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/rootfs_rpm.bbclass +0 -0
index 2f7d691..8646eec 100644
@@ -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
[email protected]
https://lists.yoctoproject.org/listinfo/poky

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
#3 lore raw
In reply to Darren Hart
Quoted 15 lines · 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<[email protected]>
---

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

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

_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

Pulled into Master

Thanks
Sau!