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

into hyperion.kergoth.com:/home/kergoth/code/packages

2004/11/18 21:44:45+01:00 uni-frankfurt.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/11/18 19:48:14+01:00 (none)!br1
mtx-1 kernel: build from linux-mips CVS and patches

BKrev: 419d1c761JXn7YEUre4U-rr4StwIBg

17 files changed, 47 insertions, 120 deletions

diff --git a/linux/linux-mtx-1-2.4.24/01-mtd-2004-01-27.diff b/linux/linux-mtx-1-2.4.24/01-mtd-2004-01-27.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/linux-mtx-1-2.4.24/01-mtd-2004-01-27.diff
diff --git a/linux/linux-mtx-1-2.4.24/02-mtd-mtx-1-map.diff b/linux/linux-mtx-1-2.4.24/02-mtd-mtx-1-map.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/linux-mtx-1-2.4.24/02-mtd-mtx-1-map.diff
diff --git a/linux/linux-mtx-1-2.4.24/03-mtd-erase-compiler-bug.diff b/linux/linux-mtx-1-2.4.24/03-mtd-erase-compiler-bug.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/linux-mtx-1-2.4.24/03-mtd-erase-compiler-bug.diff
diff --git a/linux/linux-mtx-1-2.4.24/04-zboot-2.4.24.patch b/linux/linux-mtx-1-2.4.24/04-zboot-2.4.24.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/linux-mtx-1-2.4.24/04-zboot-2.4.24.patch
diff --git a/linux/linux-mtx-1-2.4.24/05-zboot-cflags.diff b/linux/linux-mtx-1-2.4.24/05-zboot-cflags.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/linux-mtx-1-2.4.24/05-zboot-cflags.diff
diff --git a/linux/linux-mtx-1-2.4.24/06-zboot-mtx.diff b/linux/linux-mtx-1-2.4.24/06-zboot-mtx.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/linux-mtx-1-2.4.24/06-zboot-mtx.diff
diff --git a/linux/linux-mtx-1-2.4.24/07-zimage-flash-bin.patch b/linux/linux-mtx-1-2.4.24/07-zimage-flash-bin.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/linux-mtx-1-2.4.24/07-zimage-flash-bin.patch
diff --git a/linux/linux-mtx-1-2.4.24/08-usb-nonpci-2.4.24.patch b/linux/linux-mtx-1-2.4.24/08-usb-nonpci-2.4.24.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/linux-mtx-1-2.4.24/08-usb-nonpci-2.4.24.patch
diff --git a/linux/linux-mtx-1-2.4.24/09-iw-max-spy-32.diff b/linux/linux-mtx-1-2.4.24/09-iw-max-spy-32.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/linux-mtx-1-2.4.24/09-iw-max-spy-32.diff
diff --git a/linux/linux-mtx-1-2.4.24/10-mtx-pci-slots.diff b/linux/linux-mtx-1-2.4.24/10-mtx-pci-slots.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/linux-mtx-1-2.4.24/10-mtx-pci-slots.diff
diff --git a/linux/linux-mtx-1-2.4.24/11-mtx-extraversion.diff b/linux/linux-mtx-1-2.4.24/11-mtx-extraversion.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/linux-mtx-1-2.4.24/11-mtx-extraversion.diff
diff --git a/linux/linux-mtx-1-2.4.24/12-openswan-2.2.0-nat-t.diff b/linux/linux-mtx-1-2.4.24/12-openswan-2.2.0-nat-t.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/linux-mtx-1-2.4.24/12-openswan-2.2.0-nat-t.diff
diff --git a/linux/linux-mtx-1-2.4.24/13-openswan-2.2.0.patch b/linux/linux-mtx-1-2.4.24/13-openswan-2.2.0.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/linux-mtx-1-2.4.24/13-openswan-2.2.0.patch
diff --git a/linux/linux-mtx-1-2.4.24/14-au1000-eth-vlan.diff b/linux/linux-mtx-1-2.4.24/14-au1000-eth-vlan.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/linux-mtx-1-2.4.24/14-au1000-eth-vlan.diff
diff --git a/linux/linux-mtx-1-2.4.24/15-mtd-proc-partition-rw.diff b/linux/linux-mtx-1-2.4.24/15-mtd-proc-partition-rw.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/linux-mtx-1-2.4.24/15-mtd-proc-partition-rw.diff
diff --git a/linux/linux-mtx-1-2.4.24/defconfig-mtx-1 b/linux/linux-mtx-1-2.4.24/defconfig-mtx-1
index 84ab6de3a8..711356c1a9 100644
--- a/linux/linux-mtx-1-2.4.24/defconfig-mtx-1
+++ b/linux/linux-mtx-1-2.4.24/defconfig-mtx-1
@@ -80,7 +80,7 @@ CONFIG_NEW_TIME_C=y
 CONFIG_PCI=y
 CONFIG_NEW_PCI=y
 CONFIG_PCI_AUTO=y
