diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-08 02:40:07 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-08 02:40:07 +0000 |
| commit | 0ff77391ed2b7599e7c99f233c707bb27338a6fd (patch) | |
| tree | 0a4a7b13957ecca8987b60b476facca3b628fa3f /packages | |
| parent | b686d0b3b4db8d5f795a5ed479ca6da008e7cc9b (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/01/08 03:16:08+01:00 uni-frankfurt.de!mickeyl
workaround parsing error in opie-taskbar
2005/01/08 03:01:20+01:00 uni-frankfurt.de!mickeyl
Merge
2005/01/08 02:58:47+01:00 uni-frankfurt.de!mickeyl
more adjustments for an openzaurus image w/ kernel 2.6
2005/01/08 02:57:34+01:00 uni-frankfurt.de!mickeyl
compile scripts/genksyms in kernel builds. this is needed for external modules
2005/01/07 20:54:57+01:00 uni-frankfurt.de!mickeyl
openzaurus-2.6: add defconfig for combined machine
BKrev: 41df4807VWBmhl2Rfn7MdKt1lbGHOw
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux/openzaurus_2.6.10.bb | 3 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar_cvs.bb | 31 |
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}" |