summaryrefslogtreecommitdiff
path: root/packages/opie-taskbar
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-02-22 12:53:55 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-02-22 12:53:55 +0000
commit4f857db335de6935077d4866c51dd9d6851fed1d (patch)
tree1c923be071d1a56bd79f467fd75ac77959a493a3 /packages/opie-taskbar
parentb32403d57d7e0473dd336e76f95c7b26f113cf26 (diff)
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
Diffstat (limited to 'packages/opie-taskbar')
-rw-r--r--packages/opie-taskbar/opie-taskbar_1.1.9.bb10
-rw-r--r--packages/opie-taskbar/opie-taskbar_cvs.bb10
2 files changed, 10 insertions, 10 deletions
diff --git a/packages/opie-taskbar/opie-taskbar_1.1.9.bb b/packages/opie-taskbar/opie-taskbar_1.1.9.bb
index 768503685e..2574cd0ef7 100644
--- a/packages/opie-taskbar/opie-taskbar_1.1.9.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.1.9.bb
@@ -67,8 +67,8 @@ do_install() {
install -d ${D}/${palmtopdir}/pics/launcher
install -d ${D}/${palmtopdir}/pics/logo
install -d ${D}/${palmtopdir}/pics/RoH/star/
- install -d ${D}/etc/init.d
- install -d ${D}/etc/profile.d
+ install -d ${D}/${sysconfdir}/init.d
+ install -d ${D}/${sysconfdir}/profile.d
install -d ${D}/${palmtopdir}/etc/colors
install -d ${D}/${palmtopdir}/etc/skel
@@ -76,7 +76,7 @@ do_install() {
install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}/${palmtopdir}/bin/
install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}/${palmtopdir}/apps/Settings/
install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}/${palmtopdir}/apps/Settings/
- install -m 0644 ${WORKDIR}/opie_defaults ${D}/etc/profile.d/
+ install -m 0644 ${WORKDIR}/opie_defaults ${D}/${sysconfdir}/profile.d/
for p in ${PICS}
do
@@ -89,9 +89,9 @@ do_install() {
install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}/${palmtopdir}/pics/RoH/star/
install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/${palmtopdir}/etc/colors/
- install -m 0644 ${WORKDIR}/etc/mime.types ${D}/etc/
+ install -m 0644 ${WORKDIR}/etc/mime.types ${D}/${sysconfdir}/
- install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie
+ install -m 0755 ${WORKDIR}/opie ${D}/${sysconfdir}/init.d/opie
install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/
install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 286abdb459..113787b460 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -65,8 +65,8 @@ do_install() {
install -d ${D}/${palmtopdir}/pics/launcher
install -d ${D}/${palmtopdir}/pics/logo
install -d ${D}/${palmtopdir}/pics/RoH/star/
- install -d ${D}/etc/init.d
- install -d ${D}/etc/profile.d
+ install -d ${D}/${sysconfdir}/init.d
+ install -d ${D}/${sysconfdir}/profile.d
install -d ${D}/${palmtopdir}/etc/colors
install -d ${D}/${palmtopdir}/etc/skel
@@ -74,7 +74,7 @@ do_install() {
install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}/${palmtopdir}/bin/
install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}/${palmtopdir}/apps/Settings/
install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}/${palmtopdir}/apps/Settings/
- install -m 0644 ${WORKDIR}/opie_defaults ${D}/etc/profile.d/
+ install -m 0644 ${WORKDIR}/opie_defaults ${D}/${sysconfdir}/profile.d/
for p in ${PICS}
do
@@ -87,9 +87,9 @@ do_install() {
install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}/${palmtopdir}/pics/RoH/star/
install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/${palmtopdir}/etc/colors/
- install -m 0644 ${WORKDIR}/etc/mime.types ${D}/etc/
+ install -m 0644 ${WORKDIR}/etc/mime.types ${D}/${sysconfdir}/
- install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie
+ install -m 0755 ${WORKDIR}/opie ${D}/${sysconfdir}/init.d/opie
install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/
if [ -s ${WORKDIR}/locale.conf ]; then