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/prismstumbler/prismstumbler_0.7.2.bb | 2 +- packages/prismstumbler/prismstumbler_0.7.3.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/prismstumbler') diff --git a/packages/prismstumbler/prismstumbler_0.7.2.bb b/packages/prismstumbler/prismstumbler_0.7.2.bb index b04b4a41c5..45ad2bb719 100644 --- a/packages/prismstumbler/prismstumbler_0.7.2.bb +++ b/packages/prismstumbler/prismstumbler_0.7.2.bb @@ -21,7 +21,7 @@ FILES_${PN} = "${bindir}/prismstumbler" FILES_prismstumbler-frontend = "${bindir}/psfront ${bindir}/pst \ ${datadir}/applications \ - ${datadir}/pixmaps ${datadir}/doc/prismstumbler/help.txt \ + ${datadir}/pixmaps ${docdir}/prismstumbler/help.txt \ ${sysconfdir}" do_configure() { diff --git a/packages/prismstumbler/prismstumbler_0.7.3.bb b/packages/prismstumbler/prismstumbler_0.7.3.bb index 8723c06ec2..919a4fa153 100644 --- a/packages/prismstumbler/prismstumbler_0.7.3.bb +++ b/packages/prismstumbler/prismstumbler_0.7.3.bb @@ -21,7 +21,7 @@ FILES_${PN} = "${bindir}/prismstumbler" FILES_prismstumbler-frontend = "${bindir}/psfront ${bindir}/pst \ ${datadir}/applications \ - ${datadir}/pixmaps ${datadir}/doc/prismstumbler/help.txt \ + ${datadir}/pixmaps ${docdir}/prismstumbler/help.txt \ ${sysconfdir}" RDEPENDS_prismstumbler-frontend = "${PN}" -- cgit 1.2.3-korg