diff options
| author | Oyvind Repvik <nail@nslu2-linux.org> | 2005-08-15 15:47:27 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-15 15:47:27 +0000 |
| commit | f18535aba8a6a5860113f11a31b01e105e81bae1 (patch) | |
| tree | c410c05aa6d12abb1b17c617a8ff3dd24143e0fe /packages/linux | |
| parent | 9b93c3fb1203e3474b0ad23c56476f494d8da402 (diff) | |
| parent | b1e9c93f0f8ac9edc927c35be4f8c567ec4cfe87 (diff) | |
propagate from branch 'org.openembedded.dev' (head f9a24259d44bc9c52210355b9cd349ff4c9d4ce0)
to branch 'org.openembedded.nslu2-linux' (head 3e3bbfe05a17136af96f156b3a2be3527d364d14)
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/nslu2-kernel_2.6.12.2.bb | 2 | ||||
| -rw-r--r-- | packages/linux/openslug-kernel-2.6.12.2/defconfig | 6 | ||||
| -rw-r--r-- | packages/linux/unslung-kernel/defconfig | 4 | ||||
| -rw-r--r-- | packages/linux/unslung-kernel_2.4.22.l2.3r29.bb | 2 |
4 files changed, 8 insertions, 6 deletions
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" |