merge of 'a3a6b606f8696b6f5cbfbee341c9dd0a91033a49'

     and 'cc41b5c73fe6e7b86bf9d57e9eacc0a32e449782'

6 files changed, 99 insertions, 4 deletions

diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc
index b16c3d481d..1c9d004d0f 100644
--- a/packages/linux/ixp4xx-kernel.inc
+++ b/packages/linux/ixp4xx-kernel.inc
@@ -211,6 +211,12 @@ do_configure_prepend() {
 
 }
 
+
+# Kernel module dependencies
+
+RDEPENDS_kernel-module-zd1211rw += "zd1211-firmware"
+
+
 # MACHID and LE handling
 #
 # This mach_fixup function adds the required prefix to the image to
diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb
index 94a08509a7..a2599d83b6 100644
--- a/packages/linux/ixp4xx-kernel_2.6.20.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.20.bb
@@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.20"
 # the changes in SVN between revisions include changes in the
 # patches applied to the kernel, rather than simply defconfig
 # changes
-PR = "r2.${IXP4XX_KERNEL_SVN_REV}"
+PR = "r3.${IXP4XX_KERNEL_SVN_REV}"
 
 require ixp4xx-kernel.inc
 require ixp4xx-kernel-svnpatch.inc
diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb
index 2775a744d3..1e6d3e2506 100644
--- a/packages/linux/linux-ezx_2.6.16.13.bb
+++ b/packages/linux/linux-ezx_2.6.16.13.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.openezx.org"
 LICENSE = "GPL"
 DEPENDS += "quilt-native"
 EZX = "ezx9"
-PR = "${EZX}-r1"
+PR = "${EZX}-r2"
 
 inherit kernel
 
@@ -20,7 +20,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            \
 	   file://logo_linux_clut224.ppm \
            file://defconfig-a780 \
-           file://defconfig-e680"
+           file://defconfig-e680 \
+           file://wyrm-ts.diff;patch=1"
 S = "${WORKDIR}/linux-2.6.16"
 
 ##############################################################
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index d5b1a5f9b7..814530ed20 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r21"
+PR = "r22"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -170,6 +170,7 @@ SLUGOS_PACKAGES = "\
 	wget \
 	wireless-tools \
 	wpa-supplicant \
+	zd1211-firmware \
 	zip \
 	zlib \
 	"
diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb
new file mode 100644
index 0000000000..690cb48ffd
--- /dev/null
+++ b/packages/tasks/task-mokogateway.bb
@@ -0,0 +1,71 @@
+DESCRIPTION = "MokoGateway: Tasks for a companion server for the OpenMoko Linux Distribution"
+ALLOW_EMPTY = "1"
+PACKAGE_ARCH = "all"
+LICENSE = "MIT"
+PROVIDES = "task-mokogateway-everything"
+
+PACKAGES = "\
+	task-mokogateway-everything \
+	${BASE_PACKAGES} \
+"
+
+BASE_PACKAGES = "\
+	task-mokogateway-base \
+	task-mokogateway-usbnet \
+	task-mokogateway-bluetooth \
+	task-mokogateway-wifi \
+"
+
+RDEPENDS_task-mokogateway-everything = "${BASE_PACKAGES}"
+
+DESCRIPTION_task-mokogateway-base = "MokoGateway: Base"
+RDEPENDS_task-mokogateway-base = "\
+	task-base \
+"
+
+DESCRIPTION_task-mokogateway-usbnet = "MokoGateway: USB Networking"
+RDEPENDS_task-mokogateway-usbnet = "\
+"
+RRECOMMENDS_task-mokogateway-usbnet = "\
+	kernel-module-usbnet \
+	kernel-module-cdc-ether \
+"
+
+DESCRIPTION_task-mokogateway-bluetooth = "MokoGateway: Bluetooth"
+RDEPENDS_task-mokogateway-bluetooth = "\
+	bluez-utils \
+"
+RRECOMMENDS_task-mokogateway-bluetooth = "\
+	kernel-module-bluetooth \
+	kernel-module-l2cap \
+	kernel-module-rfcomm \
+	kernel-module-hci-vhci \
+	kernel-module-bnep \
+	kernel-module-hidp \
+	kernel-module-hci-uart \
+	kernel-module-sco \
+	${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-hci-usb", "",d)} \
+	${@base_contains("COMBINED_FEATURES", "pcmcia",  "kernel-module-bluetooth3c-cs", "",d)} \
+	${@base_contains("COMBINED_FEATURES", "pcmcia",  "kernel-module-bluecard-cs", "",d)} \
+	${@base_contains("COMBINED_FEATURES", "pcmcia",  "kernel-module-bluetoothuart-cs", "",d)} \
+	${@base_contains("COMBINED_FEATURES", "pcmcia",  "kernel-module-dtl1-cs", "",d)} \
+"
+
+DESCRIPTION_task-mokogateway-wifi = "MokoGateway: WiFi"
+RDEPENDS_task-mokogateway-wifi = "\
+	wireless-tools \
+	${@base_contains("COMBINED_FEATURES", "pcmcia", "hostap-utils", "",d)} \
+	${@base_contains("COMBINED_FEATURES", "pci", "hostap-utils", "",d)} \
+	wpa-supplicant \
+"
+RRECOMMENDS_task-mokogateway-wifi = "\
+	kernel-module-ieee80211-crypt \
+	kernel-module-ieee80211-crypt-ccmp \
+	kernel-module-ieee80211-crypt-tkip \
+	kernel-module-ieee80211-crypt-wep \
+	kernel-module-arc4 \
+	kernel-module-michael-mic \
+	kernel-module-aes \
+	${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-zd1211rw", "",d)} \
+"
+
diff --git a/packages/zd1211/zd1211-firmware_1.3.bb b/packages/zd1211/zd1211-firmware_1.3.bb
new file mode 100644
index 0000000000..e6f006971d
--- /dev/null
+++ b/packages/zd1211/zd1211-firmware_1.3.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "ZyDAS ZD1211 Firmware"
+HOMEPAGE = "http://zd1211.ath.cx/"
+SECTION = "net"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/zd1211/zd1211-firmware1.3.tar.bz2"
+
+S = "${WORKDIR}/${PN}"
+
+do_install() {
+	install -d -m 0755 ${D}/lib/firmware/zd1211
+	install -m 0644 ${S}/zd1211* ${D}/lib/firmware/zd1211/
+}
+
+FILES_${PN} = "/lib/firmware"