Merge bk://openembedded@openembedded.bkbits.net/packages-devel

into home.hrw.one.pl:/home/hrw/zaurus/oe/packages

2004/11/15 22:11:22+01:00 hrw.one.pl!hrw
collie kernel:
updated bluetooth patch
added IPSEC (openswan) patch

BKrev: 41991b93faSOdJtXUKOx3GvckOoJ-g

4 files changed, 170 insertions, 19 deletions

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index bad8f4b978..a698fc2c62 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,13 +1,14 @@
+CodeWhacker@rant-central.com
+CoreDump@handhelds.org
+CoreDump@mhcln01.hentges.local
+RP@tim.rpsys.net
 a0868066@lta0868066.ent.ti.com
 br1@null.(none)
 buildroot@mithis.com
 chris@chrislaptop.(none)
 chriz@i74-copy.(none)
-CodeWhacker@rant-central.com
-CoreDump@handhelds.org
-CoreDump@mhcln01.hentges.local
-cwiiis@chrislaptop.(none)
 cwiiis@chris.(none)
+cwiiis@chrislaptop.(none)
 cwiiis@cwiiisdesktop.(none)
 dereky@builder.(none)
 emte@t.(none)
@@ -18,8 +19,8 @@ fontenot@chilli.conversagent.com
 gbritton@doomcom.org
 ggilbert@dreamland.(none)
 ggilbert@fastframe.brooks.edu
-ggilbert@olddog.home.treke.net
 ggilbert@olddog.(none)
+ggilbert@olddog.home.treke.net
 ggilbert@olddog.treke.net
 ggilbert@tinman.treke.net
 ggilbert@treke.ath.cx
@@ -32,8 +33,8 @@ jgrant@desknote.thegrantclan.org
 joshin@styx.techsurgeons.com
 kebert@geralt.doma
 kergoth@beast.local
-kergoth@direwolf.itg.ti.com
 kergoth@direwolf.(none)
+kergoth@direwolf.itg.ti.com
 kergoth@direwolf.ppp.ti.com
 kergoth@handhelds.org
 kergoth@hyperion.(none)
@@ -48,26 +49,26 @@ marcinj@marcinj.local
 mhentges@mhcln01.hentges.local
 mickey@allanon.vanille.de
 mickey@gandalf.tm.informatik.uni-frankfurt.de
+mickey@merlin.vanille.de
+mickey@r2d2.tm.informatik.uni-frankfurt.de
 mickeyl@allanon.vanille.de
 mickeyl@gandalf.tm.informatik.uni-frankfurt.de
 mickeyl@r2d2.tm.informatik.uni-frankfurt.de
-mickey@merlin.vanille.de
-mickey@r2d2.tm.informatik.uni-frankfurt.de
 mithro@mithis.com
 nslu2-linux.adm@bkbits.net
 nslu2-linux.adm@hostme.bitkeeper.com
 oe@sugarcube.dyndns.org
 openembedded.adm@bkbits.net
+p.osiczko@tetrapyloctomy.org
 pablo@kosmos.(none)
 pb@dixie.nexus.co.uk
-pb_@gandalf.tm.informatik.uni-frankfurt.de
-pb@stealth.nexus.co.uk
 pb@stealth.(none)
-pb@workhouse.nexus.co.uk
+pb@stealth.nexus.co.uk
 pb@workhouse.(none)
+pb@workhouse.nexus.co.uk
+pb_@gandalf.tm.informatik.uni-frankfurt.de
 peteru@black.lan
 phillim@linux.local
-p.osiczko@tetrapyloctomy.org
 ral@alwin.at.home
 red@quarm.(none)
 reenoo@sugarcube.dyndns.org
@@ -75,7 +76,6 @@ rjt@bob.cambridgebroadband.com
 rjt@flotta.cambridgebroadband.com
 root@tim.rpsys.net
 roy@rant-central.com
-RP@tim.rpsys.net
 rwhitby@home.(none)
 schurig@mnz66.mn-logistik.de
 schurig@schurig.homelinux.net
diff --git a/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/bluetooth-2.4.18-mh15.patch b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/bluetooth-2.4.18-mh15.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/bluetooth-2.4.18-mh15.patch
diff --git a/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie
index cf7efbfc89..be3ad3e099 100644
--- a/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie
+++ b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie
@@ -1,5 +1,5 @@
 #
-# Automatically generated by make menuconfig: don't edit
+# Automatically generated make config: don't edit
 #
 CONFIG_ARM=y
 # CONFIG_EISA is not set
@@ -46,6 +46,10 @@ CONFIG_ARCH_SA1100=y
 #
 # Archimedes/A5000 Implementations
 #
+
+#
+# Archimedes/A5000 Implementations (select only ONE)
+#
 # CONFIG_ARCH_ARC is not set
 # CONFIG_ARCH_A5K is not set
 
