From 356be2fa84e6424f70d6e407b43be7b028bbafa7 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 14 Nov 2004 15:55:23 +0000 Subject: Merge bk://openembedded@openembedded.bkbits.net/packages-devel into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/11/14 15:52:16+00:00 nexus.co.uk!pb bump PR on openzaurus-pxa for recent shepherd/collie defconfig changes 2004/11/14 15:51:40+00:00 nexus.co.uk!pb update corgi defconfig to same level as shepherd BKrev: 41977feb9fBRy3Go0FizqEbRUW74aA --- .../defconfig-corgi | 74 +++++++++++++++++----- ...nzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe | 2 +- 2 files changed, 60 insertions(+), 16 deletions(-) diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi index ecdf1ae094..5f285bfd1b 100644 --- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-corgi @@ -353,7 +353,7 @@ CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_NBD is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_BLK_DEV_INITRD=y +# CONFIG_BLK_DEV_INITRD is not set # # Multi-device support (RAID and LVM) @@ -385,17 +385,47 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPGRE=m # CONFIG_ARPD is not set # CONFIG_INET_ECN is not set -# CONFIG_SYN_COOKIES is not set +CONFIG_SYN_COOKIES=y # # IP: Netfilter Configuration # # CONFIG_IP_NF_CONNTRACK is not set # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set -# CONFIG_IP_NF_COMPAT_IPCHAINS is not set -# CONFIG_IP_NF_COMPAT_IPFWADM is not set -# CONFIG_IPV6 is not set +CONFIG_IP_NF_IPTABLES=y +# CONFIG_IP_NF_MATCH_LIMIT is not set +# CONFIG_IP_NF_MATCH_MAC is not set +# CONFIG_IP_NF_MATCH_MARK is not set +# CONFIG_IP_NF_MATCH_MULTIPORT is not set +# CONFIG_IP_NF_MATCH_TOS is not set +# CONFIG_IP_NF_MATCH_AH_ESP is not set +# CONFIG_IP_NF_MATCH_LENGTH is not set +# CONFIG_IP_NF_MATCH_TTL is not set +# CONFIG_IP_NF_MATCH_TCPMSS is not set +# CONFIG_IP_NF_MATCH_UNCLEAN is not set +# CONFIG_IP_NF_MATCH_OWNER is not set +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=y +# CONFIG_IP_NF_TARGET_MIRROR is not set +# CONFIG_IP_NF_MANGLE is not set +CONFIG_IP_NF_TARGET_LOG=y +# CONFIG_IP_NF_TARGET_ULOG is not set +# CONFIG_IP_NF_TARGET_TCPMSS is not set +CONFIG_IPV6=y + +# +# IPv6: Netfilter Configuration +# +# CONFIG_IP6_NF_QUEUE is not set +CONFIG_IP6_NF_IPTABLES=y +# CONFIG_IP6_NF_MATCH_LIMIT is not set +# CONFIG_IP6_NF_MATCH_MAC is not set +# CONFIG_IP6_NF_MATCH_MULTIPORT is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_MARK is not set +CONFIG_IP6_NF_FILTER=y +CONFIG_IP6_NF_TARGET_LOG=y +# CONFIG_IP6_NF_MANGLE is not set # CONFIG_KHTTPD is not set # CONFIG_ATM is not set # CONFIG_VLAN_8021Q is not set @@ -420,7 +450,21 @@ CONFIG_NET_IPGRE=m # QoS and/or fair queueing # # CONFIG_NET_SCHED is not set -# CONFIG_IPSEC is not set +CONFIG_IPSEC=m + +# +# IPSec options (Openswan) +# +CONFIG_IPSEC_IPIP=y +CONFIG_IPSEC_AH=y +# CONFIG_IPSEC_AUTH_HMAC_MD5 is not set +CONFIG_IPSEC_AUTH_HMAC_SHA1=y +CONFIG_IPSEC_ESP=y +CONFIG_IPSEC_ENC_3DES=y +# CONFIG_IPSEC_ENC_AES is not set +# CONFIG_IPSEC_ALG is not set +CONFIG_IPSEC_IPCOMP=y +CONFIG_IPSEC_DEBUG=y # # Network device support @@ -1212,12 +1256,12 @@ CONFIG_USBD_PXA_BUS=m # # Bluetooth support # -CONFIG_BLUEZ=m -CONFIG_BLUEZ_L2CAP=m -CONFIG_BLUEZ_SCO=m -CONFIG_BLUEZ_RFCOMM=m +CONFIG_BLUEZ=y +CONFIG_BLUEZ_L2CAP=y +CONFIG_BLUEZ_SCO=y +CONFIG_BLUEZ_RFCOMM=y CONFIG_BLUEZ_RFCOMM_TTY=y -CONFIG_BLUEZ_BNEP=m +CONFIG_BLUEZ_BNEP=y CONFIG_BLUEZ_BNEP_MC_FILTER=y CONFIG_BLUEZ_BNEP_PROTO_FILTER=y # CONFIG_BLUEZ_HIDP is not set @@ -1227,7 +1271,7 @@ CONFIG_BLUEZ_BNEP_PROTO_FILTER=y # CONFIG_BLUEZ_HCIUSB=m CONFIG_BLUEZ_HCIUSB_SCO=y -CONFIG_BLUEZ_HCIUART=m +CONFIG_BLUEZ_HCIUART=y CONFIG_BLUEZ_HCIUART_H4=y CONFIG_BLUEZ_HCIUART_BCSP=y CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y @@ -1246,9 +1290,9 @@ CONFIG_FRAME_POINTER=y # CONFIG_DEBUG_COREDUMP_SIGNAL is not set # CONFIG_DEBUG_INFO is not set # CONFIG_NO_PGT_CACHE is not set -# CONFIG_DEBUG_KERNEL is not set +CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SLAB is not set -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_WAITQ is not set # CONFIG_DEBUG_BUGVERBOSE is not set diff --git a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe index b06757c60b..7b6d3b1b45 100644 --- a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe +++ b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe @@ -5,7 +5,7 @@ KV = "2.4.18" RMKV = "7" PXAV = "3" SHARPV = "20031107" -PR = "r12" +PR = "r13" DESCRIPTION = "Linux kernel for OpenZaurus PXA processor based devices." MAINTAINER = "Michael 'Mickey' Lauer " FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}" -- cgit v1.2.3