r1976 - in branches/x86_64: . packages packages/LFS-BOOK packages/LVM2 packages/device-mapper packages/e2fsprogs packages/gcc packages/glibc packages/initramfs packages/iptables packages/jhalfs packages/linux packages/linux-headers packages/linux64 packages/livecd-bootscripts packages/m4 packages/man-pages packages/net-firmware packages/pidgin root scripts

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Jul 24 14:30:24 PDT 2007


Author: jhuntwork
Date: 2007-07-24 15:30:23 -0600 (Tue, 24 Jul 2007)
New Revision: 1976

Added:
   branches/x86_64/packages/XML-Parser/
   branches/x86_64/root/.gaim/
Modified:
   branches/x86_64/Makefile
   branches/x86_64/packages/LFS-BOOK/Makefile
   branches/x86_64/packages/LVM2/Makefile
   branches/x86_64/packages/device-mapper/Makefile
   branches/x86_64/packages/e2fsprogs/Makefile
   branches/x86_64/packages/gcc/Makefile
   branches/x86_64/packages/glibc/Makefile
   branches/x86_64/packages/initramfs/Makefile
   branches/x86_64/packages/initramfs/init.in
   branches/x86_64/packages/iptables/Makefile
   branches/x86_64/packages/jhalfs/Makefile
   branches/x86_64/packages/linux-headers/Makefile
   branches/x86_64/packages/linux/Makefile
   branches/x86_64/packages/linux/config.x86
   branches/x86_64/packages/linux64/Makefile
   branches/x86_64/packages/linux64/config.x86_64
   branches/x86_64/packages/livecd-bootscripts/font-errors.dat
   branches/x86_64/packages/livecd-bootscripts/lang.dat
   branches/x86_64/packages/m4/Makefile
   branches/x86_64/packages/man-pages/Makefile
   branches/x86_64/packages/net-firmware/Makefile
   branches/x86_64/packages/pidgin/Makefile
   branches/x86_64/scripts/shutdown-helper
Log:
Brought x86_64 branch up to speed

Modified: branches/x86_64/Makefile
===================================================================
--- branches/x86_64/Makefile	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/Makefile	2007-07-24 21:30:23 UTC (rev 1976)
@@ -252,9 +252,9 @@
 	ch-gnutls ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
 	ch-subversion ch-lfs-bootscripts ch-livecd-bootscripts ch-docbook-xml ch-libxslt \
 	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK \
-	ch-inputattach ch-openssh ch-glib2 ch-w3m ch-lftp \
+	ch-inputattach ch-openssh ch-glib2 ch-gc ch-w3m ch-lftp \
 	ch-cvs ch-popt ch-samba ch-pciutils ch-libusb ch-usbutils ch-parted \
-	ch-irssi ch-pidgin ch-net-tools ch-wireless_tools ch-wpa_supplicant \
+	ch-irssi ch-XML-Parser ch-pidgin ch-net-tools ch-wireless_tools ch-wpa_supplicant \
 	ch-tcpwrappers ch-portmap ch-nfs-utils \
 	ch-traceroute ch-rsync ch-jhalfs ch-sudo ch-bc ch-dialog ch-ncftp  \
 	ch-device-mapper ch-LVM2 ch-dmraid ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-pptp \

Modified: branches/x86_64/packages/LFS-BOOK/Makefile
===================================================================
--- branches/x86_64/packages/LFS-BOOK/Makefile	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/LFS-BOOK/Makefile	2007-07-24 21:30:23 UTC (rev 1976)
@@ -10,7 +10,7 @@
 #URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/6.2/$(FILE)
 #SHA-$(FILE)= 729bcf04d8e4ed0af3c58daf0d289e94d6385052
 
-REV= 8184
+REV= 8225
 REVPARM= -r $(REV)
 
 URL= svn://svn.linuxfromscratch.org/LFS/trunk/BOOK

Modified: branches/x86_64/packages/LVM2/Makefile
===================================================================
--- branches/x86_64/packages/LVM2/Makefile	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/LVM2/Makefile	2007-07-24 21:30:23 UTC (rev 1976)
@@ -1,12 +1,12 @@
 # lvm2 Makefile
 
 NM= LVM2
-VRS= 2.02.26
+VRS= 2.02.27
 DIR= $(NM).$(VRS)
 
 FILE= $(DIR).tgz
 URL-$(FILE)= ftp://sources.redhat.com/pub/lvm2/$(FILE)
-SHA-$(FILE)= 10b59327f08d62c835513d04429066150ebd27a8
+SHA-$(FILE)= 0deae8047c934a370d8e825675a514c6f413428f
 
 # Targets
 

Copied: branches/x86_64/packages/XML-Parser (from rev 1964, branches/minimal/packages/XML-Parser)

Modified: branches/x86_64/packages/device-mapper/Makefile
===================================================================
--- branches/x86_64/packages/device-mapper/Makefile	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/device-mapper/Makefile	2007-07-24 21:30:23 UTC (rev 1976)
@@ -1,12 +1,12 @@
 # device-mapper Makefile
 
 NM= device-mapper
-VRS= 1.02.20
+VRS= 1.02.21
 DIR= $(NM).$(VRS)
 
 FILE= $(DIR).tgz
 URL-$(FILE)= ftp://sources.redhat.com/pub/dm/$(FILE)
-SHA-$(FILE)= d6827fbb817a4a8557916aa3a134bf091ca476d7
+SHA-$(FILE)= b9ce3e5400cf66e2b5b2eebc672268360c371692
 
 # Targets
 

Modified: branches/x86_64/packages/e2fsprogs/Makefile
===================================================================
--- branches/x86_64/packages/e2fsprogs/Makefile	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/e2fsprogs/Makefile	2007-07-24 21:30:23 UTC (rev 1976)
@@ -1,12 +1,12 @@
 # E2fsprogs Makefile
 
 NM= e2fsprogs
-VRS= 1.39
+VRS= 1.40.2
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
-URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= c2dad0c9bd76701eafe3804e2a7d072aa198f046
+URL-$(FILE)= http://easynews.dl.sourceforge.net/sourceforge/e2fsprogs/$(FILE)
+SHA-$(FILE)= 65519d66bd15550d0bcd32ec72481ff0dbe737e2
 
 # Targets
 