@@ -142,6 +146,10 @@ CONFIG_ARCH_SHARP_SL=y
 # CONFIG_FOOTBRIDGE_ADDIN is not set
 CONFIG_CPU_32=y
 # CONFIG_CPU_26 is not set
+
+#
+# Processor Type
+#
 # CONFIG_CPU_32v3 is not set
 CONFIG_CPU_32v4=y
 # CONFIG_CPU_ARM610 is not set
@@ -183,6 +191,10 @@ CONFIG_NET=y
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
+
+#
+# At least one math emulation must be selected
+#
 CONFIG_FPE_NWFPE=y
 # CONFIG_FPE_FASTFPE is not set
 CONFIG_KCORE_ELF=y
@@ -222,6 +234,10 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_CACKO_HYBRID_PARTITIONS is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
 # CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
@@ -279,6 +295,10 @@ CONFIG_MTDRAM_ABS_POS=C1000000
 # CONFIG_MTD_MTDRAM is not set
 # CONFIG_MTD_MTDRAM_SHARP_SL is not set
 # CONFIG_MTD_BLKMTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
 # CONFIG_MTD_DOC1000 is not set
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
@@ -398,6 +418,10 @@ CONFIG_IP6_NF_TARGET_MARK=m
 # CONFIG_KHTTPD is not set
 # CONFIG_ATM is not set
 # CONFIG_VLAN_8021Q is not set
+
+#
+#  
+#
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
 # CONFIG_DECNET is not set
@@ -415,6 +439,21 @@ CONFIG_IP6_NF_TARGET_MARK=m
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED 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
@@ -486,6 +525,10 @@ CONFIG_NET_RADIO=y
 # CONFIG_AIRONET4500_PROC is not set
 # CONFIG_AIRO is not set
 # CONFIG_HERMES is not set
+
+#
+# Wireless Pcmcia cards support
+#
 # CONFIG_PCMCIA_HERMES is not set
 # CONFIG_AIRO_CS is not set
 CONFIG_NET_WIRELESS=y
@@ -532,10 +575,18 @@ CONFIG_NET_PCMCIA_RADIO=y
 # IrDA (infrared) support
 #
 CONFIG_IRDA=y
+
+#
+# IrDA protocols
+#
 # CONFIG_IRLAN is not set
 CONFIG_IRNET=m
 CONFIG_IRCOMM=y
 # CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
 # CONFIG_IRDA_CACHE_LAST_LSAP is not set
 CONFIG_IRDA_FAST_RR=y
 # CONFIG_IRDA_DEBUG is not set
@@ -543,9 +594,21 @@ CONFIG_IRDA_FAST_RR=y
 #
 # Infrared-port device drivers
 #
+
+#
+# SIR device drivers
+#
 CONFIG_IRTTY_SIR=y
 CONFIG_IRPORT_SIR=y
+
+#
+# Dongle support
+#
 # CONFIG_DONGLE is not set
+
+#
+# FIR device drivers
+#
 # CONFIG_USB_IRDA is not set
 # CONFIG_NSC_FIR is not set
 # CONFIG_WINBOND_FIR is not set
@@ -564,6 +627,10 @@ CONFIG_IDE=y
 # IDE, ATA and ATAPI Block devices
 #
 CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
 # CONFIG_BLK_DEV_HD_IDE is not set
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_IDEDISK=y
@@ -582,6 +649,10 @@ CONFIG_BLK_DEV_IDECS=y
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
+
+#
+# IDE chipset support/bugfixes
+#
 # CONFIG_BLK_DEV_CMD640 is not set
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 # CONFIG_BLK_DEV_ISAPNP is not set
@@ -620,6 +691,7 @@ CONFIG_BLK_DEV_IDECS=y
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_UINPUT is not set
 
 #
 # Character devices
@@ -676,6 +748,10 @@ CONFIG_UNIX98_PTY_COUNT=32
 # CONFIG_L3 is not set
 # CONFIG_L3_ALGOBIT is not set
 # CONFIG_L3_BIT_SA1100_GPIO is not set
+
+#
+# Other L3 adapters
+#
 # CONFIG_L3_SA1111 is not set
 # CONFIG_BIT_SA1100_GPIO is not set
 
@@ -689,6 +765,14 @@ CONFIG_UNIX98_PTY_COUNT=32
 # Joysticks
 #
 # CONFIG_INPUT_GAMEPORT is not set
+
+#
+# Input core support is needed for gameports
+#
+
+#
+# Input core support is needed for joysticks
+#
 # CONFIG_QIC02_TAPE is not set
 
 #
@@ -967,14 +1051,34 @@ CONFIG_SOUND_COLLIE_TC35143=m
 #
 CONFIG_USB=m
 # CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
 # CONFIG_USB_DEVICEFS is not set
 # CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_LONG_TIMEOUT is not set