-# CONFIG_NONCOHERENT_IO is not set
+CONFIG_NONCOHERENT_IO=y
 # CONFIG_MIPS_AU1000 is not set
 
 #
@@ -322,7 +322,6 @@ CONFIG_IP_NF_MATCH_STATE=m
 CONFIG_IP_NF_MATCH_CONNTRACK=m
 CONFIG_IP_NF_MATCH_UNCLEAN=m
 CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_PHYSDEV=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_MIRROR=m
@@ -396,25 +395,6 @@ CONFIG_VLAN_8021Q=m
 # CONFIG_DEV_APPLETALK is not set
 # CONFIG_DECNET is not set
 CONFIG_BRIDGE=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_IPF=m
-CONFIG_BRIDGE_EBT_ARPF=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_VLANF=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_MARKF=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
 # CONFIG_LLC is not set
@@ -455,6 +435,7 @@ CONFIG_NET_CLS_POLICE=y
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
+CONFIG_IPSEC_NAT_TRAVERSAL=y
 CONFIG_IPSEC=m
 CONFIG_IPSEC_IPIP=y
 CONFIG_IPSEC_AH=y
@@ -462,8 +443,13 @@ CONFIG_IPSEC_AUTH_HMAC_MD5=y
 CONFIG_IPSEC_AUTH_HMAC_SHA1=y
 CONFIG_IPSEC_ESP=y
 CONFIG_IPSEC_ENC_3DES=y
+CONFIG_IPSEC_ENC_AES=y
+CONFIG_IPSEC_ALG=y
+CONFIG_IPSEC_ALG_AES=m
+CONFIG_IPSEC_ALG_CRYPTOAPI=m
+CONFIG_IPSEC_ALG_NON_LIBRE=y
 CONFIG_IPSEC_IPCOMP=y
-# CONFIG_IPSEC_DEBUG is not set
+CONFIG_IPSEC_DEBUG=y
 
 #
 # Telephony Support
@@ -482,8 +468,8 @@ CONFIG_IPSEC_IPCOMP=y
 #
 # SCSI support
 #
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI=m
+CONFIG_BLK_DEV_SD=m
 CONFIG_SD_EXTRA_DEVS=40
 # CONFIG_CHR_DEV_ST is not set
 # CONFIG_CHR_DEV_OSST is not set
@@ -625,7 +611,7 @@ CONFIG_MIPS_AU1X00_ENET=y
 # CONFIG_PLIP is not set
 CONFIG_PPP=m
 CONFIG_PPP_MULTILINK=y
-# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_FILTER=y
 CONFIG_PPP_ASYNC=m
 CONFIG_PPP_SYNC_TTY=m
 CONFIG_PPP_DEFLATE=m
@@ -660,7 +646,7 @@ CONFIG_NET_WIRELESS=y
 # CONFIG_TR is not set
 # CONFIG_NET_FC is not set
 # CONFIG_RCPCI is not set
-# CONFIG_SHAPER is not set
+CONFIG_SHAPER=m
 
 #
 # Wan interfaces
@@ -926,11 +912,13 @@ CONFIG_VIDEO_DEV=m
 #
 # Video For Linux
 #
-# CONFIG_VIDEO_PROC_FS is not set
+CONFIG_VIDEO_PROC_FS=y
 # CONFIG_I2C_PARPORT is not set
 # CONFIG_VIDEO_BT848 is not set
 # CONFIG_VIDEO_PMS is not set