@@ -23,7 +23,7 @@
 	sed -i -e 's@/bin/rm@/tools&@' lib/blkid/test_probe.in
 	mkdir -v build
 	cd build ; ../configure --prefix=/usr --with-root-prefix="" \
-	 --enable-elf-shlibs --disable-evms
+	 --enable-elf-shlibs
 	cd build ; make
 	cd build ; make install
 	cd build ; make install-libs

Modified: branches/x86_64/packages/gcc/Makefile
===================================================================
--- branches/x86_64/packages/gcc/Makefile	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/gcc/Makefile	2007-07-24 21:30:23 UTC (rev 1976)
@@ -23,7 +23,7 @@
 
 compile-pass1:
 # --enable-static overrides the unsuitable default in config.site
-	unset CFLAGS ; ../$(DIR)/configure --prefix=$(WD) \
+	unset CFLAGS ; CC="gcc -B/usr/bin/" ../$(DIR)/configure --prefix=$(WD) \
 	 --with-local-prefix=$(WD) --disable-nls --enable-shared \
 	 --enable-languages=c --enable-static
 	unset CFLAGS ; make bootstrap

Modified: branches/x86_64/packages/glibc/Makefile
===================================================================
--- branches/x86_64/packages/glibc/Makefile	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/glibc/Makefile	2007-07-24 21:30:23 UTC (rev 1976)
@@ -12,9 +12,9 @@
 URL-$(FILE2)= $(HTTP)/$(NM)/$(FILE2)
 SHA-$(FILE2)= ee7e019e01aa338e28db1eeb34abb2cb09d2f30a
 
-PATCH1= $(DIR)-branch_update-2.patch
+PATCH1= $(DIR)-branch_update-3.patch
 URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH1)
-SHA-$(PATCH1)= e1f19b65f695bdac94245212e3b3f6b5aa18b82c
+SHA-$(PATCH1)= 3af17e283bf76659c189ee05f2ae56f19a88478c
 
 PATCH50= $(DIR)-supported_locales-1.patch
 

Modified: branches/x86_64/packages/initramfs/Makefile
===================================================================
--- branches/x86_64/packages/initramfs/Makefile	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/initramfs/Makefile	2007-07-24 21:30:23 UTC (rev 1976)
@@ -40,7 +40,7 @@
 	cp /sbin/pcmcia-{check-broken-cis,socket-startup} $(WDIR)/sbin
 	cp /usr/bin/stat $(WDIR)/bin
 	cp /usr/sbin/dmsetup $(WDIR)/sbin
-	find /lib/modules/*/kernel/drivers/{ata,base,block,cdrom,ide,message,scsi,pcmcia,usb/{core,host,storage,input}} \
+	find /lib/modules/*/kernel/drivers/{ata,base,block,cdrom,ide,ieee1394,firewire,hid,message,scsi,pcmcia,usb/{core,host,storage}} \
 	    /lib/modules/*/kernel/fs/{mbcache.ko,ext2,ext3,ext4,reiserfs,xfs,fat,vfat,ntfs,isofs,udf,nls} \
 	    /lib/modules/*/kernel/lib -type f | cpio --make-directories -p $(WDIR)
 	for a in /lib/modules/* ; do ver=$${a##*/} ; depmod -b $(WDIR) $$ver ; done

Modified: branches/x86_64/packages/initramfs/init.in
===================================================================
--- branches/x86_64/packages/initramfs/init.in	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/initramfs/init.in	2007-07-24 21:30:23 UTC (rev 1976)
@@ -4,6 +4,7 @@
 EXPECTED_LABEL="$EXPECTED_LABEL                                "
 EXPECTED_LABEL=${EXPECTED_LABEL:0:32}
 PATA=0
+NEW_FIREWIRE=0
 
 init=/sbin/init
 root=
@@ -203,6 +204,9 @@
 	pata)
 		PATA=1
 		;;
+	new_firewire)
+		NEW_FIREWIRE=1
+		;;
 	all_generic_ide)
 		all_generic_ide=1
 		;;
@@ -265,9 +269,32 @@
 		;;
 esac
 
+case "$NEW_FIREWIRE" in
+	0)
+		for driver in /lib/modules/`uname -r`/kernel/drivers/firewire/*.ko ; do
+			drv=${driver##*/}
+			drv=${drv%.ko}
+			echo "blacklist $drv" >>/etc/modprobe.conf
+		done
+		;;
+	1)
+		for driver in /lib/modules/`uname -r`/kernel/drivers/ieee1394/*.ko ; do
+			drv=${driver##*/}
+			drv=${drv%.ko}
+			echo "blacklist $drv" >>/etc/modprobe.conf
+		done
+		;;
+esac
+
 if [ "$all_generic_ide" = 1 ] ; then
 	echo "options generic all_generic_ide=1" >>/etc/modprobe.conf
 	echo "options ata-generic all_generic_ide=1" >>/etc/modprobe.conf
+else
+	if [ "$PATA" = 0 ] ; then
+		echo "blacklist generic" >>/etc/modprobe.conf
+	else
+		echo "blacklist ata-generic" >>/etc/modprobe.conf
+	fi
 fi
 
 /sbin/udevd --daemon

Modified: branches/x86_64/packages/iptables/Makefile
===================================================================
--- branches/x86_64/packages/iptables/Makefile	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/iptables/Makefile	2007-07-24 21:30:23 UTC (rev 1976)
@@ -1,12 +1,12 @@
 # iptables Makefile
 
 NM= iptables
-VRS= 1.3.7
+VRS= 1.3.8
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://www.netfilter.org/projects/iptables/files/$(FILE)
-SHA-$(FILE)= 2f25e7a81fb3e81f92b0121d9dcd5a536854dc60
+SHA-$(FILE)= 948f361b194e989b39de4cfa3e95dbe634269ed0
 
 # Targets
 
@@ -20,8 +20,8 @@
 	$(std_build)
 
 compile-stage2:
