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

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

2005/01/05 11:29:18+01:00 (none)!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into lieve.(none):/data/build/oe/clean-tree/openembedded

2005/01/05 11:28:41+01:00 (none)!koen
fix familiar feed locations in gpe and opie images

2005/01/05 10:10:42+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/05 10:10:13+00:00 nexus.co.uk!pb
disable keyspan driver in handhelds-sa

2005/01/05 10:50:25+01:00 uni-frankfurt.de!mickeyl
upgrade stable and unstable hostap packages

BKrev: 41dbc409jAubmnbWK45wv6cSQDO2ig

18 files changed, 14 insertions, 73 deletions

diff --git a/packages/hostap/hostap-modules-0.2.5/Makefile.patch b/packages/hostap/hostap-modules-0.2.6/Makefile.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/hostap/hostap-modules-0.2.5/Makefile.patch
+++ b/packages/hostap/hostap-modules-0.2.6/Makefile.patch
diff --git a/packages/hostap/hostap-modules-0.2.5/mtx_compat.diff b/packages/hostap/hostap-modules-0.2.6/mtx_compat.diff
index e69de29bb2..e69de29bb2 100644
--- a/packages/hostap/hostap-modules-0.2.5/mtx_compat.diff
+++ b/packages/hostap/hostap-modules-0.2.6/mtx_compat.diff
diff --git a/packages/hostap/hostap-modules-0.2.5/mtx_hostap_deferred_irq.diff b/packages/hostap/hostap-modules-0.2.6/mtx_hostap_deferred_irq.diff
index e69de29bb2..e69de29bb2 100644
--- a/packages/hostap/hostap-modules-0.2.5/mtx_hostap_deferred_irq.diff
+++ b/packages/hostap/hostap-modules-0.2.6/mtx_hostap_deferred_irq.diff
diff --git a/packages/hostap/hostap-modules-0.3.2/Makefile.patch b/packages/hostap/hostap-modules-0.3.3/Makefile.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/hostap/hostap-modules-0.3.2/Makefile.patch
+++ b/packages/hostap/hostap-modules-0.3.3/Makefile.patch
diff --git a/packages/hostap/hostap-modules-0.3.2/mtx_compat.diff b/packages/hostap/hostap-modules-0.3.3/mtx_compat.diff
index e69de29bb2..e69de29bb2 100644
--- a/packages/hostap/hostap-modules-0.3.2/mtx_compat.diff
+++ b/packages/hostap/hostap-modules-0.3.3/mtx_compat.diff
diff --git a/packages/hostap/hostap-modules-0.3.2/mtx_hostap_deferred_irq.diff b/packages/hostap/hostap-modules-0.3.3/mtx_hostap_deferred_irq.diff
index e69de29bb2..e69de29bb2 100644
--- a/packages/hostap/hostap-modules-0.3.2/mtx_hostap_deferred_irq.diff
+++ b/packages/hostap/hostap-modules-0.3.3/mtx_hostap_deferred_irq.diff
diff --git a/packages/hostap/hostap-modules_0.2.5.bb b/packages/hostap/hostap-modules_0.2.5.bb
deleted file mode 100644
index c1eee9f1fb..0000000000
--- a/packages/hostap/hostap-modules_0.2.5.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset"
-HOMEPAGE = "http://hostap.epitest.fi"
-SECTION = "kernel/modules"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "GPL"
-PR = "r6"
-
-SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
-           file://hostap_cs.conf \
-	   file://Makefile.patch;patch=1"
-SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
-	file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
-
-S = "${WORKDIR}/hostap-driver-${PV}"
-
-inherit module
-
-EXTRA_OEMAKE = "EXTRA_CFLAGS='-DPRISM2_NON_VOLATILE_DOWNLOAD'"
-MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'"
-NET_MODULES = "hostap.o hostap_pci.o hostap_crypt_ccmp.o hostap_crypt_tkip.o hostap_crypt_wep.o"
-
-do_install() {
-	install -d ${D}/lib/modules/${KERNEL_VERSION}/net \
-		   ${D}/lib/modules/${KERNEL_VERSION}/pcmcia \
-        	   ${D}/${sysconfdir}/pcmcia
-	for i in ${NET_MODULES}
-	do
-		install -m 0644 driver/modules/$i ${D}/lib/modules/${KERNEL_VERSION}/net/
-	done
-	install -m 0644 driver/modules/hostap_cs.o ${D}/lib/modules/${KERNEL_VERSION}/pcmcia/
-	install -m 0644 driver/etc/hostap_cs.conf ${D}/${sysconfdir}/pcmcia/hostap_cs.conf
-	cat ${WORKDIR}/hostap_cs.conf >>${D}/${sysconfdir}/pcmcia/hostap_cs.conf
-
-	if [ "${MACHINE}" = "mtx-1" ]; then
-		install -d ${D}/etc/modutils
-		echo "hostap_pci" > ${D}/etc/modutils/hostap
-	fi
-}
-
-pkg_postinst_hostap-modules-pci() {
-#!/bin/sh
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-update-modules || true
-}
-
-pkg_postrm_hostap-modules-pci() {
-#!/bin/sh
-update-modules || true
-}
-
-PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules"
-FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/"
-FILES_hostap-modules-pci = "/etc/modutils /lib/modules/${KERNEL_VERSION}/net/hostap_pci.o"
-FILES_hostap-modules = "/lib/modules/"
-RDEPENDS_hostap-modules-cs = "hostap-modules"
-RDEPENDS_hostap-modules-pci = "hostap-modules"
diff --git a/packages/hostap/hostap-modules_0.3.2.bb b/packages/hostap/hostap-modules_0.2.6.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/hostap/hostap-modules_0.3.2.bb
+++ b/packages/hostap/hostap-modules_0.2.6.bb
diff --git a/packages/hostap/hostap-utils_0.2.4.bb b/packages/hostap/hostap-modules_0.3.3.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/hostap/hostap-utils_0.2.4.bb
+++ b/packages/hostap/hostap-modules_0.3.3.bb
diff --git a/packages/hostap/hostap-wpa-supplicant-nossl_0.2.5.bb b/packages/hostap/hostap-utils_0.2.6.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/hostap/hostap-wpa-supplicant-nossl_0.2.5.bb
+++ b/packages/hostap/hostap-utils_0.2.6.bb
diff --git a/packages/hostap/hostap-wpa-supplicant-ssl_0.2.5.bb b/packages/hostap/hostap-wpa-supplicant-nossl_0.2.6.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/hostap/hostap-wpa-supplicant-ssl_0.2.5.bb
+++ b/packages/hostap/hostap-wpa-supplicant-nossl_0.2.6.bb
diff --git a/packages/hostap/hostap-wpa-supplicant_0.2.5.inc b/packages/hostap/hostap-wpa-supplicant-ssl_0.2.6.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/hostap/hostap-wpa-supplicant_0.2.5.inc
+++ b/packages/hostap/hostap-wpa-supplicant-ssl_0.2.6.bb
diff --git a/packages/qte/qte-for-opie_2.3.9-snapshot-20050101.bb b/packages/hostap/hostap-wpa-supplicant_0.2.6.inc
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-for-opie_2.3.9-snapshot-20050101.bb
+++ b/packages/hostap/hostap-wpa-supplicant_0.2.6.inc
diff --git a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600
index 63bdb12ab2..ba8d20522f 100644
--- a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600
+++ b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600
@@ -1374,16 +1374,16 @@ CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_IPAQ=m
 CONFIG_USB_SERIAL_IR=m
 CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
 CONFIG_USB_SERIAL_MCT_U232=m
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_PL2303=m
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
index 290f74c45c..1258e0b6e6 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
@@ -2,7 +2,7 @@ SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
 MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index a48533dffe..ec4d225b78 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -2,8 +2,8 @@ FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${D
                                 gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
 FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
                                 gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
-FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \
-                                gpe##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/gpe"
+FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/v${DISTRO_VERSION}/feed/x11 \
+                                gpe##http://familiar.handhelds.org/releases/v${DISTRO_VERSION}/feed/gpe"
 
 PR = "r9"
 
diff --git a/packages/meta/opie-image.bb b/packages/meta/opie-image.bb
index 1a7f51216d..caa27ac4e5 100644
--- a/packages/meta/opie-image.bb
+++ b/packages/meta/opie-image.bb
@@ -3,7 +3,7 @@ export IMAGE_LINGUAS = ""
 
 FEED_URIS_append_openzaurus = " opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie"
 FEED_URIS_append_opensimpad = " opie##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/opie"
-FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
+FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/v${DISTRO_VERSION}/feed/opie"
 
 PR = "r10"
 
diff --git a/packages/qte/qte-for-opie_2.3.9-snapshot-20050103.bb b/packages/qte/qte-for-opie_2.3.9-snapshot-20050103.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qte/qte-for-opie_2.3.9-snapshot-20050103.bb