-# CONFIG_VIDEO_CPIA is not set
+CONFIG_VIDEO_CPIA=m
+# CONFIG_VIDEO_CPIA_PP is not set
+CONFIG_VIDEO_CPIA_USB=m
 # CONFIG_VIDEO_SAA5249 is not set
 # CONFIG_TUNER_3036 is not set
 # CONFIG_VIDEO_STRADIS is not set
@@ -1016,28 +1004,28 @@ CONFIG_SOUND_OSS=m
 #
 CONFIG_USB=y
 # CONFIG_USB_DEBUG is not set
-# CONFIG_USB_DEVICEFS is not set
+CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_EHCI_HCD is not set
 # CONFIG_USB_UHCI is not set
 # CONFIG_USB_UHCI_ALT is not set
 CONFIG_USB_OHCI=y
 CONFIG_USB_NON_PCI_OHCI=y
-# CONFIG_USB_AUDIO is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_MIDI is not set
-CONFIG_USB_STORAGE=y
+CONFIG_USB_AUDIO=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_MIDI=m
+CONFIG_USB_STORAGE=m
 CONFIG_USB_STORAGE_DEBUG=y
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
 # CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_DPCM is not set
-# CONFIG_USB_STORAGE_HP8200e is not set
+CONFIG_USB_STORAGE_DPCM=y
+CONFIG_USB_STORAGE_HP8200e=y
 CONFIG_USB_STORAGE_SDDR09=y
-# CONFIG_USB_STORAGE_SDDR55 is not set
+CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_JUMPSHOT=y
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
 # CONFIG_USB_HID is not set
 # CONFIG_USB_HIDINPUT is not set
 # CONFIG_USB_HIDDEV is not set
@@ -1120,83 +1108,6 @@ CONFIG_USB_LCD=m
 # CONFIG_USB_GADGET is not set
 
 #
-# USB clients (devices, not hosts)
-#
-CONFIG_USBD=m
-CONFIG_USBD_HIGH_SPEED=y
-# CONFIG_USBD_NO_SERIAL_NUMBER is not set
-CONFIG_USBD_SERIAL_NUMBER_STR=""
-CONFIG_USBD_MAXPOWER=0
-CONFIG_USBD_PROCFS=y
-CONFIG_USBD_PROCFSM=m
-
-#
-# Network Function
-#
-CONFIG_USBD_NETWORK=m
-CONFIG_USBD_NETWORK_VENDORID=2001
-CONFIG_USBD_NETWORK_PRODUCTID=1a00
-CONFIG_USBD_NETWORK_BCDDEVICE=0100
-CONFIG_USBD_NETWORK_MANUFACTURER="Belcarra"
-CONFIG_USBD_NETWORK_PRODUCT_NAME="Belcarra BLAN Device"
-CONFIG_USBD_NETWORK_BLAN=y
-CONFIG_USBD_NETWORK_BLAN_DESC="BLAN Net Cfg"
-CONFIG_USBD_NETWORK_BLAN_INTF="Comm/Data Intf"
-CONFIG_USBD_NETWORK_BLAN_CRC=y
-CONFIG_USBD_NETWORK_BLAN_PADBEFORE=y
-CONFIG_USBD_NETWORK_BLAN_PADAFTER=y
-CONFIG_USBD_NETWORK_BLAN_PADBYTES=8
-CONFIG_USBD_NETWORK_BLAN_FERMAT=y
-CONFIG_USBD_NETWORK_BLAN_DO_NOT_SETTIME=y
-# CONFIG_USBD_NETWORK_BLAN_HOSTNAME is not set
-CONFIG_USBD_NETWORK_BLAN_NONBRIDGED=y
-# CONFIG_USBD_NETWORK_SAFE is not set
-CONFIG_USBD_NETWORK_CDC=y
-CONFIG_USBD_NETWORK_CDC_DESC="SAFE Net Cfg"
-CONFIG_USBD_NETWORK_CDC_COMM_INTF="Comm Intf"
-CONFIG_USBD_NETWORK_CDC_NODATA_INTF="Data (Disabled) Intf"
-CONFIG_USBD_NETWORK_CDC_DATA_INTF="Dat Intf"
-# CONFIG_USBD_NETWORK_BASIC is not set
-# CONFIG_USBD_NETWORK_BASIC2 is not set
-CONFIG_USBD_NETWORK_START_SINGLE=y
-CONFIG_USBD_NETWORK_EP0TEST=y
-
-#
-# CDC ACM Function
-#
-CONFIG_USBD_ACM=m
-CONFIG_USBD_ACM_VENDORID=12b9
-CONFIG_USBD_ACM_PRODUCTID=f002
-CONFIG_USBD_ACM_BCDDEVICE=0100
-CONFIG_USBD_ACM_MANUFACTURER="Belcarra"
-CONFIG_USBD_ACM_PRODUCT_NAME="Belcarra ACM Device"
-CONFIG_USBD_ACM_DESC="Acm Cfg"
-CONFIG_USBD_ACM_COMM_INTF="Comm Intf"
-CONFIG_USBD_ACM_DATA_INTF="Data Intf"
-CONFIG_USBD_ACM_TRACE=y
-
-#
-# Random Mouse Function
-#
-CONFIG_USBD_MOUSE=m
-CONFIG_USBD_MOUSE_VENDORID=12b9
-CONFIG_USBD_MOUSE_PRODUCTID=f003
-CONFIG_USBD_MOUSE_BCDDEVICE=0100
-CONFIG_USBD_MOUSE_MANUFACTURER="Belcarra"
-CONFIG_USBD_MOUSE_DESC="Acm Cfg"
-CONFIG_USBD_MOUSE_COMM_INTF="Comm Intf"
-CONFIG_USBD_MOUSE_BH=y
-
-#
-# AMD AU1X000 Bus Interface
-#
-CONFIG_USBD_AU1X00_BUS=m
-CONFIG_USBD_AU1X00_SCLOCK=400
-CONFIG_AU1000_USB_DEVICE=y
-CONFIG_AU1X00_USB_DEVICE=y
-CONFIG_USBD_BI_REGISTER_TRACE=y
-
-#
 # Bluetooth support
 #
 CONFIG_BLUEZ=m
