4 files changed, 97 insertions, 12 deletions
diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb
index 2ea9f77225..3079e5e8c7 100644
--- a/packages/linux/linux-openzaurus_2.6.11.bb
+++ b/packages/linux/linux-openzaurus_2.6.11.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r10"
+PR = "r11"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -73,7 +73,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
 
 SRC_URI_append_collie = " ${RPSRC}/jl1/collie_keymap.patch;patch=1 "
 SRC_URI_append_poodle = " ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 \
-                          ${RPSRC}/rpextra_poodle-r0.patch;patch=1 "			  "
+                          ${RPSRC}/rpextra_poodle-r0.patch;patch=1 "
 SRC_URI_append_tosa = " ${DOSRC}/nand-readid-r0.patch;patch=1 \
                         ${DOSRC}/ac97-r1.patch;patch=1 \
                         ${DOSRC}/tosa-detection-r0.patch;patch=1 \
diff --git a/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/mnci-combined.patch b/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/mnci-combined.patch
index fd1ba4db48..8299c9d3dc 100644
--- a/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/mnci-combined.patch
+++ b/packages/linux/mnci-ramses-2.4.21-rmk2-pxa1/mnci-combined.patch
@@ -1783,7 +1783,7 @@
  
 --- /dev/null
 +++ linux-2.4.21/arch/arm/def-configs/ramses
-@@ -0,0 +1,1152 @@
+@@ -0,0 +1,1159 @@
 +#
 +# Automatically generated by make menuconfig: don't edit
 +#
@@ -2910,7 +2910,14 @@
 +#
 +# Bluetooth support
 +#
-+# CONFIG_BLUEZ is not set
++CONFIG_BLUEZ=y
++CONFIG_BLUEZ_L2CAP=m
++CONFIG_BLUEZ_SCO=m
++CONFIG_BLUEZ_RFCOMM=m
++CONFIG_BLUEZ_RFCOMM_TTY=y
++CONFIG_BLUEZ_BNEP=m
++# CONFIG_BLUEZ_BNEP_MC_FILTER is not set
++# CONFIG_BLUEZ_BNEP_PROTO_FILTER is not set
 +
 +#
 +# Kernel hacking
diff --git a/packages/linux/unslung-kernel-2.3r25/defconfig b/packages/linux/unslung-kernel-2.3r25/defconfig
index 5691a8b41b..b55fe0ab6c 100644
--- a/packages/linux/unslung-kernel-2.3r25/defconfig
+++ b/packages/linux/unslung-kernel-2.3r25/defconfig
@@ -390,7 +390,33 @@ CONFIG_IP_PNP_BOOTP=y
 #
 # CONFIG_IP_NF_CONNTRACK is not set
 # CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_IPTABLES is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_MAC=m
+CONFIG_IP_NF_MATCH_PKTTYPE=m
+CONFIG_IP_NF_MATCH_MARK=m
+CONFIG_IP_NF_MATCH_MULTIPORT=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_LENGTH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_TCPMSS=m
+CONFIG_IP_NF_MATCH_UNCLEAN=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_MIRROR=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_DSCP=m
+CONFIG_IP_NF_TARGET_MARK=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
 # CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_COMPAT_IPCHAINS is not set
 # CONFIG_IP_NF_COMPAT_IPFWADM is not set
@@ -403,7 +429,7 @@ CONFIG_IP_PNP_BOOTP=y
 #  
 #
 # CONFIG_IPX is not set
-CONFIG_ATALK=y
+CONFIG_ATALK=m
 
 #
 # Appletalk devices
@@ -428,7 +454,25 @@ CONFIG_IPDDP_DECAP=y
 #
 # QoS and/or fair queueing
 #
-# CONFIG_NET_SCHED is not set
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_CSZ=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_INGRESS=m
+# CONFIG_NET_QOS is not set
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
 # CONFIG_IPSEC is not set
 
 #
@@ -448,8 +492,8 @@ CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-# CONFIG_ETHERTAP is not set
+CONFIG_TUN=m
+CONFIG_ETHERTAP=m
 
 #
 # Ethernet (10 or 100Mbit)
@@ -583,9 +627,11 @@ CONFIG_SCSI=y
 #
 CONFIG_BLK_DEV_SD=y
 CONFIG_SD_EXTRA_DEVS=40
-# CONFIG_CHR_DEV_ST is not set
+CONFIG_CHR_DEV_ST=m
 # CONFIG_CHR_DEV_OSST is not set
-# CONFIG_BLK_DEV_SR is not set
+CONFIG_BLK_DEV_SR=m
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_SR_EXTRA_DEVS=2
 # CONFIG_CHR_DEV_SG is not set
 
 #
@@ -1034,7 +1080,7 @@ CONFIG_USB_PRINTER=m
 #
 # CONFIG_USB_DC2XX is not set
 # CONFIG_USB_MDC800 is not set
-# CONFIG_USB_SCANNER is not set
+CONFIG_USB_SCANNER=m
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_HPUSBSCSI is not set
 
diff --git a/packages/linux/unslung-kernel_2.3r25.bb b/packages/linux/unslung-kernel_2.3r25.bb
index e69de29bb2..95093d1960 100644
--- a/packages/linux/unslung-kernel_2.3r25.bb
+++ b/packages/linux/unslung-kernel_2.3r25.bb
@@ -0,0 +1,32 @@
+SECTION = "kernel"
+
+include nslu2-linksys-kernel_2.4.22.bb
+
+DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device"
+MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>"
+PR = "r14"
+
+KERNEL_SUFFIX = "unslung"
+
+CMDLINE_ROOT = "root=/dev/ram0 rw init=/linuxrc initrd=0x01000000,10M mem=32M@0x00000000"
+
+UNSLUNG_KERNEL_EXTRA_SRC_URI ?=
+
+SRC_URI += "file://limit1gb.patch;patch=1 \
+	    file://gl811e.patch;patch=1 \
+	    file://ext3flash-on-disk1.patch;patch=1 \
+	    file://usbnet.patch;patch=1 \
+	    file://missing-usb-ioctls.patch;patch=1 \
+	    file://anonymiser.patch;patch=1 \
+	    file://ppp_mppe.patch;patch=1 \
+	    ${UNSLUNG_KERNEL_EXTRA_SRC_URI}"
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel-${PV}', '${FILE_DIRNAME}/nslu2-linksys-kernel-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+python () {
+	# Don't build unslung kernel unless we're targeting an nslu2
+	mach = bb.data.getVar("MACHINE", d, 1)
+	dist = bb.data.getVar("DISTRO", d, 1)
+	if mach != 'nslu2' or dist != 'unslung':
+		raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
+}