-	make PREFIX=/usr LIBDIR=/lib BINDIR=/bin MANDIR=/usr/share/man
-	make PREFIX=/usr LIBDIR=/lib BINDIR=/bin MANDIR=/usr/share/man install
+	make PREFIX=/usr LIBDIR=/lib BINDIR=/bin MANDIR=/usr/share/man KERNEL_DIR=/usr
+	make PREFIX=/usr LIBDIR=/lib BINDIR=/bin MANDIR=/usr/share/man KERNEL_DIR=/usr install
 
 clean:
 	-rm -rf $(DIR)

Modified: branches/x86_64/packages/jhalfs/Makefile
===================================================================
--- branches/x86_64/packages/jhalfs/Makefile	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/jhalfs/Makefile	2007-07-24 21:30:23 UTC (rev 1976)
@@ -1,12 +1,12 @@
 # jhalfs Makefile
 
 NM= jhalfs
-VRS= 2.1
+VRS= 2.2
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://www.linuxfromscratch.org/alfs/downloads/jhalfs/stable/$(FILE)
-SHA-$(FILE)= 41439fb254d7a2e28d5e2e592105077ad886b4dc
+SHA-$(FILE)= cd62df2c35c3502f26a85f7f96fcae4a8f7afddb
 
 FILE1= configuration
 # Targets

Modified: branches/x86_64/packages/linux/Makefile
===================================================================
--- branches/x86_64/packages/linux/Makefile	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/linux/Makefile	2007-07-24 21:30:23 UTC (rev 1976)
@@ -1,12 +1,12 @@
 # Linux Kernel Makefile
 
 NM= linux
-VRS= 2.6.21.5
+VRS= 2.6.22.1
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE)
-SHA-$(FILE)= f6e5507bf9d46563a845edfa174ac22bfa2f8896
+SHA-$(FILE)= 7aa119f88768c3070f96a48562ea68b2ecd8a2ef
 
 PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch
 

Modified: branches/x86_64/packages/linux/config.x86
===================================================================
--- branches/x86_64/packages/linux/config.x86	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/linux/config.x86	2007-07-24 21:30:23 UTC (rev 1976)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21.1
-# Tue May 29 12:25:27 2007
+# Linux kernel version: 2.6.22.1
+# Sat Jul 21 15:07:32 2007
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -14,6 +14,7 @@
 CONFIG_X86=y
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
+CONFIG_QUICKLIST=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_BUG=y
@@ -45,6 +46,7 @@
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_CPUSETS is not set
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
@@ -63,14 +65,19 @@
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 
 #
 # Loadable module support
@@ -144,9 +151,11 @@
 # CONFIG_MGEODE_LX is not set
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
 CONFIG_X86_GENERIC=y
 CONFIG_X86_CMPXCHG=y
 CONFIG_X86_L1_CACHE_SHIFT=7
+CONFIG_X86_XADD=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -159,6 +168,7 @@
 CONFIG_X86_POPAD_OK=y
 CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_MINIMUM_CPU_MODEL=4
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_NR_CPUS=8
@@ -207,6 +217,7 @@
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_NR_QUICK=1
 # CONFIG_HIGHPTE is not set
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
@@ -257,8 +268,6 @@
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_ASUS=y
-CONFIG_ACPI_IBM=y
-CONFIG_ACPI_IBM_BAY=y
 CONFIG_ACPI_TOSHIBA=y
 CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
@@ -267,16 +276,12 @@
 CONFIG_ACPI_SYSTEM=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=y
-
-#
-# APM (Advanced Power Management) BIOS Support
-#
+CONFIG_ACPI_SBS=y
 CONFIG_APM=y
 CONFIG_APM_IGNORE_USER_SUSPEND=y
 # CONFIG_APM_DO_ENABLE is not set
 CONFIG_APM_CPU_IDLE=y
 # CONFIG_APM_DISPLAY_BLANK is not set
-# CONFIG_APM_RTC_IS_GMT is not set
 CONFIG_APM_ALLOW_INTS=y
 # CONFIG_APM_REAL_MODE_POWER_OFF is not set
 
@@ -298,6 +303,7 @@
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
+CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
 CONFIG_HT_IRQ=y
 CONFIG_ISA_DMA_API=y
@@ -332,10 +338,6 @@
 CONFIG_TCIC=m
 CONFIG_PCMCIA_PROBE=y
 CONFIG_PCCARD_NONSTATIC=m
-
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 
 #
@@ -353,7 +355,6 @@
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -381,10 +382,6 @@
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-
-#
-# IP: Virtual Server Configuration
-#
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
@@ -400,6 +397,7 @@
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 # CONFIG_NF_CONNTRACK_ENABLED is not set
+# CONFIG_NF_CONNTRACK is not set
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
@@ -448,20 +446,8 @@
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_RAW=m
 # CONFIG_IP_NF_ARPTABLES is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -479,6 +465,7 @@
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
+CONFIG_NET_SCH_FIFO=y
 CONFIG_NET_CLS_ROUTE=y
 
 #
@@ -526,6 +513,7 @@
 CONFIG_MCP2120_DONGLE=m
 CONFIG_OLD_BELKIN_DONGLE=m
 CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
 
 #
 # Old SIR device drivers
@@ -574,6 +562,15 @@
 CONFIG_BT_HCIBLUECARD=m
 CONFIG_BT_HCIBTUART=m
 # CONFIG_BT_HCIVHCI is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+CONFIG_CFG80211=m
+CONFIG_WIRELESS_EXT=y
+CONFIG_MAC80211=m
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -581,7 +578,8 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_WIRELESS_EXT=y
+CONFIG_RFKILL=m
+CONFIG_RFKILL_INPUT=m
 
 #
 # Device Drivers
@@ -599,10 +597,6 @@
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 
 #
@@ -648,14 +642,13 @@
 # Misc devices
 #
 # CONFIG_IBM_ASM is not set
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
 CONFIG_MSI_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_SONYPI_COMPAT=y
+# CONFIG_THINKPAD_ACPI is not set
 CONFIG_IDE=m
 CONFIG_BLK_DEV_IDE=m
 
@@ -674,6 +667,7 @@
 # CONFIG_BLK_DEV_IDESCSI is not set
 CONFIG_BLK_DEV_IDEACPI=y
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
@@ -684,6 +678,7 @@
 CONFIG_BLK_DEV_IDEPNP=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=m
 CONFIG_BLK_DEV_OPTI621=m
