From 4f857db335de6935077d4866c51dd9d6851fed1d Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <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/qte/qte_4.0.0-snapshot.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/qte')

diff --git a/packages/qte/qte_4.0.0-snapshot.bb b/packages/qte/qte_4.0.0-snapshot.bb
index 5b72c26e30..1e81edf8f6 100644
--- a/packages/qte/qte_4.0.0-snapshot.bb
+++ b/packages/qte/qte_4.0.0-snapshot.bb
@@ -207,7 +207,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 FILES_${PN} = ""
 FILES_libqte4-debug	= "${palmtopdir}/lib/libQt*_debug.*"
-FILES_libqte4-core	= "${palmtopdir}/lib/libQtCore.* /usr/sbin/update-qtfontdir"
+FILES_libqte4-core	= "${palmtopdir}/lib/libQtCore.* ${sbindir}/update-qtfontdir"
 FILES_libqte4-gui	= "${palmtopdir}/lib/libQtGui.*"
 FILES_libqte4-network	= "${palmtopdir}/lib/libQtNetwork.*"
 FILES_libqte4-sql	= "${palmtopdir}/lib/libQtSql.*"
-- 
cgit v1.2.3