+
+#
+# USB Controllers
+#
 # CONFIG_USB_UHCI is not set
 # CONFIG_USB_UHCI_ALT is not set
 # CONFIG_USB_OHCI is not set
 # CONFIG_USB_OHCI_SA1111 is not set
+
+#
+# USB Device Class drivers
+#
 # CONFIG_USB_AUDIO is not set
+
+#
+#   USB Bluetooth can only be used with disabled Bluetooth subsystem
+#
+
+#
+#   SCSI support is needed for USB Storage
+#
 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
@@ -986,16 +1090,44 @@ CONFIG_USB=m
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
 # CONFIG_USB_ACM is not set
 # CONFIG_USB_PRINTER is not set
+
+#
+# USB Human Interface Devices (HID)
+#
+
+#
+#   Input core support is needed for USB HID
+#
+
+#
+# USB Imaging devices
+#
 # CONFIG_USB_DC2XX is not set
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_SCANNER is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+
+#
+#   Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network adaptors
+#
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_CATC is not set
 # CONFIG_USB_CDCETHER is not set
 # CONFIG_USB_USBNET is not set
+
+#
+# USB port drivers
+#
 # CONFIG_USB_USS720 is not set
 
 #
@@ -1028,6 +1160,10 @@ CONFIG_USB=m
 # CONFIG_USB_SERIAL_CYBERJACK is not set
 # CONFIG_USB_SERIAL_XIRCOM is not set
 # CONFIG_USB_SERIAL_OMNINET is not set
+
+#
+# USB Miscellaneous drivers
+#
 # CONFIG_USB_RIO500 is not set
 
 #
@@ -1042,9 +1178,17 @@ CONFIG_USBD_USE_SERIAL_NUMBER=y
 CONFIG_USBD_SERIAL_NUMBER_STR="A01234"
 CONFIG_USBD_SELFPOWERED=y
 CONFIG_USBD_MONITOR=m
+
+#
+# 
+#
 CONFIG_USBD_PROCFS=y
 
 #
+# USB Device functions
+#
+
+#
 # Network Function
 #
 CONFIG_USBD_NET=m
@@ -1079,6 +1223,10 @@ CONFIG_USBD_SERIAL_OUT_PKTSIZE=64
 # CONFIG_USBD_SERIAL_SAFE is not set
 
 #
+# USB Device bus interfaces
+#
+
+#
 # USB Device Bus Interface Support
 #
 CONFIG_USBD_SA1100_BUS=m
@@ -1098,6 +1246,7 @@ CONFIG_BLUEZ_RFCOMM_TTY=y
 CONFIG_BLUEZ_BNEP=m
 CONFIG_BLUEZ_BNEP_MC_FILTER=y
 CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
+# CONFIG_BLUEZ_HIDP is not set
 
 #
 # Bluetooth device drivers
diff --git a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
index ddc071ae88..58d5e3e5aa 100644
--- a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
+++ b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
@@ -5,14 +5,14 @@ KV = "2.4.18"
 RMKV = "7"
 PXAV = "3"
 SHARPV = "20030509"
-PR = "r9"
+PR = "r10"
 DESCRIPTION = "Linux kernel for OpenZaurus StrongArm processor based devices."
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
 
 SRC_URI = "http://aurach.ewu.edu/ield_software/ch5/ROM3.10_stuff/linux-sl5500-${SHARPV}-rom3_10.tar.bz2 \
            file://cacko.patch;patch=1 \
            file://battery.patch;patch=1 \
-           file://bluetooth-patch-2.4.18-mh9.diff;patch=1 \
+           file://bluetooth-2.4.18-mh15.patch;patch=1 \
            file://iw_handlers.w13-5.diff;patch=1 \
            file://iw_handlers.w14-5.diff;patch=1 \
            file://iw240_we15-6.diff;patch=1 \
@@ -23,10 +23,12 @@ SRC_URI = "http://aurach.ewu.edu/ield_software/ch5/ROM3.10_stuff/linux-sl5500-${
            file://mkdep.patch;patch=1 \
            file://disable-pcmcia-probe.patch;patch=1 \
            file://linux-2.4.18-list_move.patch;patch=1 \
-           file://defconfig-${MACHINE} \
-           file://module_licence.patch;patch=1 \
+	   http://www.openswan.org/download/openswan-2.2.0-kernel-2.4-klips.patch.gz;patch=1 \
 	   file://1764-1.patch;patch=1 \
-           file://sound-2.4.18r2.patch;patch=1  "
+           file://module_licence.patch;patch=1 \
+           file://defconfig-${MACHINE} \
+           file://sound-2.4.18r2.patch;patch=1 \
+	   "
 
 # apply this when we have a patch that allows building with gcc 3.x:
 # SRC_URI_append = file://gcc-3.3.patch;patch=1