@@ -754,6 +749,7 @@
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -786,7 +782,6 @@
 CONFIG_SCSI_AIC79XX=m
 CONFIG_AIC79XX_CMDS_PER_DEVICE=32
 CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_ENABLE_RD_STRM is not set
 CONFIG_AIC79XX_DEBUG_ENABLE=y
 CONFIG_AIC79XX_DEBUG_MASK=0
 CONFIG_AIC79XX_REG_PRETTY_PRINT=y
@@ -857,12 +852,9 @@
 CONFIG_PCMCIA_NINJA_SCSI=m
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_ACPI=y
 CONFIG_SATA_AHCI=m
 CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
@@ -879,11 +871,11 @@
 CONFIG_SATA_VIA=m
 CONFIG_SATA_VITESSE=m
 CONFIG_SATA_INIC162X=m
-CONFIG_SATA_ACPI=y
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
 CONFIG_PATA_ARTOP=m
 CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_CMD640_PCI=m
 CONFIG_PATA_CMD64X=m
 CONFIG_PATA_CS5520=m
 CONFIG_PATA_CS5530=m
@@ -948,6 +940,7 @@
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
+# CONFIG_DM_DELAY is not set
 
 #
 # Fusion MPT device support
@@ -962,17 +955,18 @@
 #
 # IEEE 1394 (FireWire) support
 #
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 CONFIG_IEEE1394=m
 
 #
 # Subsystem Options
 #
 # CONFIG_IEEE1394_VERBOSEDEBUG is not set
-CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
-CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
 
 #
-# Device Drivers
+# Controllers
 #
 
 #
@@ -981,11 +975,12 @@
 CONFIG_IEEE1394_OHCI1394=m
 
 #
-# Protocol Drivers
+# Protocols
 #
 # CONFIG_IEEE1394_VIDEO1394 is not set
 CONFIG_IEEE1394_SBP2=m
 # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
+CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
 CONFIG_IEEE1394_ETH1394=m
 # CONFIG_IEEE1394_DV1394 is not set
 CONFIG_IEEE1394_RAWIO=m
@@ -1002,13 +997,9 @@
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
+# CONFIG_MACINTOSH_DRIVERS is not set
 
 #
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-
-#
 # Network device support
 #
 CONFIG_NETDEVICES=y
@@ -1017,15 +1008,7 @@
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_NET_SB1000 is not set
-
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
 CONFIG_PHYLIB=m
 
 #
@@ -1130,10 +1113,7 @@
 CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_RHINE_NAPI=y
 CONFIG_SC92031=m
-
-#
-# Ethernet (1000 Mbit)
-#
+CONFIG_NETDEV_1000=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_DL2K=m
@@ -1154,10 +1134,7 @@
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
 CONFIG_ATL1=m
-
-#
-# Ethernet (10000 Mbit)
-#
+CONFIG_NETDEV_10000=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
@@ -1168,35 +1145,21 @@
 CONFIG_S2IO_NAPI=y
 CONFIG_MYRI10GE=m
 CONFIG_NETXEN_NIC=m
-
-#
-# Token Ring devices
-#
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
 # CONFIG_TR is not set
 
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-CONFIG_NET_RADIO=y
-CONFIG_NET_WIRELESS_RTNETLINK=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
+CONFIG_WLAN_PRE80211=y
 CONFIG_STRIP=m
 CONFIG_ARLAN=m
 CONFIG_WAVELAN=m
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 CONFIG_PCMCIA_RAYCS=m
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
 # CONFIG_IPW2100_DEBUG is not set
@@ -1206,6 +1169,9 @@
 CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
 # CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+# CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1214,24 +1180,16 @@
 CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_PCMCIA_WL3501=m
-
-#
-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
-#
 CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
@@ -1244,11 +1202,32 @@
 # CONFIG_BCM43XX_PIO_MODE is not set
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_NET_WIRELESS=y
 
 #
-# PCMCIA network device support
+# USB Network Adapters
 #
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET_MII=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
 CONFIG_NET_PCMCIA=y
 CONFIG_PCMCIA_3C589=m
 CONFIG_PCMCIA_3C574=m
@@ -1258,10 +1237,6 @@
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_PCMCIA_AXNET=m
-
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -1297,6 +1272,7 @@
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -1322,17 +1298,30 @@
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
 CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
 # CONFIG_INPUT_WISTRON_BTNS is not set
 # CONFIG_INPUT_ATLAS_BTNS is not set
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_UINPUT is not set
 
 #
@@ -1379,10 +1368,6 @@
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_INTEL=m
@@ -1437,10 +1422,7 @@
 #
 # CONFIG_TCG_TPM is not set
 # CONFIG_TELCLOCK is not set
-
-#
-# I2C support
-#
+CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
 #
@@ -1453,12 +1435,7 @@
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
 # CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
 
 #
 # Multifunction device drivers
@@ -1469,25 +1446,32 @@
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 
 #
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-# CONFIG_USB_DABUSB is not set
-
-#
 # Graphics support
 #
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_PROGEAR is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+CONFIG_VGASTATE=m
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@@ -1505,11 +1489,13 @@
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_VGA16=m
 CONFIG_FB_VESA=y
+# CONFIG_FB_HECUBA is not set
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_RIVA is not set
 # CONFIG_FB_I810 is not set
+# CONFIG_FB_LE80578 is not set
 # CONFIG_FB_INTEL is not set
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON is not set
@@ -1522,8 +1508,11 @@
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
 # CONFIG_FB_CYBLA is not set
 # CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_VIRTUAL is not set
 
@@ -1541,10 +1530,6 @@
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
@@ -1621,9 +1606,11 @@
 CONFIG_SND_SB16=m
 CONFIG_SND_SBAWE=m
 CONFIG_SND_SB16_CSP=y
+# CONFIG_SND_SB16_CSP_FIRMWARE_IN_KERNEL is not set
 CONFIG_SND_SGALAXY=m
 CONFIG_SND_SSCAPE=m
 CONFIG_SND_WAVEFRONT=m
+# CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL is not set
 
 #
 # PCI devices
@@ -1674,7 +1661,9 @@
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
 CONFIG_SND_KORG1212=m
+# CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL is not set
 CONFIG_SND_MAESTRO3=m
+# CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL is not set
 CONFIG_SND_MIXART=m
 CONFIG_SND_NM256=m
 CONFIG_SND_PCXHR=m
@@ -1688,6 +1677,7 @@
 CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
+# CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL is not set
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -1695,6 +1685,8 @@
 #
 CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
 
 #
 # PCMCIA devices
@@ -1703,7 +1695,7 @@
 CONFIG_SND_PDAUDIOCF=m
 
 #
-# SoC audio support
+# System on Chip audio support
 #
 # CONFIG_SND_SOC is not set
 
@@ -1720,6 +1712,20 @@
 # CONFIG_HID_DEBUG is not set
 
 #
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+CONFIG_USB_HIDINPUT_POWERBOOK=y
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -1732,6 +1738,7 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
 # CONFIG_USB_OTG is not set
@@ -1780,63 +1787,10 @@
 # CONFIG_USB_LIBUSUAL is not set
 
 #
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-CONFIG_USB_HIDINPUT_POWERBOOK=y
-# CONFIG_HID_FF is not set
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-# CONFIG_USB_GTCO is not set
-
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET_MII=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
 # CONFIG_USB_MON is not set
 
 #
@@ -1930,10 +1884,6 @@
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 
 #
@@ -1955,6 +1905,7 @@
 CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
@@ -1962,6 +1913,7 @@
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
 CONFIG_INFINIBAND_CXGB3=m
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
+CONFIG_MLX4_INFINIBAND=m
 CONFIG_INFINIBAND_IPOIB=m
 # CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
@@ -1993,10 +1945,6 @@
 #
 
 #
-# Auxiliary Display support
-#
-
-#
 # Virtualization
 #
 # CONFIG_KVM is not set
@@ -2115,6 +2063,7 @@
 CONFIG_EXPORTFS=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
@@ -2203,7 +2152,6 @@
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=15
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_X86_FIND_SMP_CONFIG=y
@@ -2238,6 +2186,7 @@
 CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_FCRYPT=m
 # CONFIG_CRYPTO_BLOWFISH is not set
@@ -2272,6 +2221,7 @@
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
+CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=y
 CONFIG_ZLIB_INFLATE=m
@@ -2284,6 +2234,7 @@
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_PENDING_IRQ=y

Modified: branches/x86_64/packages/linux-headers/Makefile
===================================================================
--- branches/x86_64/packages/linux-headers/Makefile	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/linux-headers/Makefile	2007-07-24 21:30:23 UTC (rev 1976)
@@ -1,12 +1,12 @@
 # Linux-headers Makefile
 
 NM= linux
-VRS= 2.6.21.5
+VRS= 2.6.22.1
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE)
-SHA-$(FILE)= f6e5507bf9d46563a845edfa174ac22bfa2f8896
+SHA-$(FILE)= 7aa119f88768c3070f96a48562ea68b2ecd8a2ef
 
 # Targets
 
@@ -17,22 +17,23 @@
 
 compile-stage1:
 	make mrproper
-	make headers_install
 	make headers_check
