From: Richard Purdie <richard@openedhand.com>
Date: Sat, 25 Nov 2006 22:30:23 +0000 (+0000)
Subject: perl: Use -f option to rm, fixing read only file problems
X-Git-Tag: 2011-1~12451
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f4ab3a1d3a56c8a0359809a2a561cb02aa5ab475;p=openembedded-core.git

perl: Use -f option to rm, fixing read only file problems

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@959 311d38ba-8fff-0310-9ca6-ca027cbcb966
---

diff --git a/meta/packages/perl/perl.inc b/meta/packages/perl/perl.inc
index 6ee0ed702c..4f42d78ded 100644
--- a/meta/packages/perl/perl.inc
+++ b/meta/packages/perl/perl.inc
@@ -20,7 +20,7 @@ do_configure() {
 	ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl 
 	cp ${HOSTPERL} hostperl
 	cd Cross
-	rm Makefile.SH.patch
+	rm -f Makefile.SH.patch
 	cp ${WORKDIR}/Makefile.SH.patch .
 	cp ${WORKDIR}/config.sh-mipsel-linux .
 	cp ${WORKDIR}/config.sh-i686-linux .
@@ -52,7 +52,7 @@ do_compile() {
 do_install() {
 	oe_runmake install
 	mv ${D}/${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/CORE/libperl.so ${D}/${libdir}/libperl.so.${PV}
-	( cd ${D}/usr/bin/; rm perl; ln -s perl${PV} perl )
+	( cd ${D}/usr/bin/; rm -f perl; ln -s perl${PV} perl )
 }
 
 do_stage() {
diff --git a/meta/packages/perl/perl_5.8.7.bb b/meta/packages/perl/perl_5.8.7.bb
index 40d499eac3..7e1ef2edf2 100644
--- a/meta/packages/perl/perl_5.8.7.bb
+++ b/meta/packages/perl/perl_5.8.7.bb
@@ -29,7 +29,7 @@ do_configure() {
 	ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl
 	cp ${HOSTPERL} hostperl
 	cd Cross
-	rm Makefile.SH.patch
+	rm -f Makefile.SH.patch
 	cp ${WORKDIR}/Makefile.SH.patch .
 	cp ${WORKDIR}/config.sh-mipsel-linux .
 	cp ${WORKDIR}/config.sh-i386-linux .