propagate from branch 'org.openembedded.dev' (head f9a24259d44bc9c52210355b9cd349ff4c9d4ce0)

            to branch 'org.openembedded.nslu2-linux' (head 3e3bbfe05a17136af96f156b3a2be3527d364d14)

10 files changed, 23 insertions, 22 deletions

diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 4df804800b..27ee4fa30e 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -58,6 +58,7 @@ ${PKGDIR}/packages/install/*.bb \
 ${PKGDIR}/packages/iperf/*.bb \
 ${PKGDIR}/packages/ipkg-utils/*.bb \
 ${PKGDIR}/packages/ipkg/*.bb \
+${PKGDIR}/packages/iptables/*.bb \
 ${PKGDIR}/packages/iputils/*.bb \
 ${PKGDIR}/packages/ircp/*.bb \
 ${PKGDIR}/packages/ixp425-eth/*.bb \
diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb
index a536e866e6..ae20210282 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 = "r9"
+PR = "r10"
 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 2e60b1f22a..9c4a61abda 100644
--- a/packages/linux/openslug-kernel-2.6.12.2/defconfig
+++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig
@@ -434,16 +434,18 @@ CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET6_TUNNEL=m
 CONFIG_IPV6_TUNNEL=m
-# CONFIG_NETFILTER is not set
+CONFIG_NETFILTER=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_FILTER=m
 
 #
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
 # CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
+CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 # CONFIG_DECNET is not set
 CONFIG_LLC=m
diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig
index 7e380b08cf..24899fbd47 100644
--- a/packages/linux/unslung-kernel/defconfig
+++ b/packages/linux/unslung-kernel/defconfig
@@ -388,8 +388,8 @@ CONFIG_IP_PNP_BOOTP=y
 #
 #   IP: Netfilter Configuration
 #
-# CONFIG_IP_NF_CONNTRACK is not set
-# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_CONNTRACK=m
+CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_LIMIT=m
 CONFIG_IP_NF_MATCH_MAC=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 604dbd21ba..ac068a7f27 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 = "r2"
+PR = "r3"
 
 KERNEL_SUFFIX = "unslung"
 
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 0a209fce0a..d8526fb64b 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -44,6 +44,7 @@ OPENSLUG_PACKAGES = "\
 	gzip \
 	iperf \
 	ipkg-utils \
+	iptables \
 	joe \
 	jpeg \
 	less \
diff --git a/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
index fc75df7209..b8db38d3db 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
@@ -1,12 +1,11 @@
 SECTION = "base"
-DEPENDS = "slugimage-native unzip-native"
 PACKAGES = ""
 LICENSE = "GPL"
 INHIBIT_DEFAULT_DEPS = "1"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "http://www.you-need-to-get-this-one-yourself.com/NSLU2_V23R63.zip"
-S = "${WORKDIR}"
+SRC_URI = "http://nslu.sf.net/downloads/${PN}-${PV}.tar.bz2"
+S = "${WORKDIR}/${PN}-${PV}"
 
 python () {
 	# Don't build unless we're targeting an nslu2
@@ -15,11 +14,9 @@ python () {
 }
 
 do_compile () {
-	slugimage -u -i NSLU2_V23R63.bin -k vmlinuz -b RedBoot -s SysConf -r ramdisk.ext2.gz -t Trailer
 	install -d ${STAGING_LIBDIR}/nslu2-binaries
-	install -m 0755 RedBoot ${STAGING_LIBDIR}/nslu2-binaries/
-	install -m 0755 SysConf ${STAGING_LIBDIR}/nslu2-binaries/
-	install -m 0755 vmlinuz ${STAGING_LIBDIR}/nslu2-binaries/
-	install -m 0755 ramdisk.ext2.gz ${STAGING_LIBDIR}/nslu2-binaries/
-	install -m 0755 Trailer ${STAGING_LIBDIR}/nslu2-binaries/
+	install -m 0755 ${S}/RedBoot ${STAGING_LIBDIR}/nslu2-binaries/
+	install -m 0755 ${S}/SysConf ${STAGING_LIBDIR}/nslu2-binaries/
+	install -m 0755 ${S}/vmlinuz ${STAGING_LIBDIR}/nslu2-binaries/
+	install -m 0755 ${S}/Trailer ${STAGING_LIBDIR}/nslu2-binaries/
 }
diff --git a/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb
index 8e3c1cf160..2955f19ad0 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Linksys NSLU2 Stock Firmware Libraries."
 PACKAGE_ARCH = "nslu2"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "http://www.you-need-to-create-this-yourself.com/nslu2-linksys-ramdisk-2.3r63.tar.bz2"
+SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63.tar.bz2"
 
 S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r63"
 
diff --git a/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb
index dccac753f9..0fa7d69d54 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Linksys NSLU2 Stock Firmware Ramdisk."
 PACKAGE_ARCH = "nslu2"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "http://www.you-need-to-create-this-yourself.com/nslu2-linksys-ramdisk-2.3r63.tar.bz2"
+SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63.tar.bz2"
 
 do_install () {
 	( cd ${S} ; tar cvf - . ) | ( cd ${D} ; tar xvf - )
diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
index 41de542c31..398d934a52 100644
--- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
+++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
@@ -1,10 +1,10 @@
 SECTION = "base"
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "nslu2-linksys-libs"
 
-SRC_URI = "http://www.you-need-to-create-this-yourself.com/nslu2-linksys-ramdisk-2.3r63.tar.bz2 \
+SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63.tar.bz2 \
 	   file://README \
 	   file://NOTES \
 	   file://unsling \