-	cp -av usr/include/* /tools/include
+	make INSTALL_HDR_PATH=dest headers_install
+	cp -rv dest/include/* /tools/include
 
 chroot:
 	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: $(FILE)
+stage2: Makefile $(FILE)
 	$(std_build)
 
 compile-stage2:
 	sed -i '/scsi/d' include/Kbuild
 	make mrproper
 	make headers_check
-	make INSTALL_HDR_PATH=/usr headers_install
+	make INSTALL_HDR_PATH=dest headers_install
+	cp -rv dest/include/* /usr/include
 
 clean:
 	-rm -rf $(DIR)

Modified: branches/x86_64/packages/linux64/Makefile
===================================================================
--- branches/x86_64/packages/linux64/Makefile	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/linux64/Makefile	2007-07-24 21:30:23 UTC (rev 1976)
@@ -1,12 +1,12 @@
 # Linux Kernel Makefile
 
 NM= linux
-VRS= 2.6.21.5
+VRS= 2.6.22.1
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE)
-SHA-$(FILE)= f6e5507bf9d46563a845edfa174ac22bfa2f8896
+SHA-$(FILE)= 7aa119f88768c3070f96a48562ea68b2ecd8a2ef
 
 PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch
 
@@ -25,6 +25,8 @@
 	patch -Np1 -i ../$(PATCH3)
 	make mrproper
 	cp ../config.x86_64 .config
+	# Hack for fglrx
+	touch include/linux/ioctl32.h
 	PATH=$$PATH:$(WD)/bin make ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu-
 	PATH=$$PATH:$(WD)/bin make modules_install ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu-
 	rm /lib/modules/*-64bit/{source,build}

Modified: branches/x86_64/packages/linux64/config.x86_64
===================================================================
--- branches/x86_64/packages/linux64/config.x86_64	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/linux64/config.x86_64	2007-07-24 21:30:23 UTC (rev 1976)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21.1
-# Tue May 29 12:24:42 2007
+# Linux kernel version: 2.6.22.1
+# Sat Jul 21 16:08:05 2007
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -53,6 +53,7 @@
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_CPUSETS is not set
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
@@ -71,14 +72,19 @@
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-CONFIG_SLAB=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 
 #
 # Loadable module support
@@ -175,6 +181,7 @@
 CONFIG_X86_MCE_AMD=y
 # CONFIG_KEXEC is not set
 # CONFIG_CRASH_DUMP is not set
+# CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_START=0x200000
 CONFIG_SECCOMP=y
 # CONFIG_CC_STACKPROTECTOR is not set
@@ -183,7 +190,6 @@
 CONFIG_HZ_300=y
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=300
-CONFIG_REORDER=y
 CONFIG_K8_NB=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -221,8 +227,6 @@
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_ASUS=y
-CONFIG_ACPI_IBM=y
-CONFIG_ACPI_IBM_BAY=y
 CONFIG_ACPI_TOSHIBA=y
 CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
@@ -231,6 +235,7 @@
 CONFIG_ACPI_SYSTEM=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_SBS=y
 
 #
 # CPU Frequency scaling
@@ -245,6 +250,7 @@
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
+CONFIG_ARCH_SUPPORTS_MSI=y
 # CONFIG_PCI_MSI is not set
 CONFIG_HT_IRQ=y
 
@@ -270,10 +276,6 @@
 CONFIG_PD6729=m
 CONFIG_I82092=m
 CONFIG_PCCARD_NONSTATIC=m
-
-#
-# PCI Hotplug Support
-#
 # CONFIG_HOTPLUG_PCI is not set
 
 #
@@ -294,7 +296,6 @@
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -322,10 +323,6 @@
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-
-#
-# IP: Virtual Server Configuration
-#
 # CONFIG_IP_VS is not set
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
@@ -341,8 +338,6 @@
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK_ENABLED=m
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
@@ -434,20 +429,8 @@
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -465,6 +448,7 @@
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
+CONFIG_NET_SCH_FIFO=y
 CONFIG_NET_CLS_ROUTE=y
 
 #
@@ -512,6 +496,7 @@
 CONFIG_MCP2120_DONGLE=m
 CONFIG_OLD_BELKIN_DONGLE=m
 CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
 
 #
 # Old SIR device drivers
@@ -559,6 +544,15 @@
 CONFIG_BT_HCIBLUECARD=m
 CONFIG_BT_HCIBTUART=m
 # CONFIG_BT_HCIVHCI is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+CONFIG_CFG80211=m
+CONFIG_WIRELESS_EXT=y
+CONFIG_MAC80211=m
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
@@ -566,7 +560,8 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_WIRELESS_EXT=y
+CONFIG_RFKILL=m
+CONFIG_RFKILL_INPUT=m
 
 #
 # Device Drivers
@@ -584,10 +579,6 @@
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 # CONFIG_MTD is not set
 
 #
@@ -629,14 +620,13 @@
 # Misc devices
 #
 # CONFIG_IBM_ASM is not set
+# CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
 CONFIG_MSI_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
+CONFIG_SONYPI_COMPAT=y
+# CONFIG_THINKPAD_ACPI is not set
 CONFIG_IDE=m
 CONFIG_BLK_DEV_IDE=m
 
@@ -655,6 +645,7 @@
 # CONFIG_BLK_DEV_IDESCSI is not set
 CONFIG_BLK_DEV_IDEACPI=y
 # CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
@@ -665,6 +656,7 @@
 CONFIG_BLK_DEV_IDEPNP=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_BLK_DEV_GENERIC=m
 CONFIG_BLK_DEV_OPTI621=m
@@ -733,6 +725,7 @@
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -762,7 +755,6 @@
 CONFIG_SCSI_AIC79XX=m
 CONFIG_AIC79XX_CMDS_PER_DEVICE=32
 CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_ENABLE_RD_STRM is not set
 # CONFIG_AIC79XX_DEBUG_ENABLE is not set
 CONFIG_AIC79XX_DEBUG_MASK=0
 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
@@ -811,12 +803,9 @@
 CONFIG_PCMCIA_FDOMAIN=m
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_ACPI=y
 CONFIG_SATA_AHCI=m
 CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
@@ -833,11 +822,11 @@
 CONFIG_SATA_VIA=m
 CONFIG_SATA_VITESSE=m
 CONFIG_SATA_INIC162X=m
-CONFIG_SATA_ACPI=y
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
 CONFIG_PATA_ARTOP=m
 CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_CMD640_PCI=m
 CONFIG_PATA_CMD64X=m
 CONFIG_PATA_CS5520=m
 CONFIG_PATA_CS5530=m
@@ -892,6 +881,7 @@
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_EMC=m
+# CONFIG_DM_DELAY is not set
 
 #
 # Fusion MPT device support
@@ -907,17 +897,18 @@
 #
 # IEEE 1394 (FireWire) support
 #
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
 CONFIG_IEEE1394=m
 
 #
 # Subsystem Options
 #
 # CONFIG_IEEE1394_VERBOSEDEBUG is not set
-CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
-CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
 
 #
-# Device Drivers
+# Controllers
 #
 
 #
@@ -926,10 +917,11 @@
 CONFIG_IEEE1394_OHCI1394=m
 
 #
-# Protocol Drivers
+# Protocols
 #
 # CONFIG_IEEE1394_VIDEO1394 is not set
 CONFIG_IEEE1394_SBP2=m
+CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
 CONFIG_IEEE1394_ETH1394=m
 # CONFIG_IEEE1394_DV1394 is not set
 CONFIG_IEEE1394_RAWIO=m
@@ -947,13 +939,9 @@
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
+# CONFIG_MACINTOSH_DRIVERS is not set
 
 #
-# Macintosh device drivers
-#
-# CONFIG_MAC_EMUMOUSEBTN is not set
-
-#
 # Network device support
 #
 CONFIG_NETDEVICES=y
@@ -962,15 +950,7 @@
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_NET_SB1000 is not set
-
-#
-# ARCnet devices
-#
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
 CONFIG_PHYLIB=m
 
 #
@@ -1044,10 +1024,7 @@
 CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_RHINE_NAPI=y
 CONFIG_SC92031=m
-
-#
-# Ethernet (1000 Mbit)
-#
+CONFIG_NETDEV_1000=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_DL2K=m
@@ -1068,10 +1045,7 @@
 CONFIG_BNX2=m
 CONFIG_QLA3XXX=m
 CONFIG_ATL1=m
-
-#
-# Ethernet (10000 Mbit)
-#
+CONFIG_NETDEV_10000=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1_NAPI=y
@@ -1082,33 +1056,19 @@
 CONFIG_S2IO_NAPI=y
 CONFIG_MYRI10GE=m
 CONFIG_NETXEN_NIC=m
-
-#
-# Token Ring devices
-#
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
 # CONFIG_TR is not set
 
 #
-# Wireless LAN (non-hamradio)
+# Wireless LAN
 #
-CONFIG_NET_RADIO=y
-CONFIG_NET_WIRELESS_RTNETLINK=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
+CONFIG_WLAN_PRE80211=y
 CONFIG_STRIP=m
 CONFIG_PCMCIA_WAVELAN=m
 CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
+CONFIG_WLAN_80211=y
 CONFIG_PCMCIA_RAYCS=m
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
 # CONFIG_IPW2100_DEBUG is not set
@@ -1118,6 +1078,9 @@
 CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
 # CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+# CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1126,24 +1089,16 @@
 CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_PCMCIA_WL3501=m
-
-#
-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
-#
 CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
@@ -1156,11 +1111,32 @@
 # CONFIG_BCM43XX_PIO_MODE is not set
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_NET_WIRELESS=y
 
 #
-# PCMCIA network device support
+# USB Network Adapters
 #
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET_MII=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
 CONFIG_NET_PCMCIA=y
 CONFIG_PCMCIA_3C589=m
 CONFIG_PCMCIA_3C574=m
@@ -1170,10 +1146,6 @@
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_PCMCIA_AXNET=m
-
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -1209,6 +1181,7 @@
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -1234,13 +1207,26 @@
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
 CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
 # CONFIG_INPUT_ATLAS_BTNS is not set
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_UINPUT is not set
 
 #
@@ -1288,10 +1274,6 @@
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_INTEL=m
@@ -1299,7 +1281,6 @@
 CONFIG_HW_RANDOM_GEODE=m
 CONFIG_NVRAM=y
 CONFIG_RTC=y
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 CONFIG_AGP=y
@@ -1336,10 +1317,7 @@
 #
 # CONFIG_TCG_TPM is not set
 # CONFIG_TELCLOCK is not set
-
-#
-# I2C support
-#
+CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
 #
@@ -1352,12 +1330,7 @@
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
 # CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
 
 #
 # Multifunction device drivers
@@ -1368,25 +1341,32 @@
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_DAB is not set
 
 #
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-# CONFIG_USB_DABUSB is not set
-
-#
 # Graphics support
 #
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_PROGEAR is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+CONFIG_VGASTATE=m
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@@ -1404,10 +1384,12 @@
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_VGA16=m
 CONFIG_FB_VESA=y
+# CONFIG_FB_HECUBA is not set
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_RIVA is not set
+# CONFIG_FB_LE80578 is not set
 # CONFIG_FB_INTEL is not set
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON is not set
@@ -1420,7 +1402,10 @@
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
 # CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_VIRTUAL is not set
 
@@ -1436,10 +1421,6 @@
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
@@ -1530,7 +1511,9 @@
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
 CONFIG_SND_KORG1212=m
+# CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL is not set
 CONFIG_SND_MAESTRO3=m
+# CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL is not set
 CONFIG_SND_MIXART=m
 CONFIG_SND_NM256=m
 CONFIG_SND_PCXHR=m
@@ -1544,6 +1527,7 @@
 CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
+# CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL is not set
 CONFIG_SND_AC97_POWER_SAVE=y
 
 #
@@ -1551,6 +1535,8 @@
 #
 # CONFIG_SND_USB_AUDIO is not set
 # CONFIG_SND_USB_USX2Y is not set
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
 
 #
 # PCMCIA devices
@@ -1559,7 +1545,7 @@
 # CONFIG_SND_PDAUDIOCF is not set
 
 #
-# SoC audio support
+# System on Chip audio support
 #
 # CONFIG_SND_SOC is not set
 
@@ -1576,6 +1562,20 @@
 # CONFIG_HID_DEBUG is not set
 
 #
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+CONFIG_USB_HIDINPUT_POWERBOOK=y
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -1588,6 +1588,7 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
 # CONFIG_USB_OTG is not set
@@ -1636,63 +1637,10 @@
 # CONFIG_USB_LIBUSUAL is not set
 
 #
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-CONFIG_USB_HIDINPUT_POWERBOOK=y
-# CONFIG_HID_FF is not set
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_ACECAD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_POWERMATE is not set
-# CONFIG_USB_TOUCHSCREEN is not set
-# CONFIG_USB_YEALINK is not set
-# CONFIG_USB_XPAD is not set
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
-# CONFIG_USB_APPLETOUCH is not set
-# CONFIG_USB_GTCO is not set
-
-#
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET_MII=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_MON=y
 
 #
@@ -1786,10 +1734,6 @@
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
 # CONFIG_MMC is not set
 
 #
@@ -1811,6 +1755,7 @@
 CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
@@ -1819,6 +1764,7 @@
 # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
 CONFIG_INFINIBAND_CXGB3=m
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
+CONFIG_MLX4_INFINIBAND=m
 CONFIG_INFINIBAND_IPOIB=m
 # CONFIG_INFINIBAND_IPOIB_CM is not set
 CONFIG_INFINIBAND_IPOIB_DEBUG=y
@@ -1850,10 +1796,6 @@
 #
 
 #
-# Auxiliary Display support
-#
-
-#
 # Virtualization
 #
 # CONFIG_KVM is not set
@@ -1976,6 +1918,7 @@
 CONFIG_EXPORTFS=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
@@ -2064,7 +2007,6 @@
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=15
 CONFIG_DEBUG_BUGVERBOSE=y
 
 #
@@ -2095,6 +2037,7 @@
 CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_FCRYPT=m
 # CONFIG_CRYPTO_BLOWFISH is not set
@@ -2125,6 +2068,7 @@
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
+CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=y
 CONFIG_ZLIB_INFLATE=m
@@ -2137,3 +2081,4 @@
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y

Modified: branches/x86_64/packages/livecd-bootscripts/font-errors.dat
===================================================================
--- branches/x86_64/packages/livecd-bootscripts/font-errors.dat	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/livecd-bootscripts/font-errors.dat	2007-07-24 21:30:23 UTC (rev 1976)
@@ -1,4 +1,4 @@
 All non-ASCII characters will be treated as non-printable\nuntil you set locale to something other than "C".
-Some characters are missing from the console font.\nType "startx" to start the X session after login.
-Your language is supported in X window system only.\nType "startx" to start the X session after login.
+Some characters are missing from the console font.
+Your language is supported in X window system only.\nAs this CD does not include an X window system\nyour language is unsupported on this CD.\nPlease use the full LFS LiveCD.
 Your language is completely unsupported on this CD.\nIt is a bug, but we don't know how to fix it.\nPlease mail instructions to livecd at linuxfromscratch.org

Modified: branches/x86_64/packages/livecd-bootscripts/lang.dat
===================================================================
--- branches/x86_64/packages/livecd-bootscripts/lang.dat	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/livecd-bootscripts/lang.dat	2007-07-24 21:30:23 UTC (rev 1976)
@@ -63,6 +63,8 @@
 Spanish,_Mexico_(UTF-8)			es_MX.UTF-8	"la-latin1"	"iso-8859-1"	"la"			cp850
 Swedish_(ISO-8859-1)			sv_SE		"sv-latin1"	""		"se"			cp850
 Swedish_(UTF-8)				sv_SE.UTF-8	"sv-latin1"	"iso-8859-1"	"se"			cp850
+Thai_(TIS-620)				th_TH		"th-win-latin1"	""		"us,th"			cp874
+Thai_(UTF-8)				th_TH.UTF-8	"th-win-uni"	""		"us,th"			cp874
 Turkish,_F_keyboard_(ISO-8859-9)	tr_TR		"trf"		""		"tr_f"			cp857
 Turkish,_F_keyboard_(UTF-8)		tr_TR.UTF-8	"trf"		"iso-8859-9"	"tr_f"			cp857
 Turkish,_Q_keyboard_(ISO-8859-9)	tr_TR		"tr_q-latin5"	""		"tr"			cp857

Modified: branches/x86_64/packages/m4/Makefile
===================================================================
--- branches/x86_64/packages/m4/Makefile	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/m4/Makefile	2007-07-24 21:30:23 UTC (rev 1976)
@@ -1,12 +1,12 @@
 # M4 Makefile
 
 NM= m4
-VRS= 1.4.9
+VRS= 1.4.10
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://ftp.gnu.org/gnu/m4/$(FILE)
-SHA-$(FILE)= 28b8493688ceb752ee5a96ea8fc3a335cf44beb6
+SHA-$(FILE)= df46910c7e711aef1a654b077ef48d86a6a0cc6b
 
 # Targets
 

Modified: branches/x86_64/packages/man-pages/Makefile
===================================================================
--- branches/x86_64/packages/man-pages/Makefile	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/man-pages/Makefile	2007-07-24 21:30:23 UTC (rev 1976)
@@ -1,12 +1,12 @@
 # Man-pages Makefile
 
 NM= man-pages
-VRS= 2.60
+VRS= 2.62
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://www.kernel.org/pub/linux/docs/manpages/Archive/$(FILE)
-SHA-$(FILE)= 47204e409a52bf4bb9336301fc9178c4ecc6d99e
+SHA-$(FILE)= e75dacd3d330a882f0baa7f61828b898b514fb42
 
 # Targets
 

Modified: branches/x86_64/packages/net-firmware/Makefile
===================================================================
--- branches/x86_64/packages/net-firmware/Makefile	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/net-firmware/Makefile	2007-07-24 21:30:23 UTC (rev 1976)
@@ -63,6 +63,15 @@
 URL-$(FILE13)= ftp://symstore.longisland.com/Symstore/services_download/wirless_prod/$(FILE13)
 SHA-$(FILE13)= b597eb9afc23beca309e8e8001edd88e5521dd92
 
+FILE14= usb8388_A1_W8015FP14_FW2.bin
+URL-$(FILE14)= http://www.marvell.com/drivers/upload/$(FILE14)
+SHA-$(FILE14)= 5e351ab2ac01e8648a2012800ad2d67b06d2870e
+
+DIR15= stir4210_4220_4116_patch_files
+FILE15= $(DIR15).tar.gz
+URL-$(FILE15)= http://www.sigmatel.com/documents/$(FILE15)
+SHA-$(FILE15)= bee20b114e3f29c28819ec6a716472621bf6ac47
+
 ALLFILES= $(foreach FILE,$(sort $(filter FILE%,$(.VARIABLES))),$($(FILE)))
 
 # Targets
@@ -89,6 +98,8 @@
 	    cp $(DIR11)/zd* /lib/firmware/zd1211
 	@tar xf $(FILE12) ; cd $(DIR12) ; cp "../$(FILE13)" . ; \
 	    ./get_symbol_fw ; cp symbol_* /lib/firmware
+	@cp $(FILE14) /lib/firmware/usb8388.bin
+	@mkdir $(DIR15) ; cd $(DIR15) ; tar xf ../$(FILE15) ; install -m 644 *.sb /lib/firmware
 	@make clean
 	@touch $@
 

Modified: branches/x86_64/packages/pidgin/Makefile
===================================================================
--- branches/x86_64/packages/pidgin/Makefile	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/packages/pidgin/Makefile	2007-07-24 21:30:23 UTC (rev 1976)
@@ -21,7 +21,8 @@
 
 compile-stage2:
 	# D-BUS support is disabled because it wants Python
-	./configure --prefix=/usr --disable-dbus
+	# GTKui is disabled because we have no X
+	./configure --prefix=/usr --disable-dbus --disable-gtkui
 	make
 	make install
 	svn export --force $(ROOT)/root/.gaim /root/.gaim

Copied: branches/x86_64/root/.gaim (from rev 1964, branches/minimal/root/.gaim)

Modified: branches/x86_64/scripts/shutdown-helper
===================================================================
--- branches/x86_64/scripts/shutdown-helper	2007-07-24 15:53:12 UTC (rev 1975)
+++ branches/x86_64/scripts/shutdown-helper	2007-07-24 21:30:23 UTC (rev 1976)
@@ -36,7 +36,7 @@
 		;;
 esac
 
-if [ ! -b /dev/lfs-cd ] ; then
+if [ ! -b /dev/lfs-cd ] && [ ! -d /dev/shm/.partition ] ; then
 	# The CD has been loaded into RAM
 	$HALT
 	while true ; do sleep 1 ; done
@@ -45,6 +45,8 @@
 mkdir /dev/shm/old /dev/shm/proc /dev/shm/etc
 ln -s /proc/mounts /dev/shm/etc/mtab
 echo "$FILES" | cpio -pLd --quiet /dev/shm
+if [ -b /dev/lfs-cd ] ; then cp -RH /dev/lfs-cd /dev/shm/dev/lfs-cd ; fi
+
 cat >/dev/shm/sbin/init <<EOF
 #!/bin/sh
 




More information about the livecd mailing list