Move uml kernel to 2.4.17

diff --git a/Makefile b/Makefile
index ca4e37707248c5b55706fc0b1a9b1a4c17740c84..b9f6aa35132410d98f195c7311f24e6006e5b2ee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,10 +34,10 @@ ARCH = i386
 IMAGE_SIZE=550 # library is 550K
 IMAGE_INODES=300
 
-LINUX_SOURCE=linux-2.4.14.tar.bz2
+LINUX_SOURCE=linux-2.4.17.tar.bz2
 LINUX_URI=http://www.kernel.org/pub/linux/kernel/v2.4
 
-USERMODELINUX_PATCH=uml-patch-2.4.14-6.bz2
+USERMODELINUX_PATCH=uml-patch-2.4.17-3.bz2
 USERMODELINUX_URI=http://prdownloads.sourceforge.net/user-mode-linux
 
 UCLIBC_SOURCE=uClibc-snapshot.tar.gz
@@ -114,11 +114,13 @@ $(LINUX_DIR)/.patched:    $(LINUX_DIR)/.unpacked $(SOURCE_DIR)/$(USERMODELINUX_PATC
        touch $(LINUX_DIR)/.patched
 
 $(LINUX_DIR)/.um:      $(LINUX_DIR)/.patched
-       sed -e 's/^ARCH :=.*/ARCH=um/g' < $(LINUX_DIR)/Makefile > $(LINUX_DIR)/Makefile.new && mv -f $(LINUX_DIR)/Makefile.new $(LINUX_DIR)/Makefile
+       sed -e 's/^ARCH :=.*/ARCH=um/g' < $(LINUX_DIR)/Makefile > \
+               $(LINUX_DIR)/Makefile.new && mv -f \
+               $(LINUX_DIR)/Makefile.new $(LINUX_DIR)/Makefile
        touch $(LINUX_DIR)/.um
 
 $(LINUX_DIR)/.configdone:      $(LINUX_DIR)/.um
-       make -C $(LINUX_DIR) oldconfig menuconfig
+       make -C $(LINUX_DIR) oldconfig
        touch $(LINUX_DIR)/.configdone
 
 $(LINUX_DIR)/.dep:     $(LINUX_DIR)/.configdone

diff --git a/sources/linux-uml.config b/sources/linux-uml.config
index 977472e625f671921f3b11af291bebef956e8eef..3a358048ba96604f615cfbd5960d854361d73c36 100644 (file)
--- a/sources/linux-uml.config
+++ b/sources/linux-uml.config
@@ -1,9 +1,10 @@
 #
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
 #
 CONFIG_USERMODE=y
-CONFIG_ISA=y
+# CONFIG_ISA is not set
 # CONFIG_SBUS is not set
+# CONFIG_PCI is not set
 CONFIG_UID16=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 
@@ -12,10 +13,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 #
 CONFIG_EXPERIMENTAL=y
 
-#
-# Processor features
-#
-
 #
 # General Setup
 #
@@ -33,6 +30,7 @@ CONFIG_SSL=y
 CONFIG_HOSTFS=y
 CONFIG_MCONSOLE=y
 CONFIG_MAGIC_SYSRQ=y
+# CONFIG_HOST_2G_2G is not set
 
 #
 # Loadable module support
@@ -57,8 +55,6 @@ CONFIG_BLK_DEV_INITRD=y
 #
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
-CONFIG_NETLINK=y
-CONFIG_RTNETLINK=y
 # CONFIG_NETLINK_DEV is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_FILTER is not set
@@ -75,10 +71,7 @@ CONFIG_INET=y
 # CONFIG_IPV6 is not set
 # 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
@@ -98,8 +91,15 @@ CONFIG_INET=y
 # CONFIG_NET_SCHED is not set
 
 #
-# Network drivers
+# Network device support
 #
+CONFIG_UML_NET=y
+CONFIG_UML_NET_ETHERTAP=y
+CONFIG_UML_NET_TUNTAP=y
+CONFIG_UML_NET_SLIP=y
+CONFIG_UML_NET_DAEMON=y
+CONFIG_UML_NET_MCAST=y
+CONFIG_NETDEVICES=y
 
 #
 # ARCnet devices
@@ -160,19 +160,6 @@ CONFIG_SLIP=y
 #
 # CONFIG_WAN is not set
 
-#
-# Network device support
-#
-CONFIG_NETDEVICES=y
-CONFIG_UML_NET=y
-CONFIG_UML_NET_ETHERTAP=y
-CONFIG_UML_NET_TUNTAP=y
-CONFIG_UML_NET_SLIP=y
-CONFIG_UML_NET_DAEMON=y
-CONFIG_UML_NET_MCAST=y
-CONFIG_ETHERTAP=y
-CONFIG_TUN=y
-
 #
 # File systems
 #
@@ -187,7 +174,6 @@ CONFIG_TUN=y
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_BFS_FS is not set
-# CONFIG_CMS_FS is not set
 CONFIG_EXT3_FS=y
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
@@ -205,7 +191,7 @@ CONFIG_RAMFS=y
 # CONFIG_JOLIET is not set
 # CONFIG_ZISOFS is not set
 CONFIG_MINIX_FS=y
-# CONFIG_FREEVXFS_FS is not set
+# CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
@@ -316,6 +302,7 @@ CONFIG_NLS_UTF8=m
 #
 # Kernel hacking
 #
+# CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUGSYM is not set
 # CONFIG_PT_PROXY is not set
 # CONFIG_GPROF is not set