summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-25 22:30:23 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-25 22:30:23 +0000
commitf4ab3a1d3a56c8a0359809a2a561cb02aa5ab475 (patch)
tree631f8970ed16582abdc09dc8c78538589d3dc4bb
parent4f249a8efbced11400f99c182ef101b7c00e7ba8 (diff)
downloadpoky-f4ab3a1d3a56c8a0359809a2a561cb02aa5ab475.tar.gz
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
-rw-r--r--meta/packages/perl/perl.inc4
-rw-r--r--meta/packages/perl/perl_5.8.7.bb2
2 files changed, 3 insertions, 3 deletions
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() {
20 ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl 20 ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl
21 cp ${HOSTPERL} hostperl 21 cp ${HOSTPERL} hostperl
22 cd Cross 22 cd Cross
23 rm Makefile.SH.patch 23 rm -f Makefile.SH.patch
24 cp ${WORKDIR}/Makefile.SH.patch . 24 cp ${WORKDIR}/Makefile.SH.patch .
25 cp ${WORKDIR}/config.sh-mipsel-linux . 25 cp ${WORKDIR}/config.sh-mipsel-linux .
26 cp ${WORKDIR}/config.sh-i686-linux . 26 cp ${WORKDIR}/config.sh-i686-linux .
@@ -52,7 +52,7 @@ do_compile() {
52do_install() { 52do_install() {
53 oe_runmake install 53 oe_runmake install
54 mv ${D}/${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/CORE/libperl.so ${D}/${libdir}/libperl.so.${PV} 54 mv ${D}/${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/CORE/libperl.so ${D}/${libdir}/libperl.so.${PV}
55 ( cd ${D}/usr/bin/; rm perl; ln -s perl${PV} perl ) 55 ( cd ${D}/usr/bin/; rm -f perl; ln -s perl${PV} perl )
56} 56}
57 57
58do_stage() { 58do_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() {
29 ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl 29 ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl
30 cp ${HOSTPERL} hostperl 30 cp ${HOSTPERL} hostperl
31 cd Cross 31 cd Cross
32 rm Makefile.SH.patch 32 rm -f Makefile.SH.patch
33 cp ${WORKDIR}/Makefile.SH.patch . 33 cp ${WORKDIR}/Makefile.SH.patch .
34 cp ${WORKDIR}/config.sh-mipsel-linux . 34 cp ${WORKDIR}/config.sh-mipsel-linux .
35 cp ${WORKDIR}/config.sh-i386-linux . 35 cp ${WORKDIR}/config.sh-i386-linux .