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/mythfront/mythfront-config.bb  | 22 +++++++++++-----------
 packages/mythfront/mythfront-session.bb |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'packages/mythfront')

diff --git a/packages/mythfront/mythfront-config.bb b/packages/mythfront/mythfront-config.bb
index cf89514a71..d3b7d10980 100644
--- a/packages/mythfront/mythfront-config.bb
+++ b/packages/mythfront/mythfront-config.bb
@@ -8,25 +8,25 @@ SRC_URI = "file://tftp.sh file://xorg.conf"
 SRC_URI_append_epia = " file://serial.sh"
 
 do_install() {
-	install -d ${D}/etc/udhcpc.d/
-	install ${WORKDIR}/tftp.sh ${D}/etc/udhcpc.d/80tftp
+	install -d ${D}/${sysconfdir}/udhcpc.d/
+	install ${WORKDIR}/tftp.sh ${D}/${sysconfdir}/udhcpc.d/80tftp
 
-	install -d ${D}/etc/mythtv
-	ln -sf /var/lib/config/mysql.txt ${D}/etc/mythtv
+	install -d ${D}/${sysconfdir}/mythtv
+	ln -sf /var/lib/config/mysql.txt ${D}/${sysconfdir}/mythtv
 
-	install -d ${D}/etc/X11
-	install -m 0644 ${WORKDIR}/xorg.conf ${D}/etc/X11
+	install -d ${D}/${sysconfdir}/X11
+	install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11
 
-	ln -sf /var/lib/config/lircd.conf ${D}/etc/lircd.conf
+	ln -sf /var/lib/config/lircd.conf ${D}/${sysconfdir}/lircd.conf
 
 	install -d ${D}/dev
 	ln -sf lirc0 ${D}/dev/lirc
 
 	if [ -f ${WORKDIR}/serial.sh ]; then
-		install -d ${D}/etc/init.d
-		install -d ${D}/etc/rc2.d
-		install ${WORKDIR}/serial.sh ${D}/etc/init.d/mythfront-serial
-		ln -sf ../init.d/mythfront-serial ${D}/etc/rc2.d/S10mythfront-serial
+		install -d ${D}/${sysconfdir}/init.d
+		install -d ${D}/${sysconfdir}/rc2.d
+		install ${WORKDIR}/serial.sh ${D}/${sysconfdir}/init.d/mythfront-serial
+		ln -sf ../init.d/mythfront-serial ${D}/${sysconfdir}/rc2.d/S10mythfront-serial
 	fi
 }
 
diff --git a/packages/mythfront/mythfront-session.bb b/packages/mythfront/mythfront-session.bb
index 5f66164a2f..6f669170bf 100644
--- a/packages/mythfront/mythfront-session.bb
+++ b/packages/mythfront/mythfront-session.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 SRC_URI = "file://mythfront.sh"
 
 do_install() {
-	install -d ${D}/etc/X11/Xinit.d
-	install ${WORKDIR}/mythfront.sh ${D}/etc/X11/Xinit.d/90mythfront
+	install -d ${D}/${sysconfdir}/X11/Xinit.d
+	install ${WORKDIR}/mythfront.sh ${D}/${sysconfdir}/X11/Xinit.d/90mythfront
 }
 
-- 
cgit 1.2.3-korg