diff --git a/linux/linux-mtx-1_2.4.24.oe b/linux/linux-mtx-1_2.4.24.oe
index f8adc67c75..933e725153 100644
--- a/linux/linux-mtx-1_2.4.24.oe
+++ b/linux/linux-mtx-1_2.4.24.oe
@@ -5,9 +5,25 @@ LICENSE = "GPL"
 KV = "${PV}"
 PACKAGE_ARCH = "mtx-1"
 RDEPENDS = "mtd"
+PR="r1"
 
-CVSDATE = "20041016"
-SRC_URI = "cvs://anoncvs:anoncvs@meshcube.org/data/cvs;module=kernel/linux"
+SRC_URI = "cvs://cvs:cvs@ftp.linux-mips.org/home/cvs;module=linux;tag=linux_2_4_24_pre2 \
+	file://01-mtd-2004-01-27.diff;patch=1 \
+	file://02-mtd-mtx-1-map.diff;patch=1 \
+	file://03-mtd-erase-compiler-bug.diff;patch=1 \
+	file://04-zboot-2.4.24.patch;patch=1 \
+	file://05-zboot-cflags.diff;patch=1 \
+	file://06-zboot-mtx.diff;patch=1 \
+	file://07-zimage-flash-bin.patch;patch=1 \
+	file://08-usb-nonpci-2.4.24.patch;patch=1 \
+	file://09-iw-max-spy-32.diff;patch=1 \
+	file://10-mtx-pci-slots.diff;patch=1 \
+	file://11-mtx-extraversion.diff;patch=1 \
+	file://12-openswan-2.2.0-nat-t.diff;patch=1 \
+	file://13-openswan-2.2.0.patch;patch=1 \
+	file://14-au1000-eth-vlan.diff;patch=1 \
+	file://15-mtd-proc-partition-rw.diff;patch=1 \
+	file://defconfig-mtx-1"
 
 S = "${WORKDIR}/linux"
 
@@ -19,7 +35,7 @@ KERNEL_IMAGETYPE = "zImage.flash"
 KERNEL_IMAGEDEST = "tmp"
 
 do_configure_prepend() {
-        install -m 0644 ${S}/arch/mips/defconfig-mtx-1 ${S}/.config
+        install -m 0644 ${WORKDIR}/defconfig-mtx-1 ${S}/.config
 }
 
 pkg_postinst_kernel() {