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

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

2005/01/17 20:11:51+01:00 (none)!br1
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/closed/build/unstable/openembedded

2005/01/17 20:11:11+01:00 (none)!br1
hostap-modules: update mtx deferred irq patch for new driver versions

2005/01/17 18:44:43+00:00 cambridgebroadband.com!rjt
Merge oe-devel@oe-devel.bkbits.net:openembedded
into flotta.cambridgebroadband.com:/development/openembedded/openembedded

2005/01/17 18:22:19+00:00 cambridgebroadband.com!rjt
patch ipkg to remove c99isms to allwo compilation on gcc<3.0

2005/01/17 18:20:42+00:00 cambridgebroadband.com!rjt
update sdcontrol for new mount position

2005/01/17 18:19:32+00:00 cambridgebroadband.com!rjt
use newer gpe-package in oz-3.5.3

2005/01/14 17:57:37+00:00 cambridgebroadband.com!rjt
make bluez-utils depend on the correct version s of bluez-libs

BKrev: 41ec149dhPOtom4czqqCF84k5CsW4A

9 files changed, 201 insertions, 5 deletions

diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index 17d0431698..3701704268 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -100,7 +100,7 @@ PREFERRED_VERSION_xmonobut = "0.4"
 PREFERRED_VERSION_gpe-edit = "0.28"
 PREFERRED_VERSION_gpe-gallery = "0.95"
 PREFERRED_VERSION_gpe-calculator = "0.2"
-PREFERRED_VERSION_gpe-package = "0.0.12"
+PREFERRED_VERSION_gpe-package = "0.2"
 PREFERRED_VERSION_gpe-soundbite = "1.0.5"
 PREFERRED_VERSION_gpe-terminal = "1.1"
 PREFERRED_VERSION_gpe-watch = "0.10"
diff --git a/packages/bluez-utils/bluez-utils-common_2.11.inc b/packages/bluez-utils/bluez-utils-common_2.11.inc
index 6cebe42730..c980bb7725 100644
--- a/packages/bluez-utils/bluez-utils-common_2.11.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.11.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
 SECTION = "libs"
 PRIORITY = "optional"
-DEPENDS = "bluez-libs pcmcia-cs"
+DEPENDS = "bluez-libs-2.11 pcmcia-cs"
 RPROVIDES = "bluez-pan bluez-sdp bluez-utils"
 LICENSE = "GPL"
 
