summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/linux/openzaurus_2.6.10.bb3
-rw-r--r--packages/opie-taskbar/opie-taskbar_cvs.bb31
2 files changed, 4 insertions, 30 deletions
diff --git a/packages/linux/openzaurus_2.6.10.bb b/packages/linux/openzaurus_2.6.10.bb
index 683798bf48..a5065eb86b 100644
--- a/packages/linux/openzaurus_2.6.10.bb
+++ b/packages/linux/openzaurus_2.6.10.bb
@@ -46,7 +46,8 @@ http://www.rpsys.net/openzaurus/${KV}/collie_scoop-r0.patch;patch=1 \
http://www.rpsys.net/openzaurus/${KV}/collie_scoop_pcmcia-r0.patch;patch=1 \
file://defconfig-husky \
file://defconfig-collie \
-file://defconfig-poodle "
+file://defconfig-poodle \
+file://defconfig-openzaurus-pxa-2.6"
SRC_URI_append_husky = "http://www.rpsys.net/openzaurus/${KV}/corgi_keymap-r1.patch;patch=1"
SRC_URI_append_openzaurus-pxa-2.6 = "http://www.rpsys.net/openzaurus/${KV}/corgi_keymap-r1.patch;patch=1"
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index dce47d384a..5488c7b148 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
MAINTAINER = "Team Opie <opie@handhelds.org>"
DEPENDS = "opie-libqrsync"
PV = "1.1.8+cvs-${CVSDATE}"
-PR = "r0"
+PR = "r1"
APPNAME = "qpe"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
@@ -97,42 +97,15 @@ do_install() {
install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie
install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/
+
if [ -s ${WORKDIR}/locale.conf ]; then
install -m 0644 ${WORKDIR}/locale.conf ${D}/${palmtopdir}/etc/skel/
fi
-}
-# These two should be installed only on devices with keyboard
-do_install_append_collie () {
- install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
- install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
-}
-do_install_append_poodle () {
- install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
- install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
-}
-do_install_append_corgi () {
- install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
- install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
-}
-do_install_append_shepherd () {
- install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
- install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
-}
-do_install_append_husky () {
- install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
- install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
-}
-do_install_append_tosa () {
- install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
- install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
-}
-do_install_append_openzaurus-pxa-2.6 () {
install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
}
-
FILES_opie-taskbar_append = " /etc ${palmtopdir}/apps ${palmtopdir}/pics"
PACKAGE_ARCH = "${MACHINE_ARCH}"