Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/28 11:18:28+00:00 nexus.co.uk!pb
add airo-cs to HANDHELD_MODULES

2005/02/28 11:17:56+01:00 handhelds.org!CoreDump
Adjust opie-pics_1.1.9.bb to work with the new inline folder

BKrev: 4223809eCh97ctdV-hzxJELAJ8fiIg

diff --git a/conf/machine/handheld-common.conf b/conf/machine/handheld-common.conf
index ead8991..a872062 100644 (file)
--- a/conf/machine/handheld-common.conf
+++ b/conf/machine/handheld-common.conf
@@ -8,7 +8,7 @@ loop \
 vfat ext2 \
 sunrpc nfs \
 btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart \
-pcnet-cs serial-cs \
+pcnet-cs serial-cs airo-cs \
 af_packet \
 ppp-async ppp-deflate ppp-mppe \
 ip-gre ip-tables ipip \

diff --git a/packages/opie-pics/opie-pics_1.1.9.bb b/packages/opie-pics/opie-pics_1.1.9.bb
index 56f4208..3537159 100644 (file)
--- a/packages/opie-pics/opie-pics_1.1.9.bb
+++ b/packages/opie-pics/opie-pics_1.1.9.bb
@@ -3,21 +3,33 @@ SECTION = "opie/base"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};module=opie/pics;tag=${TAG}"
-S = "${WORKDIR}/pics"
+SRC_URI = "${HANDHELDS_CVS};module=opie/pics;tag=${TAG} \
+          ${HANDHELDS_CVS};module=opie/pics-hires;tag=${TAG}"
+
+S = "${WORKDIR}"
+
+SHIP_INLINE_PICS = "yes"
+INLINE_PICS = "pics/inline"
+INLINE_PICS_tosa = "pics-hires/inline"
+INLINE_PICS_c7x0 = "pics-hires/inline"
 
 do_install() {
        install -d ${D}${palmtopdir}/pics/addressbook/
        install -d ${D}${palmtopdir}/pics/datebook/
        install -d ${D}${palmtopdir}/pics/todo/
-       install -m 0664 *.png ${D}${palmtopdir}/pics/
-       install -m 0664 addressbook/*.png ${D}${palmtopdir}/pics/addressbook/
-       install -m 0664 datebook/*.png ${D}${palmtopdir}/pics/datebook/
-       install -m 0664 todo/*.png ${D}${palmtopdir}/pics/todo/ 
-       
+       install -m 0664 pics/*.png ${D}${palmtopdir}/pics/
+       install -m 0664 pics/addressbook/*.png ${D}${palmtopdir}/pics/addressbook/
+       install -m 0664 pics/datebook/*.png ${D}${palmtopdir}/pics/datebook/
+       install -m 0664 pics/todo/*.png ${D}${palmtopdir}/pics/todo/    
+
+       if [ "${SHIP_INLINE_PICS}" == "yes" ]; then
+               install -m 0664 ${INLINE_PICS}/*.png ${D}${palmtopdir}/pics/
+       fi
 }
 
 FILES_${PN} = "${palmtopdir}"
+PACKAGE_ARCH = "${MACHINE}"
+