diff --git a/packages/bluez-utils/bluez-utils-common_2.13.inc b/packages/bluez-utils/bluez-utils-common_2.13.inc
index e69de29bb2..04f127b7f5 100644
--- a/packages/bluez-utils/bluez-utils-common_2.13.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.13.inc
@@ -0,0 +1,32 @@
+DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs-2.13 pcmcia-cs"
+RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils"
+LICENSE = "GPL"
+PACKAGES =+ "${PN}-ciptool ${PN}-bluepin"
+
+FILES_${PN}-ciptool = "/bin/ciptool"
+FILES_${PN}-bluepin = "/bin/bluepin"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+	file://hcid.conf"
+S = "${WORKDIR}/bluez-utils-${PV}"
+
+EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
+
+do_install_append() {
+	install -d ${D}/sbin ${D}/bin/
+	mv ${D}${sbindir}/* ${D}/sbin/
+	mv ${D}${bindir}/* ${D}/bin/
+	rmdir ${D}${bindir} ${D}${sbindir}
+	chmod u+s ${D}/sbin/hciattach ${D}/sbin/hciconfig
+	chmod 755 ${D}/etc/pcmcia/bluetooth
+	install -m 0644 ${WORKDIR}/hcid.conf ${D}/etc/bluetooth/
+}
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "bluetooth"
+INITSCRIPT_PARAMS = "defaults 23 19"
+
diff --git a/packages/hostap/hostap-modules-0.2.6/mtx_hostap_deferred_irq.diff b/packages/hostap/hostap-modules-0.2.6/mtx_hostap_deferred_irq.diff
index e69de29bb2..e979b72d93 100644
--- a/packages/hostap/hostap-modules-0.2.6/mtx_hostap_deferred_irq.diff
+++ b/packages/hostap/hostap-modules-0.2.6/mtx_hostap_deferred_irq.diff
@@ -0,0 +1,81 @@
+--- driver/modules/hostap_pci.c.orig	2004-11-30 06:41:48.000000000 +0100
++++ driver/modules/hostap_pci.c	2005-01-17 19:47:33.710400496 +0100
+@@ -50,6 +50,13 @@
+ };
+ 
+ 
++#define DEFERRED_IRQ_INITIALIZATION
++
++#ifdef DEFERRED_IRQ_INITIALIZATION
++struct net_device *devb[MAX_PARM_DEVICES];
++#endif
++
++
+ #ifdef PRISM2_IO_DEBUG
+ 
+ static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v)
+@@ -280,6 +287,10 @@
+ 
+ 	pci_set_drvdata(pdev, dev);
+ 
++#ifdef DEFERRED_IRQ_INITIALIZATION
++	printk("%s: deferred initialization of IRQs\n", dev_info);
++	devb[cards_found-1] = dev;
++#else
+ 	if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name,
+ 			dev)) {
+ 		printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
+@@ -295,7 +306,7 @@
+ 
+ 	printk(KERN_INFO "%s: Intersil Prism2.5 PCI: "
+ 	       "mem=0x%lx, irq=%d\n", dev->name, phymem, dev->irq);
+-
++#endif
+ 	return hostap_hw_ready(dev);
+ 
+  fail:
+@@ -399,18 +410,43 @@
+ };
+ 
+ 
++#ifdef DEFERRED_IRQ_INITIALIZATION
++static void deferred_init(int num_devices)
++{
++      int n;
++      for (n=0; n<num_devices && n<MAX_PARM_DEVICES; n++)
++      {
++              if (request_irq(devb[n]->irq, prism2_interrupt, SA_SHIRQ, devb[n]->name,
++                              devb[n])) {
++                      printk(KERN_WARNING "%s: request_irq failed\n", devb[n]->name);
++              }
++              if (prism2_hw_config(devb[n], 1)) {
++                      printk(KERN_DEBUG "%s: hardware initialization failed\n", devb[n]->name)
++;
++              }
++              printk(KERN_INFO "%s: Intersil Prism2.5 PCI: irq=%d\n", devb[n]->name, devb[n]->
++irq);
++      }
++}
++#endif
++
+ static int __init init_prism2_pci(void)
+ {
+ 	printk(KERN_INFO "%s: %s\n", dev_info, version);
+ 
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10))
+-	if (pci_register_driver(&prism2_pci_drv_id) <= 0) {
++	int n;
++	if ((n=pci_register_driver(&prism2_pci_drv_id)) <= 0) {
+ 		printk("hostap_pci: No devices found, driver not "
+ 		       "installed.\n");
+ 		pci_unregister_driver(&prism2_pci_drv_id);
+ 		return -ENODEV;
+ 	}
+ 
++#ifdef DEFERRED_IRQ_INITIALIZATION
++	deferred_init(n);
++#endif
++
+ 	return 0;
+ #else
+ 	return pci_register_driver(&prism2_pci_drv_id);
diff --git a/packages/hostap/hostap-modules-0.3.3/mtx_hostap_deferred_irq.diff b/packages/hostap/hostap-modules-0.3.3/mtx_hostap_deferred_irq.diff
index e69de29bb2..e979b72d93 100644
--- a/packages/hostap/hostap-modules-0.3.3/mtx_hostap_deferred_irq.diff
+++ b/packages/hostap/hostap-modules-0.3.3/mtx_hostap_deferred_irq.diff
@@ -0,0 +1,81 @@
+--- driver/modules/hostap_pci.c.orig	2004-11-30 06:41:48.000000000 +0100
++++ driver/modules/hostap_pci.c	2005-01-17 19:47:33.710400496 +0100
+@@ -50,6 +50,13 @@
+ };
+ 
+ 
++#define DEFERRED_IRQ_INITIALIZATION
++
++#ifdef DEFERRED_IRQ_INITIALIZATION
++struct net_device *devb[MAX_PARM_DEVICES];
++#endif
++
++
+ #ifdef PRISM2_IO_DEBUG
+ 
+ static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v)
+@@ -280,6 +287,10 @@
+ 
+ 	pci_set_drvdata(pdev, dev);
+ 
++#ifdef DEFERRED_IRQ_INITIALIZATION
++	printk("%s: deferred initialization of IRQs\n", dev_info);
++	devb[cards_found-1] = dev;
++#else
+ 	if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name,
+ 			dev)) {
+ 		printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
+@@ -295,7 +306,7 @@
+ 
+ 	printk(KERN_INFO "%s: Intersil Prism2.5 PCI: "
+ 	       "mem=0x%lx, irq=%d\n", dev->name, phymem, dev->irq);
+-
++#endif
+ 	return hostap_hw_ready(dev);
+ 
+  fail:
+@@ -399,18 +410,43 @@
+ };
+ 
+ 
++#ifdef DEFERRED_IRQ_INITIALIZATION
++static void deferred_init(int num_devices)
++{
++      int n;
++      for (n=0; n<num_devices && n<MAX_PARM_DEVICES; n++)
++      {
++              if (request_irq(devb[n]->irq, prism2_interrupt, SA_SHIRQ, devb[n]->name,
++                              devb[n])) {
++                      printk(KERN_WARNING "%s: request_irq failed\n", devb[n]->name);
++              }
++              if (prism2_hw_config(devb[n], 1)) {
++                      printk(KERN_DEBUG "%s: hardware initialization failed\n", devb[n]->name)
++;
++              }
++              printk(KERN_INFO "%s: Intersil Prism2.5 PCI: irq=%d\n", devb[n]->name, devb[n]->
++irq);
++      }
++}
++#endif
++
+ static int __init init_prism2_pci(void)
+ {
+ 	printk(KERN_INFO "%s: %s\n", dev_info, version);
+ 
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10))
+-	if (pci_register_driver(&prism2_pci_drv_id) <= 0) {
++	int n;
++	if ((n=pci_register_driver(&prism2_pci_drv_id)) <= 0) {
+ 		printk("hostap_pci: No devices found, driver not "
+ 		       "installed.\n");
+ 		pci_unregister_driver(&prism2_pci_drv_id);
+ 		return -ENODEV;
+ 	}
+ 
++#ifdef DEFERRED_IRQ_INITIALIZATION
++	deferred_init(n);
++#endif
++
+ 	return 0;
+ #else
+ 	return pci_register_driver(&prism2_pci_drv_id);
diff --git a/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch b/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch
diff --git a/packages/ipkg/ipkg_0.99.135.bb b/packages/ipkg/ipkg_0.99.135.bb
index 396e33e101..7b682aad8c 100644
--- a/packages/ipkg/ipkg_0.99.135.bb
+++ b/packages/ipkg/ipkg_0.99.135.bb
@@ -13,7 +13,9 @@ AUTO_LIBNAME_PKGS = "libipkg"
 SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
 	file://depends.patch;patch=1 \
 	file://uninclude-replace.patch;patch=1 \
-	file://terse.patch;patch=1"
+	file://terse.patch;patch=1 \
+	file://remove-c99isms.patch;patch=1"
+
 S = "${WORKDIR}/ipkg/C"
 
 inherit autotools pkgconfig
diff --git a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol b/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol
index 7b92507e86..7b84360d7a 100644
--- a/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol
+++ b/packages/sharp-binary-only/sharp-sdmmc-support-2.4.18-rmk7-pxa3-embedix/sdcontrol
@@ -9,7 +9,7 @@
 
 ACTION=$1
 DEVICE=/dev/mmcda1
-MOUNT_POINT=/mnt/card
+MOUNT_POINT=/media/card
 SMB_MOUNT=/home/samba/SD_Card
 INSTALL_DIR=Documents/Install_Files
 
diff --git a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
index b5a93a3c00..71edc0bcda 100644
--- a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
+++ b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "CLOSED"
 RDEPENDS = "kernel (${KERNEL_VERSION})"
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "http://www.openzaurus.org/mirror/sd-modules-2.4.18-rmk7-pxa3-embedix.tar.bz2 \
 	   file://sd \