From 4f857db335de6935077d4866c51dd9d6851fed1d Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Tue, 22 Feb 2005 12:53:55 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/21 17:35:27-06:00 ti.com!kergoth Kill the ipkg paths patch, since its busted. 2005/02/21 17:33:13-06:00 ti.com!kergoth Fix sbindir in native.bbclass and cross.bbclass. Thanks to Jordan Crouse for reporting. 2005/02/21 17:13:19-06:00 ti.com!kergoth Add the paths patch to ipkg which fixes it to no longer hardcode the '/usr/lib/ipkg' path, which I forgot to check in from the previous commit. 2005/02/21 17:09:46-06:00 ti.com!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/02/21 17:09:03-06:00 ti.com!kergoth Run a sed script against our packages to fix some hardcoded target path references. As always when I do things like this, if packages you maintain were touched by this, please do a sanity check to ensure the sed script didn't run wild. 2005/02/21 15:49:47-06:00 ti.com!kergoth Use a HOTPLUG variable to manage which hotplug you prefer, to ensure that hotplug is still included in task-bootstrap even if you dont set DISTRO. BKrev: 421b2b63X5eoMcSrC7pVcptXK-iFKg --- packages/perl/perl_5.8.3.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'packages/perl') diff --git a/packages/perl/perl_5.8.3.bb b/packages/perl/perl_5.8.3.bb index e82438f169..44f39a56fb 100644 --- a/packages/perl/perl_5.8.3.bb +++ b/packages/perl/perl_5.8.3.bb @@ -38,7 +38,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}${bindir}/; rm perl; ln -s perl${PV} perl ) } do_stage() { @@ -56,8 +56,8 @@ python populate_packages_prepend () { } PACKAGES = "perl perl-misc perl-lib perl-dev perl-pod" -FILES_${PN} = "/usr/bin/perl /usr/bin/perl${PV}" -FILES_${PN}-lib = "/usr/lib/libperl.so*" -FILES_${PN}-dev = "/usr/lib/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/CORE/" -FILES_${PN}-pod = "/usr/lib/perl5/${PV}/pod" -FILES_perl-misc = "/usr/bin/" +FILES_${PN} = "${bindir}/perl ${bindir}/perl${PV}" +FILES_${PN}-lib = "${libdir}/libperl.so*" +FILES_${PN}-dev = "${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/CORE/" +FILES_${PN}-pod = "${libdir}/perl5/${PV}/pod" +FILES_perl-misc = "${bindir}/" -- cgit v1.2.3