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

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

2005/05/01 00:28:49+02:00 uni-frankfurt.de!mickeyl
reenable additional cards >> bluetooth.conf and reorder metadata in bluez-utils-common to a more natural order

2005/04/30 01:51:50+02:00 uni-frankfurt.de!mickeyl
ship hdparm in the base image for Spitz (C3000) which has a 4G MicroDrive built in

2005/04/29 14:08:53+02:00 uni-frankfurt.de!mickeyl
fix opie-mobilemsg pics packaging

BKrev: 42742565AxqwMGKaT8a9onY0NG6bsA

5 files changed, 72 insertions, 2 deletions

diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 2607d12e4a..76035c1889 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -7,10 +7,14 @@ include conf/machine/zaurus-clamshell-2.4.conf
 
 PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa27x"
 
-PIVOTBOOT_EXTRA_DEPENDS += "pivotinit pcmcia-cs"
+PIVOTBOOT_EXTRA_DEPENDS  += "pivotinit pcmcia-cs"
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"
 PIVOTBOOT_EXTRA_RRECOMMENDS += ""
 
+# HdParm
+BOOTSTRAP_EXTRA_DEPENDS  += "hdparm"
+BOOTSTRAP_EXTRA_RDEPENDS += "hdparm"
+
 # BI Module
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxa27x-bi"
 
diff --git a/packages/bluez-utils/bluez-utils-common_2.16.inc b/packages/bluez-utils/bluez-utils-common_2.16.inc
index e69de29bb2..12af639e2b 100644
--- a/packages/bluez-utils/bluez-utils-common_2.16.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.16.inc
@@ -0,0 +1,43 @@
+DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs-${PV} pcmcia-cs"
+RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+	file://base.patch;patch=1 \
+	file://blueboxes.patch;patch=1 \
+	file://hcid.conf \
+	file://bluetooth.default \
+	file://bluetooth.conf "
+
+S = "${WORKDIR}/bluez-utils-${PV}"
+
+EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} \
+                --enable-pcmcia --enable-initscripts"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "bluetooth"
+INITSCRIPT_PARAMS = "defaults 23 19"
+
+do_install_append() {
+	install -d ${D}${base_sbindir} ${D}${base_bindir}/
+	mv ${D}${sbindir}/* ${D}${base_sbindir}/
+	mv ${D}${bindir}/* ${D}${base_bindir}/
+	rmdir ${D}${bindir} ${D}${sbindir}
+	chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
+	chmod 755 ${D}${sysconfdir}/pcmcia/bluetooth
+	install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
+	install -m 0644 ${WORKDIR}/bluetooth.default ${D}${sysconfdir}/default/bluetooth
+	cat ${WORKDIR}/bluetooth.conf >> ${D}${sysconfdir}/pcmcia/bluetooth.conf
+}
+
+CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
+	${sysconfdir}/bluetooth/pin ${sysconfdir}/default/bluetooth"
+
+PACKAGES =+ "${PN}-ciptool ${PN}-bluepin"
+FILES_${PN}-ciptool = "/bin/ciptool"
+FILES_${PN}-bluepin = "/bin/bluepin"
diff --git a/packages/opie-mobilemsg/opie-mobilemsg.inc b/packages/opie-mobilemsg/opie-mobilemsg.inc
index e69de29bb2..4dfaae2cbc 100644
--- a/packages/opie-mobilemsg/opie-mobilemsg.inc
+++ b/packages/opie-mobilemsg/opie-mobilemsg.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "Mobile Messaging"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+APPNAME = "mobilemsg"
+APPTYPE = "binary"
+
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/
+}
diff --git a/packages/opie-mobilemsg/opie-mobilemsg_1.2.0.bb b/packages/opie-mobilemsg/opie-mobilemsg_1.2.0.bb
index e69de29bb2..43e8c67293 100644
--- a/packages/opie-mobilemsg/opie-mobilemsg_1.2.0.bb
+++ b/packages/opie-mobilemsg/opie-mobilemsg_1.2.0.bb
@@ -0,0 +1,7 @@
+include ${PN}.inc
+    
+PR = "r1"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/comm/mobilemsg \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-mobilemsg/opie-mobilemsg_cvs.bb b/packages/opie-mobilemsg/opie-mobilemsg_cvs.bb
index e536117453..5d7133aaf0 100644
--- a/packages/opie-mobilemsg/opie-mobilemsg_cvs.bb
+++ b/packages/opie-mobilemsg/opie-mobilemsg_cvs.bb
@@ -1,7 +1,7 @@
 include ${PN}.inc
     
 PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/comm/mobilemsg \
            ${HANDHELDS_CVS};module=opie/pics \