propagate from branch 'org.openembedded.nslu2-linux' (head 73e2401761de62395b421d1c71a5b7643732885f)

            to branch 'org.openembedded.dev' (head a83285fb76b637597037d487bba21d8314a04bec)

5 files changed, 130 insertions, 25 deletions

diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb
index ae20210282..f15fc998a3 100644
--- a/packages/linux/nslu2-kernel_2.6.12.2.bb
+++ b/packages/linux/nslu2-kernel_2.6.12.2.bb
@@ -1,5 +1,5 @@
 # Kernel for NSLU2
-PR = "r10"
+PR = "r11"
 include nslu2-kernel.inc
 
 # N2K_EXTRA_PATCHES - list of patches to apply (can include
diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig
index 9c4a61abda..15f2fecdb1 100644
--- a/packages/linux/openslug-kernel-2.6.12.2/defconfig
+++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig
@@ -401,11 +401,13 @@ CONFIG_SCSI_QLA2XXX=y
 #
 # CONFIG_I2O is not set
 
+
 #
 # Networking support
 #
 CONFIG_NET=y
 
+
 #
 # Networking options
 #
@@ -427,6 +429,11 @@ CONFIG_INET_IPCOMP=m
 CONFIG_INET_TUNNEL=m
 CONFIG_IP_TCPDIAG=m
 CONFIG_IP_TCPDIAG_IPV6=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set
 CONFIG_INET6_AH=m
@@ -435,10 +442,83 @@ CONFIG_INET6_IPCOMP=m
 CONFIG_INET6_TUNNEL=m
 CONFIG_IPV6_TUNNEL=m
 CONFIG_NETFILTER=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=m
+# CONFIG_IP_NF_CT_ACCT is not set
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+CONFIG_IP_NF_CT_PROTO_SCTP=m
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_TFTP=m
+CONFIG_IP_NF_AMANDA=m
+CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_IPRANGE=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_HELPER=m
+CONFIG_IP_NF_MATCH_STATE=m
+CONFIG_IP_NF_MATCH_CONNTRACK=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_PHYSDEV=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_REALM=m
+# CONFIG_IP_NF_MATCH_SCTP is not set
+CONFIG_IP_NF_MATCH_COMMENT=m
+CONFIG_IP_NF_MATCH_HASHLIMIT=m
 CONFIG_IP_NF_FILTER=m
+# CONFIG_IP_NF_TARGET_REJECT is not set
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_IP_NF_NAT_SNMP_BASIC=m
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_TFTP=m
+CONFIG_IP_NF_NAT_AMANDA=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_CLASSIFY=m
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+
+#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
 
 #
 # SCTP Configuration (EXPERIMENTAL)
@@ -489,6 +569,7 @@ CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
 # CONFIG_BT_HIDP is not set
 
+
 #
 # Bluetooth device drivers
 #
diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig
index 24899fbd47..01d6ab7e4e 100644
--- a/packages/linux/unslung-kernel/defconfig
+++ b/packages/linux/unslung-kernel/defconfig
@@ -389,6 +389,17 @@ CONFIG_IP_PNP_BOOTP=y
 #   IP: Netfilter Configuration
 #
 CONFIG_IP_NF_CONNTRACK=m
+# CONFIG_IP_NF_FTP is not set
+# CONFIG_IP_NF_H323 is not set
+# CONFIG_IP_NF_AMANDA is not set
+# CONFIG_IP_NF_TFTP is not set
+# CONFIG_IP_NF_IRC is not set
+# CONFIG_IP_NF_CT_PROTO_GRE is not set
+# CONFIG_IP_NF_PPTP is not set
+# CONFIG_IP_NF_MATCH_HELPER is not set
+# CONFIG_IP_NF_MATCH_STATE is not set
+# CONFIG_IP_NF_MATCH_CONNTRACK is not set
+# CONFIG_IP_NF_NAT is not set
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_LIMIT=m
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb
index ac068a7f27..c02b45505e 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb
@@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb
 
 DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device"
 MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>"
-PR = "r3"
+PR = "r4"
 
 KERNEL_SUFFIX = "unslung"
 
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
index 2a61d61307..0a7a8f3dd2 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -1,15 +1,30 @@
 SECTION = "kernel"
+
+include nslu2-linksys-kernel_2.4.22.bb
+
 DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device"
-LICENSE = "GPL"
 MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>"
-PR = "r1"
-
-S = "${WORKDIR}/linux-2.4.22"
+PR = "r2"
 
-KERNEL_IMAGETYPE = "zImage"
 KERNEL_SUFFIX = "unslung"
 
-DEPENDS += "nslu2-linksys-firmware"
+CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc 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 \
+	    file://nfs-blocksize.patch;patch=1 \
+	    file://pl2303.patch;patch=1 \
+	    file://linux-kernel-R25_to_R29.patch;patch=1 \
+	    ${UNSLUNG_KERNEL_EXTRA_SRC_URI}"
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel', '${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
@@ -18,25 +33,23 @@ python () {
 		raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
 }
 
-do_deploy() {
-	cp ${STAGING_LIBDIR}/nslu2-binaries/vmlinuz vmlinuz
-	dd if=vmlinuz bs=1 count=11732 > vmlinuh
-	dd if=vmlinuz bs=1 skip=11732 count=975109 | gzip -dc > vmlinux
-	dd if=vmlinuz bs=1 skip=986841 > vmlinut
-	cat vmlinux | sed \
+DEPENDS += "nslu2-linksys-firmware"
+
+do_deploy_append() {
+	cp ${STAGING_LIBDIR}/nslu2-binaries/vmlinuz ${WORKDIR}/vmlinuz
+	dd if=${WORKDIR}/vmlinuz bs=1 count=11732 > ${WORKDIR}/vmlinuh
+	dd if=${WORKDIR}/vmlinuz bs=1 skip=11732 count=975109 | gzip -dc > ${WORKDIR}/vmlinux
+	dd if=${WORKDIR}/vmlinuz bs=1 skip=986841 > ${WORKDIR}/vmlinut
+	cat ${WORKDIR}/vmlinux | sed \
 		-e 's/ram0/slug/' \
 		-e 's/\x01\x31\x2c\xff/\x00\x1e\x84\x7f/' \
-			| gzip -9 -c > vmlinux.gz
+			| gzip -9 -c > ${WORKDIR}/vmlinux.gz
 #		-e 's/flash_sda\x00/hdd_sda\x00\x00\x00/' \
 # 		-e 's/flash_\x00/hdd_\x00\x00\x00/' \
 #		-e 's/flash_sd%c\x00/hdd_sd%c\x00\x00\x00/' \
-	cat vmlinuh vmlinux.gz vmlinut > vmlinuz
-#	dd if=/dev/zero of=padding bs=1 count=9
-#	cat vmlinuh vmlinux.gz padding vmlinut > vmlinuz
+	cat ${WORKDIR}/vmlinuh ${WORKDIR}/vmlinux.gz ${WORKDIR}/vmlinut > ${WORKDIR}/vmlinuz
+#	dd if=/dev/zero of=${WORKDIR}/padding bs=1 count=9
+#	cat ${WORKDIR}/vmlinuh ${WORKDIR}/vmlinux.gz ${WORKDIR}/padding ${WORKDIR}/vmlinut > ${WORKDIR}/vmlinuz
         install -d ${DEPLOY_DIR}/images
-        install -m 0644 vmlinuz ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
+        install -m 0644 ${WORKDIR}/vmlinuz ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
 }
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile