[Lunar-commits] r27024 - in lunar-iso/trunk: . conf initrd initrd/template/etc initrd/template/sbin isolinux kernels/conf/2.6 lunar-install/sbin scripts
Stefan Wold
ratler at lunar-linux.org
Sun Sep 14 08:16:51 CEST 2008
Author: ratler
Date: 2008-09-14 08:16:51 +0200 (Sun, 14 Sep 2008)
New Revision: 27024
Added:
lunar-iso/trunk/conf/initd.disable.list
lunar-iso/trunk/initrd/template/etc/group
lunar-iso/trunk/scripts/prebuild
Modified:
lunar-iso/trunk/Makefile
lunar-iso/trunk/NEWS
lunar-iso/trunk/README
lunar-iso/trunk/conf/base.list
lunar-iso/trunk/conf/config.in
lunar-iso/trunk/conf/extended.list
lunar-iso/trunk/conf/sources.list-2.6
lunar-iso/trunk/initrd/initrd.list
lunar-iso/trunk/initrd/initrd.list-2.6
lunar-iso/trunk/initrd/template/sbin/init
lunar-iso/trunk/isolinux/f1.txt
lunar-iso/trunk/isolinux/f2.txt
lunar-iso/trunk/isolinux/f3.txt
lunar-iso/trunk/isolinux/f4.txt
lunar-iso/trunk/isolinux/isolinux.cfg.in
lunar-iso/trunk/kernels/conf/2.6/base
lunar-iso/trunk/lunar-install/sbin/lunar-install
lunar-iso/trunk/scripts/aaa_base
lunar-iso/trunk/scripts/etc
lunar-iso/trunk/scripts/initrd
lunar-iso/trunk/scripts/isofs
lunar-iso/trunk/scripts/kernels
lunar-iso/trunk/scripts/proper
lunar-iso/trunk/scripts/rebuild
lunar-iso/trunk/scripts/unpack
Log:
HUGE commit!
Please read the NEWS file for details regarding this commit.
All changes in this commit are availble on 1.6.4-alpha3 codename 'Indiana Jones'
Modified: lunar-iso/trunk/Makefile
===================================================================
--- lunar-iso/trunk/Makefile 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/Makefile 2008-09-14 06:16:51 UTC (rev 27024)
@@ -60,6 +60,11 @@
@echo "Creating aaa_base.tar.bz2"
@scripts/aaa_base
+prebuild: prepare $(ISO_TARGET)/.prebuild
+$(ISO_TARGET)/.prebuild:
+ @echo "Running prebuild process"
+ @scripts/prebuild
+
rebuild: etc $(ISO_TARGET)/.rebuild
$(ISO_TARGET)/.rebuild:
@echo "Starting rebuild process"
@@ -70,7 +75,7 @@
@echo "Copying miscfiles"
@scripts/etc
-toolset: $(ISO_SOURCE)/template/moonbase.tar.bz2 $(ISO_SOURCE)/template/$(ISO_LUNAR_MODULE).tar.bz2
+toolset: prebuild $(ISO_SOURCE)/template/moonbase.tar.bz2 $(ISO_SOURCE)/template/$(ISO_LUNAR_MODULE).tar.bz2
$(ISO_SOURCE)/template/moonbase.tar.bz2 $(ISO_SOURCE)/template/$(ISO_LUNAR_MODULE).tar.bz2:
@echo "Getting a proper moonbase"
@scripts/toolset
@@ -108,8 +113,10 @@
clean:
umount BUILD/dev &> /dev/null || true
umount BUILD/proc &> /dev/null || true
+ umount BUILD/sys &> /dev/null || true
rm -rf BUILD
rm -rf initrd/BUILD initrd/initrd
+ rm -rf spool cache
rm -rf aaa_base aaa_dev
rm -rf memtest
rm -rf kernels/TAR kernels/*.tar.bz2 kernels/.kernels kernels/.initrd_kernels
Modified: lunar-iso/trunk/NEWS
===================================================================
--- lunar-iso/trunk/NEWS 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/NEWS 2008-09-14 06:16:51 UTC (rev 27024)
@@ -1,3 +1,60 @@
+20080914 1.6.4-alpha3 ratler
+ * Alpha release 3
+
+ - Fixed issue with packages showing up twice in state/lunar/packages
+ - udev should now install fine inside the BUILD chroot
+ - Remove bits/syscall.h before lin -c glibc since glibc does a file
+ and compare check during make install that decide it's unchanged
+ and not installing it
+ - scripts/aaa_base: Removed explicit kernel-headers-X.X from packages
+ file generation, kernel-headers are already listed in base.list-X.X
+ - Auto-generate copyright year for isolinux files
+ - Added rootdelay=10 to kernel options for isolinux, let usb settle
+ before probing for devices containing the installation
+ - Kernel config bumped to 2.6.26.5
+ - Initrd:
+ - Support booting installation from any media. For example you can
+ put syslinux on a usb stick and copy initrd and kernel from the
+ iso, and then put the iso it self on the usb-stick and boot away.
+ It's also possible to put the .iso in the root of any mountable
+ partition (a script will be available later to bootstrap this)
+ - No more udev/rules.d template, instead take rules.d from the installed
+ udev and wash them to make them work properly with the initrd
+ - Installer:
+ - Disable staticly defined mount point in fstab that match a user
+ defined mount point during partition selection (currently only /tmp)
+ - Further improvements to the language menu to also include territory
+ for each encoding
+ - Detect protected device (won't show up in the partition selection),
+ this is the device where the .iso reside for the alternative installation
+ method
+ - Added initd.disable.list file in conf/ that contain services that should
+ be disabled by default
+ - Added grub and md fixes from ElAngelo
+
+20080909 1.6.4-alpha2 ratler
+ * Alpha 1 & 2 release
+
+ - Updated initrd to support new udev
+ - Added udev rules.d files to template (Will automate this later)
+ - Updated font selection code in the installer
+ - Rewrote language menu in the installer, gather locales
+ from the current glibc install
+ - Module changes:
+ - vixie-cron -> cronie
+ - links2 -> links
+
+Unreleased moe
+ * Testing ISO
+
+ - Added make target precheck (to download all required sources)
+ - Added make target prebuild (to generate all build caches)
+ - Removed a couple of outdated packages
+ - Replaced iputils with inetutils (no docbook on the ISO)
+ - scripts/rebuild: Use mount --bind
+ - scripts/rebuild: Removed makedev
+ - scripts/rebuild: Added dependency cache generation
+
20070210 1.6.1 sofar
* Final release of 1.6.1 for both i686 and x86_64
Modified: lunar-iso/trunk/README
===================================================================
--- lunar-iso/trunk/README 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/README 2008-09-14 06:16:51 UTC (rev 27024)
@@ -47,11 +47,12 @@
Here's a brief explanation of the make targets:
+prepare download all the required sources
init setup the buildroot
dirs make LSB dirs and a few more needed
-moonbase fetch a copy of moonbase.tar.bz2 and install it
+toolset fetch a copy of moonbase.tar.bz2 and install it
unpack extract the cache tar.bz2's
-etcf copy the template files that are not provided by modules
+etc copy the template files that are not provided by modules
rebuild rebuild all modules at least once
aaa_base create a tarball with required but untracked files
aaa_dev create static device nodes needed by iso and initrd
Modified: lunar-iso/trunk/conf/base.list
===================================================================
--- lunar-iso/trunk/conf/base.list 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/conf/base.list 2008-09-14 06:16:51 UTC (rev 27024)
@@ -46,7 +46,6 @@
shadow
jfsutils
bash_static
-raidtools
findutils
pciutils
hdparm
@@ -57,7 +56,6 @@
zile
ntfsprogs
dosfstools
-tnftp
dhcpcd
wipe
dmidecode
Modified: lunar-iso/trunk/conf/config.in
===================================================================
--- lunar-iso/trunk/conf/config.in 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/conf/config.in 2008-09-14 06:16:51 UTC (rev 27024)
@@ -5,6 +5,10 @@
# copy this file to 'config' and edit your settings as needed
+# Which arch are we compiling for? Hint: i868 or x86-64
+
+ISO_ARCH = i686
+
# the ISO major version number
ISO_MAJOR = 1.6.2
Modified: lunar-iso/trunk/conf/extended.list
===================================================================
--- lunar-iso/trunk/conf/extended.list 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/conf/extended.list 2008-09-14 06:16:51 UTC (rev 27024)
@@ -1,7 +1,3 @@
-Python
-libxml2
-tcl
-libpthread-stubs
perl
m4
autoconf
@@ -20,16 +16,10 @@
dbus-glib
hal
hal-info
-tiff
-shared-mime-info
-gamin
intltool
-numpy
nasm
texinfo
flex
-dbh
-Time-HiRes
TimeDate
URI
binutils
@@ -51,7 +41,7 @@
iptables
ppp
xinetd
-iputils
+inetutils
check
lftp
make
@@ -60,22 +50,16 @@
rp-pppoe
pppconfig
nfs-utils
-links2
+links
lard
joe
irssi
gccmakedep
-irqbalance
-libdaemon
ifplugd
gcc
ccache
heirloom-mailx
pcmciautils
-alsa-lib
-alsa-utils
-vixie-cron
-microcode
-microcode_ctl
+cronie
netcat
usbutils
Added: lunar-iso/trunk/conf/initd.disable.list
===================================================================
--- lunar-iso/trunk/conf/initd.disable.list (rev 0)
+++ lunar-iso/trunk/conf/initd.disable.list 2008-09-14 06:16:51 UTC (rev 27024)
@@ -0,0 +1,5 @@
+nfs
+nfslock
+iptables
+xinetd
+portmap
Modified: lunar-iso/trunk/conf/sources.list-2.6
===================================================================
--- lunar-iso/trunk/conf/sources.list-2.6 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/conf/sources.list-2.6 2008-09-14 06:16:51 UTC (rev 27024)
@@ -1,6 +1,5 @@
linux-2.6
ndiswrapper
-ieee80211
-ipw3945
-ipw3945d
-ipw3945-ucode
+iwlwifi-3945-ucode
+iwlwifi-4965-ucode
+mc
Modified: lunar-iso/trunk/initrd/initrd.list
===================================================================
--- lunar-iso/trunk/initrd/initrd.list 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/initrd/initrd.list 2008-09-14 06:16:51 UTC (rev 27024)
@@ -1,10 +1,12 @@
bin/basename
bin/bash
bin/cat
+bin/cut
bin/echo
bin/grep
bin/ls
bin/mkdir
+bin/mknod
bin/mount
bin/more
bin/pgrep
Modified: lunar-iso/trunk/initrd/initrd.list-2.6
===================================================================
--- lunar-iso/trunk/initrd/initrd.list-2.6 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/initrd/initrd.list-2.6 2008-09-14 06:16:51 UTC (rev 27024)
@@ -1,17 +1,21 @@
-etc/udev/rules.d/05-udev-early.rules
-etc/udev/rules.d/75-persistent-net-generator.rules
-etc/udev/rules.d/95-udev-late.rules
-etc/udev/rules.d/50-udev.rules
-etc/udev/rules.d/60-cdrom_id.rules
-etc/udev/rules.d/60-persistent-storage.rules
-etc/udev/rules.d/60-persistent-input.rules
-etc/udev/rules.d/75-cd-aliases-generator.rules
-etc/udev/scripts.d/raid-devfs.sh
-etc/udev/udev.conf
lib/module-init-tools/bin/lsmod sbin/
lib/module-init-tools/sbin/depmod sbin/
lib/module-init-tools/sbin/insmod sbin/
lib/module-init-tools/sbin/modprobe sbin/
lib/module-init-tools/sbin/rmmod sbin/
-sbin/udevstart
+lib/udev/firmware.sh
+lib/udev/rule_generator.functions
+lib/udev/cdrom_id
+lib/udev/scsi_id
+lib/udev/usb_id
+lib/udev/ata_id
+lib/udev/create_floppy_devices
+lib/udev/vol_id
+lib/udev/path_id
+lib/udev/edd_id
+lib/udev/write_net_rules
+lib/udev/write_cd_rules
+lib/udev/fstab_import
+lib/udev/collect
+sbin/udevadm
sbin/udevd
Added: lunar-iso/trunk/initrd/template/etc/group
===================================================================
--- lunar-iso/trunk/initrd/template/etc/group (rev 0)
+++ lunar-iso/trunk/initrd/template/etc/group 2008-09-14 06:16:51 UTC (rev 27024)
@@ -0,0 +1 @@
+root:x:0:
Modified: lunar-iso/trunk/initrd/template/sbin/init
===================================================================
--- lunar-iso/trunk/initrd/template/sbin/init 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/initrd/template/sbin/init 2008-09-14 06:16:51 UTC (rev 27024)
@@ -3,7 +3,7 @@
#
# Parts (C) K. Sallee 2002
# Parts (C) K. Kongar 2002,2003
-# Parts (C) Lunar-Linux 2002-2007
+# Parts (C) Lunar-Linux 2002-2008
#
# This document is licensed under the GPL
#
@@ -16,6 +16,10 @@
esac
}
+is_lunar_iso()
+{
+ test -e /mnt/cdrom/.lunar-cd
+}
shell()
{
@@ -55,6 +59,14 @@
{
MODULES=$(discover --data-path=linux/module/name --format="%s" --data-version=`uname -r` fixeddisk optical removabledisk tape)
+ # Load filesystems and loop
+ IFS=$' \t\n'
+ FS_MOD="reiserfs fat vfat xfs iso9660 loop"
+ for i in $FS_MOD; do
+ modprobe $i 2> /dev/null
+ done
+ IFS=$'\t\n'
+
if [ -z "$1" ]; then
MODULES=`$DIALOG --inputbox "The following modules will be attempted to load. Press enter to load them, or edit the list manually. To cancel select 'Cancel'." 10 60 "$MODULES"`
fi
@@ -97,26 +109,66 @@
done
}
+scan_block_devices()
+{
+ cat /proc/partitions | sed -e '1,2d' -e 's; * ; ;g' | cut -d' ' -f5 | sed -e 's;^;/dev/;'
+}
scan_cdroms()
{
if [ -z "$LUNAR_CD" ]; then
DEVICES=$(for DEV in cdrom dvd {{hd,sd,ub}{a,b,c,d,e,f,g,h},s{r,g},cdroms/cdrom}{,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15} ; do if [ -e /dev/$DEV ]; then echo /dev/$DEV ; fi ; done)
- for DEVICE in $DEVICES; do
- mount -n -r $DEVICE /mnt -t iso9660 2>/dev/null
- if [ -e "/mnt/.lunar-cd" ]; then
- umount -n /mnt 2>/dev/null
+ for DEVICE in $DEVICES; do
+ mount -n -r $DEVICE /mnt/cdrom -t iso9660 2>/dev/null
+ if is_lunar_iso; then
+ umount -n /mnt/cdrom 2>/dev/null
LUNAR_CD=$DEVICE
break
else
(( COUNT++ ))
- umount -n /mnt 2>/dev/null
+ umount -n /mnt/cdrom 2>/dev/null
fi
done
fi
}
+mount_iso()
+{
+ local iso dev
+ iso=$1
+ if mount -n -t iso9660 -o loop,ro,exec $iso /mnt/cdrom 2> /dev/null; then
+ if is_lunar_iso; then
+ LUNAR_CD=$iso
+ OPTIONS="loop,ro,exec"
+ umount /mnt/cdrom 2> /dev/null
+ return
+ else
+ umount /mnt/cdrom 2> /dev/null
+ fi
+ fi
+}
+
+scan_for_iso()
+{
+ if [ -z "$LUNAR_CD" ]; then
+ DEVICES=$(scan_block_devices)
+ for dev in $DEVICES; do
+ if mount -n -t auto -o ro $dev /mnt/device 2> /dev/null; then
+ for iso in /mnt/device/*.iso /mnt/device/*.ISO; do
+ if [ -e $iso ]; then
+ mount_iso $iso
+ fi
+ if [ -n "$LUNAR_CD" ]; then
+ return
+ fi
+ done
+ fi
+ umount /mnt/device 2> /dev/null
+ done
+ fi
+}
+
show_filesystems()
{
for FILESYSTEM in `cat /proc/filesystems | grep -v nodev`; do
@@ -134,7 +186,29 @@
OPTIONS=`$DIALOG --nocancel --inputbox "Please enter mounting options" 10 60 "defaults,ro"`
}
+create_node()
+{
+ if [ ! -e "$2" ]; then
+ mknod -m "$1" "$2" "$3" "$4" "$5"
+ fi
+}
+init_udev()
+{
+ mount -n -t ramfs none /dev
+ create_node 600 /dev/console c 5 1
+ create_node 666 /dev/null c 1 3
+ create_node 660 /dev/ram0 b 1 0
+
+ for i in 0 1 2 3 4; do
+ create_node 600 /dev/tty"$i" c 5 "$i"
+ done
+ for i in 0 1 2 3; do
+ create_node 600 /dev/ttyS"$i" c 4 "$(($i + 64))"
+ done
+}
+
+
main_menu()
{
while
@@ -143,17 +217,18 @@
D_HELP="Continue boot process."
scan_cdroms
+ scan_for_iso
if [ -z "$LUNAR_CD" ] && [ -z "$ROOT" ]; then
- HELP="Load the additional PCI/IDE/SCSI kernel module(s) to be able to detect and read the Lunar-Linux CDROM."
- DEFAULT_ITEM="A"
- elif [ -z "$ROOT" ]; then
- HELP="Lunar-Linux Install/Rescue CDROM is detected on $LUNAR_CD"
- DEFAULT_ITEM="C"
- else
- HELP="You have selected to mount $ROOT as the root file system."
- DEFAULT_ITEM="C"
- fi
+ HELP="Load the additional PCI/IDE/SCSI kernel module(s) to be able to detect and read the Lunar-Linux CDROM."
+ DEFAULT_ITEM="A"
+ elif [ -z "$ROOT" ]; then
+ HELP="Lunar-Linux Install/Rescue CDROM is detected on $LUNAR_CD"
+ DEFAULT_ITEM="C"
+ else
+ HELP="You have selected to mount $ROOT as the root file system."
+ DEFAULT_ITEM="C"
+ fi
COMMAND=`$DIALOG --title "Initrd Menu" --nocancel --item-help \
--default-item "$DEFAULT_ITEM" --menu "$HELP" 0 0 0 \
@@ -175,7 +250,6 @@
}
-
main()
{
while true ; do
@@ -193,18 +267,17 @@
if [ -z "$OPTIONS" ]; then
OPTIONS="defaults,ro"
fi
-
- if mount -n -t $VFSTYPE -o $OPTIONS $ROOT /mnt && [ -x /mnt/sbin/init ]; then
+ if mount -n -t $VFSTYPE -o $OPTIONS $ROOT /mnt/cdrom && [ -x /mnt/cdrom/sbin/init ]; then
is_26 && pkill udevd || pkill devfsd
sleep 1
umount -n /dev
is_26 && umount -n /sys
umount -n /proc
- pivot_root /mnt /mnt
+ pivot_root /mnt/cdrom /mnt/cdrom
exec chroot / /sbin/init
else
$DIALOG --msgbox "Unable to locate /sbin/init on $ROOT." 0 0
- umount -n /mnt
+ umount -n /mnt/cdrom
main_menu $*
fi
done
@@ -213,12 +286,13 @@
skipinitrd()
{
- auto_load_modules fast
- scan_cdroms
- main $*
+ auto_load_modules fast
+ scan_cdroms
+ scan_for_iso
+
+ main $*
}
-
export PATH=/bin:/usr/bin:/sbin:/usr/sbin
export IFS=$'\t\n'
@@ -234,8 +308,10 @@
is_26 && (
mount -n -t sysfs sysfs /sys
- mount -n -t ramfs none /dev
- /sbin/udevstart
+ init_udev
+ /sbin/udevd --daemon
+ /sbin/udevadm trigger
+ /sbin/udevadm settle
) || (
mount -n -t devfs devfs /dev
devfsd /dev &
Modified: lunar-iso/trunk/isolinux/f1.txt
===================================================================
--- lunar-iso/trunk/isolinux/f1.txt 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/isolinux/f1.txt 2008-09-14 06:16:51 UTC (rev 27024)
@@ -1,7 +1,7 @@
Lunar-%VERSION%.iso, 0c%CODENAME% (%DATE%)07, kernel %KERNEL%
-0eWelcome07 to 05Lunar Linux07 Copyright (C) 2007 by the
+0eWelcome07 to 05Lunar Linux07 Copyright (C) %COPYRIGHTYEAR% by the
09Lunar-Linux team <maintainer at lunar-linux.org>07
All Rights Reserved.
Modified: lunar-iso/trunk/isolinux/f2.txt
===================================================================
--- lunar-iso/trunk/isolinux/f2.txt 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/isolinux/f2.txt 2008-09-14 06:16:51 UTC (rev 27024)
@@ -1,7 +1,7 @@
Lunar-%VERSION%.iso, 0c%CODENAME% (%DATE%)07, kernel %KERNEL%
-0eWelcome07 to 05Lunar Linux07 Copyright (C) 2007 by the
+0eWelcome07 to 05Lunar Linux07 Copyright (C) %COPYRIGHTYEAR% by the
09Lunar-Linux team <maintainer at lunar-linux.org>07
All Rights Reserved.
Modified: lunar-iso/trunk/isolinux/f3.txt
===================================================================
--- lunar-iso/trunk/isolinux/f3.txt 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/isolinux/f3.txt 2008-09-14 06:16:51 UTC (rev 27024)
@@ -1,7 +1,7 @@
Lunar-%VERSION%.iso, 0c%CODENAME% (%DATE%)07, kernel %KERNEL%
-0eWelcome07 to 05Lunar Linux07 Copyright (C) 2007 by the
+0eWelcome07 to 05Lunar Linux07 Copyright (C) %COPYRIGHTYEAR% by the
09Lunar-Linux team <maintainer at lunar-linux.org>07
All Rights Reserved.
Modified: lunar-iso/trunk/isolinux/f4.txt
===================================================================
--- lunar-iso/trunk/isolinux/f4.txt 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/isolinux/f4.txt 2008-09-14 06:16:51 UTC (rev 27024)
@@ -1,7 +1,7 @@
Lunar-%VERSION%.iso, 0c%CODENAME% (%DATE%)07, kernel %KERNEL%
-0eWelcome07 to 05Lunar Linux07 Copyright (C) 2007 by the
+0eWelcome07 to 05Lunar Linux07 Copyright (C) %COPYRIGHTYEAR% by the
09Lunar-Linux team <maintainer at lunar-linux.org>07
All Rights Reserved.
Modified: lunar-iso/trunk/isolinux/isolinux.cfg.in
===================================================================
--- lunar-iso/trunk/isolinux/isolinux.cfg.in 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/isolinux/isolinux.cfg.in 2008-09-14 06:16:51 UTC (rev 27024)
@@ -1,5 +1,5 @@
DEFAULT install
-APPEND read-only load_ramdisk=1 ramdisk_size=INITRDSIZE initrd=initrd root=/dev/ram0 prompt_ramdisk=0
+APPEND read-only load_ramdisk=1 ramdisk_size=INITRDSIZE initrd=initrd root=/dev/ram0 prompt_ramdisk=0 rootdelay=10
DISPLAY f1.txt
TIMEOUT 600
PROMPT 1
@@ -14,7 +14,7 @@
F9 f1.txt
LABEL install
KERNEL linux
- APPEND read-only load_ramdisk=1 ramdisk_size=INITRDSIZE initrd=initrd root=/dev/ram0 prompt_ramdisk=0 vga=ask skipinitrd
+ APPEND read-only load_ramdisk=1 ramdisk_size=INITRDSIZE initrd=initrd root=/dev/ram0 prompt_ramdisk=0 vga=ask rootdelay=10 skipinitrd
LABEL linux
KERNEL linux
APPEND read-only load_ramdisk=1 ramdisk_size=INITRDSIZE initrd=initrd root=/dev/ram0 prompt_ramdisk=0 vga=ask
Modified: lunar-iso/trunk/kernels/conf/2.6/base
===================================================================
--- lunar-iso/trunk/kernels/conf/2.6/base 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/kernels/conf/2.6/base 2008-09-14 06:16:51 UTC (rev 27024)
@@ -1,9 +1,14 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23.1
-# Wed Nov 14 21:30:50 2007
+# Linux kernel version: 2.6.26.5
+# Wed Sep 10 22:09:50 2008
#
+# CONFIG_64BIT is not set
CONFIG_X86_32=y
+# CONFIG_X86_64 is not set
+CONFIG_X86=y
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+# CONFIG_GENERIC_LOCKBREAK is not set
CONFIG_GENERIC_TIME=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_CLOCKSOURCE_WATCHDOG=y
@@ -11,17 +16,43 @@
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_SEMAPHORE_SLEEPERS=y
-CONFIG_X86=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_FAST_CMPXCHG_LOCAL=y
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
-CONFIG_QUICKLIST=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_HWEIGHT=y
+# CONFIG_GENERIC_GPIO is not set
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_DMI=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+# CONFIG_GENERIC_TIME_VSYSCALL is not set
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# CONFIG_ZONE_DMA32 is not set
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+# CONFIG_AUDIT_ARCH is not set
+CONFIG_ARCH_SUPPORTS_AOUT=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_X86_SMP=y
+CONFIG_X86_32_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_BIOS_REBOOT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_KTIME_SCALAR=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
@@ -39,15 +70,27 @@
CONFIG_BSD_PROCESS_ACCT=y
# CONFIG_BSD_PROCESS_ACCT_V3 is not set
# CONFIG_TASKSTATS is not set
-# CONFIG_USER_NS is not set
CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_TREE=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=15
-# CONFIG_CPUSETS is not set
+# CONFIG_CGROUPS is not set
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_GROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
# CONFIG_RELAY is not set
+CONFIG_NAMESPACES=y
+# CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -55,18 +98,22 @@
# CONFIG_EMBEDDED is not set
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_ALL=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
CONFIG_HOTPLUG=y
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_COMPAT_BRK=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_VM_EVENT_COUNTERS=y
@@ -74,10 +121,21 @@
# CONFIG_SLAB is not set
CONFIG_SLUB=y
# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+# CONFIG_MARKERS is not set
+CONFIG_OPROFILE=m
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_MODVERSIONS is not set
@@ -102,6 +160,8 @@
CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_CLASSIC_RCU=y
#
# Processor type and features
@@ -109,6 +169,7 @@
CONFIG_TICK_ONESHOT=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_SMP=y
CONFIG_X86_PC=y
# CONFIG_X86_ELAN is not set
@@ -119,7 +180,10 @@
# CONFIG_X86_VISWS is not set
# CONFIG_X86_GENERICARCH is not set
# CONFIG_X86_ES7000 is not set
-# CONFIG_PARAVIRT is not set
+# CONFIG_X86_RDC321X is not set
+# CONFIG_X86_VSMP is not set
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+# CONFIG_PARAVIRT_GUEST is not set
# CONFIG_M386 is not set
# CONFIG_M486 is not set
# CONFIG_M586 is not set
@@ -129,7 +193,6 @@
# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMIII is not set
# CONFIG_MPENTIUMM is not set
-# CONFIG_MCORE2 is not set
# CONFIG_MPENTIUM4 is not set
# CONFIG_MK6 is not set
# CONFIG_MK7 is not set
@@ -144,14 +207,14 @@
# CONFIG_MCYRIXIII is not set
# CONFIG_MVIAC3_2 is not set
# CONFIG_MVIAC7 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_GENERIC_CPU is not set
# CONFIG_X86_GENERIC is not set
+CONFIG_X86_CPU=y
CONFIG_X86_CMPXCHG=y
CONFIG_X86_L1_CACHE_SHIFT=5
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
-CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_X86_PPRO_FENCE=y
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_INVLPG=y
@@ -159,18 +222,22 @@
CONFIG_X86_POPAD_OK=y
CONFIG_X86_GOOD_APIC=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_P6_NOP=y
CONFIG_X86_TSC=y
CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=4
+CONFIG_X86_MINIMUM_CPU_FAMILY=6
+CONFIG_X86_DEBUGCTLMSR=y
CONFIG_HPET_TIMER=y
CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+# CONFIG_IOMMU_HELPER is not set
CONFIG_NR_CPUS=8
CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
-CONFIG_PREEMPT_BKL=y
+# CONFIG_PREEMPT_RCU is not set
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_MCE=y
@@ -184,15 +251,6 @@
CONFIG_MICROCODE_OLD_INTERFACE=y
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-CONFIG_EFI_VARS=m
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
# CONFIG_NOHIGHMEM is not set
CONFIG_HIGHMEM4G=y
# CONFIG_HIGHMEM64G is not set
@@ -201,7 +259,6 @@
CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -209,24 +266,26 @@
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_SPARSEMEM_STATIC=y
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_RESOURCES_64BIT=y
CONFIG_ZONE_DMA_FLAG=1
CONFIG_BOUNCE=y
-CONFIG_NR_QUICK=1
CONFIG_VIRT_TO_BUS=y
# CONFIG_HIGHPTE is not set
# CONFIG_MATH_EMULATION is not set
CONFIG_MTRR=y
+# CONFIG_X86_PAT is not set
CONFIG_EFI=y
# CONFIG_IRQBALANCE is not set
-CONFIG_BOOT_IOREMAP=y
CONFIG_SECCOMP=y
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
# CONFIG_HZ_300 is not set
CONFIG_HZ_1000=y
CONFIG_HZ=1000
+CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x100000
@@ -237,21 +296,21 @@
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
#
-# Power management options (ACPI, APM)
+# Power management options
#
CONFIG_PM=y
-CONFIG_PM_LEGACY=y
# CONFIG_PM_DEBUG is not set
CONFIG_PM_SLEEP_SMP=y
CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND_SMP_POSSIBLE=y
CONFIG_SUSPEND=y
-CONFIG_HIBERNATION_SMP_POSSIBLE=y
+CONFIG_SUSPEND_FREEZER=y
CONFIG_HIBERNATION=y
CONFIG_PM_STD_PARTITION=""
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_SYSFS_POWER=y
CONFIG_ACPI_PROC_EVENT=y
CONFIG_ACPI_AC=y
CONFIG_ACPI_BATTERY=y
@@ -263,8 +322,10 @@
CONFIG_ACPI_PROCESSOR=y
CONFIG_ACPI_HOTPLUG_CPU=y
CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_WMI=m
CONFIG_ACPI_ASUS=m
CONFIG_ACPI_TOSHIBA=m
+# CONFIG_ACPI_CUSTOM_DSDT is not set
CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_EC=y
@@ -283,8 +344,11 @@
# CONFIG_CPU_FREQ_DEBUG is not set
CONFIG_CPU_FREQ_STAT=y
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=m
CONFIG_CPU_FREQ_GOV_USERSPACE=m
@@ -313,35 +377,38 @@
#
# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
# CONFIG_X86_SPEEDSTEP_LIB is not set
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
#
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
+# Bus options (PCI etc.)
#
CONFIG_PCI=y
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GOMMCONFIG is not set
# CONFIG_PCI_GODIRECT is not set
+# CONFIG_PCI_GOOLPC is not set
CONFIG_PCI_GOANY=y
CONFIG_PCI_BIOS=y
CONFIG_PCI_DIRECT=y
CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_DOMAINS=y
CONFIG_PCIEPORTBUS=y
CONFIG_HOTPLUG_PCI_PCIE=m
-# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
CONFIG_PCIEAER=y
+# CONFIG_PCIEASPM is not set
CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCI_MSI=y
+CONFIG_PCI_LEGACY=y
# CONFIG_PCI_DEBUG is not set
CONFIG_HT_IRQ=y
CONFIG_ISA_DMA_API=y
# CONFIG_ISA is not set
# CONFIG_MCA is not set
# CONFIG_SCx200 is not set
+# CONFIG_OLPC is not set
CONFIG_K8_NB=y
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
CONFIG_PCCARD=y
# CONFIG_PCMCIA_DEBUG is not set
CONFIG_PCMCIA=m
@@ -371,7 +438,7 @@
# CONFIG_HOTPLUG_PCI_SHPC is not set
#
-# Executable file formats
+# Executable file formats / Emulations
#
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_AOUT=m
@@ -392,6 +459,7 @@
CONFIG_XFRM_USER=m
# CONFIG_XFRM_SUB_POLICY is not set
# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
CONFIG_NET_KEY=m
# CONFIG_NET_KEY_MIGRATE is not set
CONFIG_INET=y
@@ -416,6 +484,7 @@
CONFIG_INET_XFRM_MODE_TRANSPORT=m
CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=m
CONFIG_INET_DIAG=m
CONFIG_INET_TCP_DIAG=m
CONFIG_TCP_CONG_ADVANCED=y
@@ -485,11 +554,14 @@
CONFIG_INET6_XFRM_MODE_BEET=m
CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
CONFIG_IPV6_TUNNEL=m
# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
# CONFIG_NETWORK_SECMARK is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
CONFIG_BRIDGE_NETFILTER=y
#
@@ -498,11 +570,11 @@
CONFIG_NETFILTER_NETLINK=m
CONFIG_NETFILTER_NETLINK_QUEUE=m
CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK_ENABLED=m
CONFIG_NF_CONNTRACK=m
CONFIG_NF_CT_ACCT=y
CONFIG_NF_CONNTRACK_MARK=y
# CONFIG_NF_CONNTRACK_EVENTS is not set
+CONFIG_NF_CT_PROTO_DCCP=m
CONFIG_NF_CT_PROTO_GRE=m
# CONFIG_NF_CT_PROTO_SCTP is not set
CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -524,8 +596,10 @@
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
CONFIG_NETFILTER_XT_TARGET_TRACE=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
@@ -535,21 +609,25 @@
CONFIG_NETFILTER_XT_MATCH_DSCP=m
CONFIG_NETFILTER_XT_MATCH_ESP=m
CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
CONFIG_NETFILTER_XT_MATCH_MAC=m
CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_SCTP=m
CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
CONFIG_NETFILTER_XT_MATCH_U32=m
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
@@ -560,13 +638,10 @@
CONFIG_NF_CONNTRACK_PROC_COMPAT=y
CONFIG_IP_NF_QUEUE=m
CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_TOS=m
CONFIG_IP_NF_MATCH_RECENT=m
CONFIG_IP_NF_MATCH_ECN=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_OWNER=m
CONFIG_IP_NF_MATCH_ADDRTYPE=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
@@ -577,9 +652,10 @@
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_SAME=m
CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
CONFIG_NF_NAT_FTP=m
CONFIG_NF_NAT_IRC=m
CONFIG_NF_NAT_TFTP=m
@@ -588,7 +664,6 @@
CONFIG_NF_NAT_H323=m
CONFIG_NF_NAT_SIP=m
CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
CONFIG_IP_NF_TARGET_ECN=m
CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_NF_TARGET_CLUSTERIP=m
@@ -598,7 +673,7 @@
CONFIG_IP_NF_ARP_MANGLE=m
#
-# IPv6: Netfilter Configuration (EXPERIMENTAL)
+# IPv6: Netfilter Configuration
#
CONFIG_NF_CONNTRACK_IPV6=m
CONFIG_IP6_NF_QUEUE=m
@@ -607,7 +682,6 @@
CONFIG_IP6_NF_MATCH_OPTS=m
CONFIG_IP6_NF_MATCH_FRAG=m
CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_OWNER=m
CONFIG_IP6_NF_MATCH_IPV6HEADER=m
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_MH=m
@@ -638,9 +712,9 @@
CONFIG_IP_DCCP_CCID2=m
# CONFIG_IP_DCCP_CCID2_DEBUG is not set
CONFIG_IP_DCCP_CCID3=m
-CONFIG_IP_DCCP_TFRC_LIB=m
# CONFIG_IP_DCCP_CCID3_DEBUG is not set
CONFIG_IP_DCCP_CCID3_RTO=100
+CONFIG_IP_DCCP_TFRC_LIB=m
#
# DCCP Kernel Hacking
@@ -678,12 +752,7 @@
# CONFIG_ECONET_AUNUDP is not set
# CONFIG_ECONET_NATIVE is not set
CONFIG_WAN_ROUTER=m
-
-#
-# QoS and/or fair queueing
-#
CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_FIFO=y
#
# Queueing/Scheduling
@@ -693,7 +762,6 @@
CONFIG_NET_SCH_HFSC=m
CONFIG_NET_SCH_ATM=m
CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_RR=m
CONFIG_NET_SCH_RED=m
CONFIG_NET_SCH_SFQ=m
CONFIG_NET_SCH_TEQL=m
@@ -717,6 +785,7 @@
CONFIG_CLS_U32_MARK=y
CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_STACK=32
CONFIG_NET_EMATCH_CMP=m
@@ -730,16 +799,18 @@
CONFIG_GACT_PROB=y
CONFIG_NET_ACT_MIRRED=m
CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
CONFIG_NET_ACT_SIMP=m
-# CONFIG_NET_CLS_POLICE is not set
CONFIG_NET_CLS_IND=y
+CONFIG_NET_SCH_FIFO=y
#
# Network testing
#
CONFIG_NET_PKTGEN=m
# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
CONFIG_IRDA=m
#
@@ -771,16 +842,10 @@
#
# CONFIG_DONGLE is not set
CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
#
-# Old SIR device drivers
-#
-
-#
-# Old Serial dongle support
-#
-
-#
# FIR device drivers
#
CONFIG_USB_IRDA=m
@@ -808,9 +873,11 @@
#
CONFIG_BT_HCIUSB=m
# CONFIG_BT_HCIUSB_SCO is not set
+CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIUART=m
# CONFIG_BT_HCIUART_H4 is not set
# CONFIG_BT_HCIUART_BCSP is not set
+# CONFIG_BT_HCIUART_LL is not set
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
@@ -827,18 +894,37 @@
# Wireless
#
CONFIG_CFG80211=m
+CONFIG_NL80211=y
CONFIG_WIRELESS_EXT=y
CONFIG_MAC80211=m
+
+#
+# Rate control algorithm selection
+#
+CONFIG_MAC80211_RC_DEFAULT_PID=y
+# CONFIG_MAC80211_RC_DEFAULT_NONE is not set
+
+#
+# Selecting 'y' for an algorithm will
+#
+
+#
+# build the algorithm into mac80211.
+#
+CONFIG_MAC80211_RC_DEFAULT="pid"
+CONFIG_MAC80211_RC_PID=y
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
# CONFIG_MAC80211_DEBUG is not set
CONFIG_IEEE80211=m
# CONFIG_IEEE80211_DEBUG is not set
CONFIG_IEEE80211_CRYPT_WEP=m
CONFIG_IEEE80211_CRYPT_CCMP=m
CONFIG_IEEE80211_CRYPT_TKIP=m
-CONFIG_IEEE80211_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
CONFIG_RFKILL=y
CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_LEDS=y
# CONFIG_NET_9P is not set
#
@@ -848,6 +934,7 @@
#
# Generic Driver Options
#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
@@ -863,6 +950,7 @@
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# CONFIG_MTD_AR7_PARTS is not set
#
# User Modules And Translation Layers
@@ -877,6 +965,7 @@
CONFIG_INFTL=m
CONFIG_RFD_FTL=m
CONFIG_SSFDC=m
+# CONFIG_MTD_OOPS is not set
#
# RAM/ROM/Flash chip drivers
@@ -911,7 +1000,6 @@
CONFIG_MTD_PHYSMAP_START=0x8000000
CONFIG_MTD_PHYSMAP_LEN=0x4000000
CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-CONFIG_MTD_PNC2000=m
CONFIG_MTD_SC520CDP=m
CONFIG_MTD_NETSC520=m
CONFIG_MTD_TS5500=m
@@ -924,6 +1012,7 @@
CONFIG_MTD_DILNETPC=m
CONFIG_MTD_DILNETPC_BOOTSIZE=0x80000
CONFIG_MTD_L440GX=m
+# CONFIG_MTD_INTEL_VR_NOR is not set
CONFIG_MTD_PLATRAM=m
#
@@ -962,9 +1051,12 @@
CONFIG_MTD_NAND_CS553X=m
# CONFIG_MTD_NAND_NANDSIM is not set
CONFIG_MTD_NAND_PLATFORM=m
+# CONFIG_MTD_ALAUDA is not set
CONFIG_MTD_ONENAND=m
# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
# CONFIG_MTD_ONENAND_OTP is not set
+# CONFIG_MTD_ONENAND_2X_PROGRAM is not set
+# CONFIG_MTD_ONENAND_SIM is not set
#
# UBI - Unsorted block images
@@ -1041,7 +1133,7 @@
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_BLK_DEV_XIP is not set
CONFIG_CDROM_PKTCDVD=y
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -1053,13 +1145,22 @@
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
+CONFIG_ACER_WMI=m
CONFIG_ASUS_LAPTOP=m
+CONFIG_FUJITSU_LAPTOP=m
+CONFIG_TC1100_WMI=m
CONFIG_MSI_LAPTOP=m
CONFIG_SONY_LAPTOP=m
# CONFIG_SONYPI_COMPAT is not set
CONFIG_THINKPAD_ACPI=m
# CONFIG_THINKPAD_ACPI_DEBUG is not set
CONFIG_THINKPAD_ACPI_BAY=y
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_INTEL_MENLOW=m
+# CONFIG_EEEPC_LAPTOP is not set
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
#
@@ -1082,6 +1183,7 @@
# CONFIG_BLK_DEV_SR_VENDOR is not set
CONFIG_CHR_DEV_SG=y
CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
#
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -1097,11 +1199,15 @@
#
CONFIG_SCSI_SPI_ATTRS=y
CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_FC_TGT_ATTRS=y
CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_SAS_ATTRS=y
CONFIG_SCSI_SAS_LIBSAS=y
CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_SRP_TGT_ATTRS=y
CONFIG_SCSI_LOWLEVEL=y
CONFIG_ISCSI_TCP=m
CONFIG_BLK_DEV_3W_XXXX_RAID=y
@@ -1126,6 +1232,7 @@
CONFIG_SCSI_DPT_I2O=m
CONFIG_SCSI_ADVANSYS=m
CONFIG_SCSI_ARCMSR=m
+# CONFIG_SCSI_ARCMSR_AER is not set
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
@@ -1133,7 +1240,7 @@
CONFIG_MEGARAID_SAS=m
CONFIG_SCSI_HPTIOP=m
CONFIG_SCSI_BUSLOGIC=y
-# CONFIG_SCSI_OMIT_FLASHPOINT is not set
+# CONFIG_SCSI_FLASHPOINT is not set
CONFIG_SCSI_DMX3191D=m
CONFIG_SCSI_EATA=y
# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
@@ -1148,6 +1255,7 @@
CONFIG_SCSI_IMM=m
# CONFIG_SCSI_IZIP_EPP16 is not set
# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_MVSAS=y
CONFIG_SCSI_STEX=m
CONFIG_SCSI_SYM53C8XX_2=y
CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
@@ -1175,7 +1283,10 @@
CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_ATA_ACPI=y
+CONFIG_SATA_PMP=y
CONFIG_SATA_AHCI=y
+CONFIG_SATA_SIL24=y
+CONFIG_ATA_SFF=y
CONFIG_SATA_SVW=y
CONFIG_ATA_PIIX=y
CONFIG_SATA_MV=y
@@ -1185,12 +1296,12 @@
CONFIG_SATA_PROMISE=y
CONFIG_SATA_SX4=y
CONFIG_SATA_SIL=y
-CONFIG_SATA_SIL24=y
CONFIG_SATA_SIS=y
CONFIG_SATA_ULI=m
CONFIG_SATA_VIA=y
CONFIG_SATA_VITESSE=y
CONFIG_SATA_INIC162X=m
+CONFIG_PATA_ACPI=y
CONFIG_PATA_ALI=y
CONFIG_PATA_AMD=y
CONFIG_PATA_ARTOP=m
@@ -1200,6 +1311,7 @@
CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_CS5535=m
+CONFIG_PATA_CS5536=m
CONFIG_PATA_CYPRESS=m
CONFIG_PATA_EFAR=m
CONFIG_ATA_GENERIC=y
@@ -1216,7 +1328,9 @@
CONFIG_PATA_MPIIX=y
CONFIG_PATA_OLDPIIX=y
CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
CONFIG_PATA_NS87410=m
+CONFIG_PATA_NS87415=m
CONFIG_PATA_OPTI=m
CONFIG_PATA_OPTIDMA=m
CONFIG_PATA_PCMCIA=m
@@ -1230,6 +1344,7 @@
CONFIG_PATA_SIS=y
CONFIG_PATA_VIA=y
CONFIG_PATA_WINBOND=y
+CONFIG_PATA_SCH=y
CONFIG_MD=y
CONFIG_BLK_DEV_MD=y
CONFIG_MD_LINEAR=y
@@ -1248,10 +1363,7 @@
# CONFIG_DM_ZERO is not set
# CONFIG_DM_MULTIPATH is not set
CONFIG_DM_DELAY=m
-
-#
-# Fusion MPT device support
-#
+# CONFIG_DM_UEVENT is not set
CONFIG_FUSION=y
CONFIG_FUSION_SPI=y
CONFIG_FUSION_FC=m
@@ -1263,32 +1375,25 @@
#
# IEEE 1394 (FireWire) support
#
+
+#
+# Enable only one of the two stacks, unless you know what you are doing
+#
CONFIG_FIREWIRE=m
CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_OHCI_DEBUG=y
CONFIG_FIREWIRE_SBP2=m
CONFIG_IEEE1394=m
-
-#
-# Subsystem Options
-#
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-
-#
-# Controllers
-#
+CONFIG_IEEE1394_OHCI1394=m
CONFIG_IEEE1394_PCILYNX=m
-CONFIG_IEEE1394_OHCI1394=m
-
-#
-# Protocols
-#
-CONFIG_IEEE1394_VIDEO1394=m
CONFIG_IEEE1394_SBP2=m
# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_VIDEO1394=m
CONFIG_IEEE1394_DV1394=m
-CONFIG_IEEE1394_RAWIO=m
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
# CONFIG_I2O is not set
# CONFIG_MACINTOSH_DRIVERS is not set
CONFIG_NETDEVICES=y
@@ -1299,6 +1404,7 @@
CONFIG_MACVLAN=m
# CONFIG_EQUALIZER is not set
CONFIG_TUN=m
+CONFIG_VETH=m
# CONFIG_NET_SB1000 is not set
# CONFIG_ARCNET is not set
CONFIG_PHYLIB=m
@@ -1315,9 +1421,8 @@
CONFIG_SMSC_PHY=m
CONFIG_BROADCOM_PHY=m
CONFIG_ICPLUS_PHY=m
-CONFIG_FIXED_PHY=m
-# CONFIG_FIXED_MII_10_FDX is not set
-# CONFIG_FIXED_MII_100_FDX is not set
+CONFIG_REALTEK_PHY=m
+CONFIG_MDIO_BITBANG=m
CONFIG_NET_ETHERNET=y
CONFIG_MII=y
# CONFIG_HAPPYMEAL is not set
@@ -1327,18 +1432,23 @@
CONFIG_VORTEX=m
CONFIG_TYPHOON=m
# CONFIG_NET_TULIP is not set
-# CONFIG_HP100 is not set
+CONFIG_HP100=m
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
CONFIG_NET_PCI=y
CONFIG_PCNET32=m
-# CONFIG_PCNET32_NAPI is not set
CONFIG_AMD8111_ETH=m
# CONFIG_AMD8111E_NAPI is not set
CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADAPTEC_STARFIRE_NAPI is not set
CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
CONFIG_FORCEDETH=m
# CONFIG_FORCEDETH_NAPI is not set
-CONFIG_DGRS=m
# CONFIG_EEPRO100 is not set
CONFIG_E100=m
CONFIG_FEALNX=m
@@ -1350,6 +1460,7 @@
# CONFIG_8139TOO_TUNE_TWISTER is not set
# CONFIG_8139TOO_8129 is not set
# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R6040=m
CONFIG_SIS900=m
CONFIG_EPIC100=m
CONFIG_SUNDANCE=m
@@ -1367,6 +1478,10 @@
CONFIG_E1000=m
CONFIG_E1000_NAPI=y
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+CONFIG_E1000E=m
+CONFIG_E1000E_ENABLED=y
+CONFIG_IP1000=m
+CONFIG_IGB=m
CONFIG_NS83820=m
CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m
@@ -1376,7 +1491,6 @@
CONFIG_SIS190=m
CONFIG_SKGE=m
CONFIG_SKY2=m
-CONFIG_SK98LIN=m
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
CONFIG_BNX2=m
@@ -1387,13 +1501,18 @@
CONFIG_CHELSIO_T1_1G=y
CONFIG_CHELSIO_T1_NAPI=y
CONFIG_CHELSIO_T3=m
+CONFIG_IXGBE=m
CONFIG_IXGB=m
# CONFIG_IXGB_NAPI is not set
CONFIG_S2IO=m
# CONFIG_S2IO_NAPI is not set
CONFIG_MYRI10GE=m
CONFIG_NETXEN_NIC=m
+CONFIG_NIU=m
# CONFIG_MLX4_CORE is not set
+CONFIG_TEHUTI=m
+CONFIG_BNX2X=m
+# CONFIG_SFC is not set
# CONFIG_TR is not set
#
@@ -1416,6 +1535,8 @@
# CONFIG_IPW2200_DEBUG is not set
CONFIG_LIBERTAS=m
CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
# CONFIG_LIBERTAS_DEBUG is not set
CONFIG_AIRO=m
CONFIG_HERMES=m
@@ -1423,30 +1544,84 @@
CONFIG_TMD_HERMES=m
CONFIG_NORTEL_HERMES=m
CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
CONFIG_ATMEL=m
CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_PCMCIA_ATMEL=m
CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_ATMEL=m
CONFIG_PCMCIA_WL3501=m
CONFIG_PRISM54=m
CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8180=m
CONFIG_RTL8187=m
+CONFIG_ADM8211=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+CONFIG_IWLWIFI=m
+CONFIG_IWLCORE=m
+CONFIG_IWLWIFI_LEDS=y
+# CONFIG_IWLWIFI_RFKILL is not set
+CONFIG_IWL4965=m
+CONFIG_IWL4965_HT=y
+CONFIG_IWL4965_LEDS=y
+CONFIG_IWL4965_SPECTRUM_MEASUREMENT=y
+CONFIG_IWL4965_SENSITIVITY=y
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWL3945=m
+CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
+CONFIG_IWL3945_LEDS=y
+# CONFIG_IWL3945_DEBUG is not set
CONFIG_HOSTAP=m
# CONFIG_HOSTAP_FIRMWARE is not set
CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m
CONFIG_HOSTAP_CS=m
-CONFIG_BCM43XX=m
-CONFIG_BCM43XX_DEBUG=y
-CONFIG_BCM43XX_DMA=y
-CONFIG_BCM43XX_PIO=y
-CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_DMA_MODE is not set
-# CONFIG_BCM43XX_PIO_MODE is not set
+CONFIG_B43=m
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+# CONFIG_B43_PCMCIA is not set
+CONFIG_B43_LEDS=y
+CONFIG_B43_RFKILL=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_RFKILL=y
+CONFIG_B43LEGACY_DEBUG=y
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_RT2X00=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_RFKILL=y
+CONFIG_RT2X00_LIB_LEDS=y
+CONFIG_RT2400PCI=m
+CONFIG_RT2400PCI_RFKILL=y
+CONFIG_RT2400PCI_LEDS=y
+CONFIG_RT2500PCI=m
+CONFIG_RT2500PCI_RFKILL=y
+CONFIG_RT2500PCI_LEDS=y
+CONFIG_RT61PCI=m
+CONFIG_RT61PCI_RFKILL=y
+CONFIG_RT61PCI_LEDS=y
+CONFIG_RT2500USB=m
+CONFIG_RT2500USB_LEDS=y
+CONFIG_RT73USB=m
+CONFIG_RT73USB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
#
# USB Network Adapters
@@ -1455,7 +1630,6 @@
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
@@ -1517,8 +1691,8 @@
# CONFIG_SLIP is not set
CONFIG_SLHC=m
# CONFIG_NET_FC is not set
-# CONFIG_SHAPER is not set
CONFIG_NETCONSOLE=m
+# CONFIG_NETCONSOLE_DYNAMIC is not set
CONFIG_NETPOLL=y
# CONFIG_NETPOLL_TRAP is not set
CONFIG_NET_POLL_CONTROLLER=y
@@ -1540,9 +1714,6 @@
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_TSDEV=m
-CONFIG_INPUT_TSDEV_SCREEN_X=240
-CONFIG_INPUT_TSDEV_SCREEN_Y=320
CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_EVBUG is not set
@@ -1586,6 +1757,7 @@
# CONFIG_JOYSTICK_SPACEBALL is not set
# CONFIG_JOYSTICK_STINGER is not set
# CONFIG_JOYSTICK_TWIDJOY is not set
+# CONFIG_JOYSTICK_ZHENHUA is not set
# CONFIG_JOYSTICK_DB9 is not set
# CONFIG_JOYSTICK_GAMECON is not set
# CONFIG_JOYSTICK_TURBOGRAFX is not set
@@ -1609,6 +1781,7 @@
# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
+# CONFIG_TOUCHSCREEN_WM97XX is not set
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
CONFIG_TOUCHSCREEN_USB_EGALAX=y
CONFIG_TOUCHSCREEN_USB_PANJIT=y
@@ -1618,8 +1791,12 @@
CONFIG_TOUCHSCREEN_USB_GUNZE=y
CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_APANEL=m
CONFIG_INPUT_WISTRON_BTNS=m
CONFIG_INPUT_ATLAS_BTNS=m
CONFIG_INPUT_ATI_REMOTE=m
@@ -1653,7 +1830,9 @@
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVKMEM=y
# CONFIG_SERIAL_NONSTANDARD is not set
+CONFIG_NOZOMI=m
#
# Serial drivers
@@ -1680,87 +1859,21 @@
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
# CONFIG_PPDEV is not set
-# CONFIG_TIPAR is not set
CONFIG_IPMI_HANDLER=m
# CONFIG_IPMI_PANIC_EVENT is not set
CONFIG_IPMI_DEVICE_INTERFACE=m
CONFIG_IPMI_SI=m
CONFIG_IPMI_WATCHDOG=m
CONFIG_IPMI_POWEROFF=m
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-# CONFIG_ACQUIRE_WDT is not set
-# CONFIG_ADVANTECH_WDT is not set
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_SC520_WDT=m
-# CONFIG_EUROTECH_WDT is not set
-# CONFIG_IB700_WDT is not set
-CONFIG_IBMASR=m
-# CONFIG_WAFER_WDT is not set
-CONFIG_I6300ESB_WDT=m
-CONFIG_ITCO_WDT=m
-# CONFIG_ITCO_VENDOR_SUPPORT is not set
-# CONFIG_SC1200_WDT is not set
-CONFIG_PC87413_WDT=m
-# CONFIG_60XX_WDT is not set
-# CONFIG_SBC8360_WDT is not set
-# CONFIG_CPU5_WDT is not set
-CONFIG_SMSC37B787_WDT=m
-# CONFIG_W83627HF_WDT is not set
-CONFIG_W83697HF_WDT=m
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set
-# CONFIG_MACHZ_WDT is not set
-# CONFIG_SBC_EPX_C3_WATCHDOG is not set
-
-#
-# PCI-based Watchdog Cards
-#
-# CONFIG_PCIPCWATCHDOG is not set
-# CONFIG_WDTPCI is not set
-
-#
-# USB-based Watchdog Cards
-#
-# CONFIG_USBPCWATCHDOG is not set
CONFIG_HW_RANDOM=m
CONFIG_HW_RANDOM_INTEL=m
CONFIG_HW_RANDOM_AMD=m
CONFIG_HW_RANDOM_GEODE=m
CONFIG_HW_RANDOM_VIA=m
CONFIG_NVRAM=m
-CONFIG_RTC=y
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
CONFIG_SONYPI=m
-CONFIG_AGP=y
-CONFIG_AGP_ALI=m
-CONFIG_AGP_ATI=m
-CONFIG_AGP_AMD=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_NVIDIA=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_SWORKS=m
-CONFIG_AGP_VIA=m
-CONFIG_AGP_EFFICEON=m
-CONFIG_DRM=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_I810=m
-CONFIG_DRM_I830=m
-CONFIG_DRM_I915=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
#
# PCMCIA character devices
@@ -1768,28 +1881,27 @@
# CONFIG_SYNCLINK_CS is not set
# CONFIG_CARDMAN_4000 is not set
# CONFIG_CARDMAN_4040 is not set
+CONFIG_IPWIRELESS=m
# CONFIG_MWAVE is not set
CONFIG_PC8736x_GPIO=m
CONFIG_NSC_GPIO=m
CONFIG_CS5535_GPIO=m
# CONFIG_RAW_DRIVER is not set
CONFIG_HPET=y
-# CONFIG_HPET_RTC_IRQ is not set
CONFIG_HPET_MMAP=y
CONFIG_HANGCHECK_TIMER=m
-# CONFIG_TCG_TPM is not set
+CONFIG_TCG_TPM=m
+CONFIG_TCG_TIS=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
# CONFIG_TELCLOCK is not set
CONFIG_DEVPORT=y
CONFIG_I2C=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=m
-
-#
-# I2C Algorithms
-#
+CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ALGOPCA=m
#
# I2C Hardware Bus support
@@ -1820,16 +1932,15 @@
CONFIG_I2C_VIA=m
CONFIG_I2C_VIAPRO=m
CONFIG_I2C_VOODOO3=m
+# CONFIG_I2C_PCA_PLATFORM is not set
#
# Miscellaneous I2C Chip support
#
-CONFIG_SENSORS_DS1337=m
-CONFIG_SENSORS_DS1374=m
CONFIG_DS1682=m
CONFIG_SENSORS_EEPROM=m
CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCA9539=m
+CONFIG_PCF8575=m
CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_MAX6875=m
CONFIG_SENSORS_TSL2550=m
@@ -1837,12 +1948,7 @@
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
# CONFIG_I2C_DEBUG_CHIP is not set
-
-#
-# SPI support
-#
# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
CONFIG_W1=m
CONFIG_W1_CON=y
@@ -1876,16 +1982,24 @@
CONFIG_SENSORS_ADM1029=m
CONFIG_SENSORS_ADM1031=m
CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7473=m
CONFIG_SENSORS_K8TEMP=y
CONFIG_SENSORS_ASB100=m
CONFIG_SENSORS_ATXP1=m
CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
CONFIG_SENSORS_FSCHER=m
CONFIG_SENSORS_FSCPOS=m
+CONFIG_SENSORS_FSCHMD=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
CONFIG_SENSORS_CORETEMP=y
+# CONFIG_SENSORS_IBMAEM is not set
+CONFIG_SENSORS_IBMPEX=m
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_LM63=m
CONFIG_SENSORS_LM75=m
@@ -1907,6 +2021,7 @@
CONFIG_SENSORS_SMSC47M1=m
CONFIG_SENSORS_SMSC47M192=m
CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_ADS7828=m
CONFIG_SENSORS_THMC50=m
CONFIG_SENSORS_VIA686A=m
CONFIG_SENSORS_VT1211=m
@@ -1916,24 +2031,128 @@
CONFIG_SENSORS_W83792D=m
CONFIG_SENSORS_W83793=m
CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
CONFIG_SENSORS_W83627HF=m
CONFIG_SENSORS_W83627EHF=m
CONFIG_SENSORS_HDAPS=m
CONFIG_SENSORS_APPLESMC=m
# CONFIG_HWMON_DEBUG_CHIP is not set
+CONFIG_THERMAL=y
+# CONFIG_THERMAL_HWMON is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_ADVANTECH_WDT is not set
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_SC520_WDT=m
+# CONFIG_EUROTECH_WDT is not set
+# CONFIG_IB700_WDT is not set
+CONFIG_IBMASR=m
+# CONFIG_WAFER_WDT is not set
+CONFIG_I6300ESB_WDT=m
+CONFIG_ITCO_WDT=m
+# CONFIG_ITCO_VENDOR_SUPPORT is not set
+CONFIG_IT8712F_WDT=m
+CONFIG_HP_WATCHDOG=m
+# CONFIG_SC1200_WDT is not set
+CONFIG_PC87413_WDT=m
+# CONFIG_60XX_WDT is not set
+# CONFIG_SBC8360_WDT is not set
+CONFIG_SBC7240_WDT=m
+# CONFIG_CPU5_WDT is not set
+CONFIG_SMSC37B787_WDT=m
+# CONFIG_W83627HF_WDT is not set
+CONFIG_W83697HF_WDT=m
+# CONFIG_W83877F_WDT is not set
+# CONFIG_W83977F_WDT is not set
+# CONFIG_MACHZ_WDT is not set
+# CONFIG_SBC_EPX_C3_WATCHDOG is not set
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+# CONFIG_SSB_PCMCIAHOST is not set
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+
+#
# Multifunction device drivers
#
CONFIG_MFD_SM501=m
+# CONFIG_HTC_PASIC3 is not set
#
# Multimedia devices
#
+
+#
+# Multimedia core support
+#
CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_VIDEO_ALLOW_V4L1=y
CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_V4L2=y
+CONFIG_DVB_CORE=m
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+# CONFIG_MEDIA_ATTACH is not set
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L1=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_IR_I2C=m
+CONFIG_VIDEO_IR=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
@@ -1945,8 +2164,10 @@
CONFIG_VIDEO_TEA6420=m
CONFIG_VIDEO_MSP3400=m
CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_M52790=m
CONFIG_VIDEO_WM8775=m
CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
CONFIG_VIDEO_BT819=m
CONFIG_VIDEO_BT856=m
CONFIG_VIDEO_KS0127=m
@@ -1955,6 +2176,7 @@
CONFIG_VIDEO_SAA7111=m
CONFIG_VIDEO_SAA7114=m
CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_SAA717X=m
CONFIG_VIDEO_TVP5150=m
CONFIG_VIDEO_VPX3220=m
CONFIG_VIDEO_CX25840=m
@@ -1967,17 +2189,16 @@
CONFIG_VIDEO_UPD64083=m
CONFIG_VIDEO_VIVI=m
CONFIG_VIDEO_BT848=m
-# CONFIG_VIDEO_BT848_DVB is not set
-# CONFIG_VIDEO_SAA6588 is not set
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_SAA6588=m
CONFIG_VIDEO_BWQCAM=m
CONFIG_VIDEO_CQCAM=m
CONFIG_VIDEO_CPIA=m
-# CONFIG_VIDEO_CPIA_USB is not set
+CONFIG_VIDEO_CPIA_USB=m
CONFIG_VIDEO_CPIA2=m
CONFIG_VIDEO_SAA5246A=m
CONFIG_VIDEO_SAA5249=m
CONFIG_TUNER_3036=m
-# CONFIG_TUNER_TEA5761 is not set
CONFIG_VIDEO_STRADIS=m
CONFIG_VIDEO_ZORAN_ZR36060=m
CONFIG_VIDEO_ZORAN=m
@@ -1990,24 +2211,30 @@
CONFIG_VIDEO_MEYE=m
CONFIG_VIDEO_SAA7134=m
CONFIG_VIDEO_SAA7134_ALSA=m
-# CONFIG_VIDEO_SAA7134_DVB is not set
+CONFIG_VIDEO_SAA7134_DVB=m
CONFIG_VIDEO_MXB=m
CONFIG_VIDEO_DPC=m
CONFIG_VIDEO_HEXIUM_ORION=m
CONFIG_VIDEO_HEXIUM_GEMINI=m
CONFIG_VIDEO_CX88=m
-# CONFIG_VIDEO_CX88_ALSA is not set
+CONFIG_VIDEO_CX88_ALSA=m
CONFIG_VIDEO_CX88_BLACKBIRD=m
-# CONFIG_VIDEO_CX88_DVB is not set
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX23885=m
+# CONFIG_VIDEO_AU0828 is not set
CONFIG_VIDEO_IVTV=m
+# CONFIG_VIDEO_CX18 is not set
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_V4L_USB_DRIVERS=y
+# CONFIG_USB_VIDEO_CLASS is not set
CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_29XXX=y
-CONFIG_VIDEO_PVRUSB2_24XXX=y
CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+# CONFIG_VIDEO_EM28XX_DVB is not set
CONFIG_VIDEO_USBVISION=m
CONFIG_VIDEO_USBVIDEO=m
CONFIG_USB_VICAM=m
@@ -2025,20 +2252,23 @@
CONFIG_USB_PWC=m
# CONFIG_USB_PWC_DEBUG is not set
CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+# CONFIG_SOC_CAMERA is not set
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_GEMTEK_PCI=m
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_MAESTRO=m
CONFIG_USB_DSBR=m
-CONFIG_DVB_CORE=m
-# CONFIG_DVB_CORE_ATTACH is not set
+CONFIG_USB_SI470X=m
CONFIG_DVB_CAPTURE_DRIVERS=y
#
# Supported SAA7146 based PCI Adapters
#
+CONFIG_TTPCI_EEPROM=m
CONFIG_DVB_AV7110=m
CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
CONFIG_DVB_BUDGET=m
CONFIG_DVB_BUDGET_CI=m
CONFIG_DVB_BUDGET_AV=m
@@ -2050,7 +2280,8 @@
CONFIG_DVB_USB=m
# CONFIG_DVB_USB_DEBUG is not set
CONFIG_DVB_USB_A800=m
-# CONFIG_DVB_USB_DIBUSB_MB is not set
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
CONFIG_DVB_USB_DIBUSB_MC=m
CONFIG_DVB_USB_DIB0700=m
CONFIG_DVB_USB_UMT_010=m
@@ -2103,14 +2334,17 @@
#
# DVB-S (satellite) frontends
#
-CONFIG_DVB_STV0299=m
CONFIG_DVB_CX24110=m
CONFIG_DVB_CX24123=m
-CONFIG_DVB_TDA8083=m
CONFIG_DVB_MT312=m
-CONFIG_DVB_VES1X93=m
CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_TDA8083=m
CONFIG_DVB_TDA10086=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
#
# DVB-T (terrestrial) frontends
@@ -2128,6 +2362,7 @@
CONFIG_DVB_DIB3000MC=m
CONFIG_DVB_DIB7000M=m
CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
#
# DVB-C (cable) frontends
@@ -2145,39 +2380,57 @@
CONFIG_DVB_OR51132=m
CONFIG_DVB_BCM3510=m
CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_S5H1409=m
+# CONFIG_DVB_AU8522 is not set
+CONFIG_DVB_S5H1411=m
#
-# Tuners/PLL support
+# Digital terrestrial only tuners/PLL
#
CONFIG_DVB_PLL=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TDA827X=m
-CONFIG_DVB_TUNER_QT1010=m
-CONFIG_DVB_TUNER_MT2060=m
+CONFIG_DVB_TUNER_DIB0070=m
#
-# Miscellaneous devices
+# SEC control devices for DVB-S
#
CONFIG_DVB_LNBP21=m
+# CONFIG_DVB_ISL6405 is not set
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_TUA6100=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_BUF=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR_I2C=m
-CONFIG_VIDEO_IR=m
-CONFIG_VIDEO_TVEEPROM=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
#
# Graphics support
#
+CONFIG_AGP=y
+CONFIG_AGP_ALI=m
+CONFIG_AGP_ATI=m
+CONFIG_AGP_AMD=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_NVIDIA=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_SWORKS=m
+CONFIG_AGP_VIA=m
+CONFIG_AGP_EFFICEON=m
+CONFIG_DRM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_I810=m
+CONFIG_DRM_I830=m
+CONFIG_DRM_I915=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_FB is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CORGI=m
CONFIG_BACKLIGHT_PROGEAR=m
#
@@ -2188,9 +2441,6 @@
#
# Display hardware drivers
#
-# CONFIG_VGASTATE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-# CONFIG_FB is not set
#
# Console display driver support
@@ -2220,17 +2470,17 @@
CONFIG_SND_PCM_OSS=y
CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_RTCTIMER=y
-CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
# CONFIG_SND_DYNAMIC_MINORS is not set
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_VERBOSE_PRINTK is not set
# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
#
# Generic devices
#
+# CONFIG_SND_PCSP is not set
CONFIG_SND_MPU401_UART=m
CONFIG_SND_OPL3_LIB=m
CONFIG_SND_VX_LIB=m
@@ -2257,14 +2507,17 @@
CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m
+# CONFIG_SND_AW2 is not set
CONFIG_SND_AZT3328=m
CONFIG_SND_BT87X=m
# CONFIG_SND_BT87X_OVERCLOCK is not set
CONFIG_SND_CA0106=m
CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
CONFIG_SND_CS4281=m
CONFIG_SND_CS46XX=m
-# CONFIG_SND_CS46XX_NEW_DSP is not set
+CONFIG_SND_CS46XX_NEW_DSP=y
CONFIG_SND_CS5530=m
CONFIG_SND_CS5535AUDIO=m
CONFIG_SND_DARLA20=m
@@ -2288,8 +2541,21 @@
CONFIG_SND_FM801=m
# CONFIG_SND_FM801_TEA575X_BOOL is not set
CONFIG_SND_HDA_INTEL=m
+# CONFIG_SND_HDA_HWDEP is not set
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_ATIHDMI=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_GENERIC=y
+CONFIG_SND_HDA_POWER_SAVE=y
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
+CONFIG_SND_HIFIER=m
CONFIG_SND_ICE1712=m
CONFIG_SND_ICE1724=m
CONFIG_SND_INTEL8X0=m
@@ -2305,14 +2571,17 @@
CONFIG_SND_RME32=m
CONFIG_SND_RME96=m
CONFIG_SND_RME9652=m
+CONFIG_SND_SIS7019=m
CONFIG_SND_SONICVIBES=m
CONFIG_SND_TRIDENT=m
CONFIG_SND_VIA82XX=m
CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
CONFIG_SND_VX222=m
CONFIG_SND_YMFPCI=m
CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y
CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
#
# USB devices
@@ -2334,10 +2603,14 @@
CONFIG_SND_SOC=m
#
-# SoC Audio support for SuperH
+# ALSA SoC audio for Freescale SOCs
#
#
+# SoC Audio for the Texas Instruments OMAP
+#
+
+#
# Open Sound System
#
# CONFIG_SOUND_PRIME is not set
@@ -2345,6 +2618,7 @@
CONFIG_HID_SUPPORT=y
CONFIG_HID=y
# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
#
# USB Input Devices
@@ -2359,6 +2633,7 @@
CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB=y
# CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
#
# Miscellaneous USB options
@@ -2367,17 +2642,18 @@
CONFIG_USB_DEVICE_CLASS=y
# CONFIG_USB_DYNAMIC_MINORS is not set
CONFIG_USB_SUSPEND=y
-# CONFIG_USB_PERSIST is not set
# CONFIG_USB_OTG is not set
#
# USB Host Controller Drivers
#
+CONFIG_USB_C67X00_HCD=m
CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_ISP1760_HCD=m
+# CONFIG_USB_ISP1760_PCI is not set
CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -2385,7 +2661,7 @@
CONFIG_USB_UHCI_HCD=y
CONFIG_USB_U132_HCD=m
CONFIG_USB_SL811_HCD=m
-# CONFIG_USB_SL811_CS is not set
+CONFIG_USB_SL811_CS=m
CONFIG_USB_R8A66597_HCD=m
#
@@ -2393,6 +2669,7 @@
#
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
+# CONFIG_USB_WDM is not set
#
# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -2405,13 +2682,16 @@
# CONFIG_USB_STORAGE_DEBUG is not set
CONFIG_USB_STORAGE_DATAFAB=y
CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
CONFIG_USB_STORAGE_DPCM=y
CONFIG_USB_STORAGE_USBAT=y
CONFIG_USB_STORAGE_SDDR09=y
CONFIG_USB_STORAGE_SDDR55=y
CONFIG_USB_STORAGE_JUMPSHOT=y
CONFIG_USB_STORAGE_ALAUDA=y
-# CONFIG_USB_STORAGE_KARMA is not set
+CONFIG_USB_STORAGE_ONETOUCH=y
+CONFIG_USB_STORAGE_KARMA=y
+CONFIG_USB_STORAGE_CYPRESS_ATACB=y
# CONFIG_USB_LIBUSUAL is not set
#
@@ -2425,16 +2705,14 @@
# USB port drivers
#
CONFIG_USB_USS720=m
-
-#
-# USB Serial Converter support
-#
CONFIG_USB_SERIAL=m
+CONFIG_USB_EZUSB=y
# CONFIG_USB_SERIAL_GENERIC is not set
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_AIRPRIME=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
+# CONFIG_USB_SERIAL_CH341 is not set
CONFIG_USB_SERIAL_WHITEHEAT=m
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
CONFIG_USB_SERIAL_CP2101=m
@@ -2449,6 +2727,7 @@
CONFIG_USB_SERIAL_EDGEPORT_TI=m
CONFIG_USB_SERIAL_GARMIN=m
CONFIG_USB_SERIAL_IPW=m
+# CONFIG_USB_SERIAL_IUU is not set
CONFIG_USB_SERIAL_KEYSPAN_PDA=m
CONFIG_USB_SERIAL_KEYSPAN=m
# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
@@ -2468,9 +2747,11 @@
CONFIG_USB_SERIAL_MCT_U232=m
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
+# CONFIG_USB_SERIAL_MOTOROLA is not set
CONFIG_USB_SERIAL_NAVMAN=m
CONFIG_USB_SERIAL_PL2303=m
CONFIG_USB_SERIAL_OTI6858=m
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
CONFIG_USB_SERIAL_HP4X=m
CONFIG_USB_SERIAL_SAFE=m
# CONFIG_USB_SERIAL_SAFE_PADDED is not set
@@ -2481,7 +2762,6 @@
CONFIG_USB_SERIAL_OPTION=m
CONFIG_USB_SERIAL_OMNINET=m
# CONFIG_USB_SERIAL_DEBUG is not set
-CONFIG_USB_EZUSB=y
#
# USB Miscellaneous drivers
@@ -2510,29 +2790,24 @@
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
-
-#
-# USB DSL modem support
-#
+# CONFIG_USB_ISIGHTFW is not set
CONFIG_USB_ATM=m
CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
CONFIG_USB_UEAGLEATM=m
CONFIG_USB_XUSBATM=m
-
-#
-# USB Gadget Support
-#
CONFIG_USB_GADGET=m
# CONFIG_USB_GADGET_DEBUG is not set
# CONFIG_USB_GADGET_DEBUG_FILES is not set
CONFIG_USB_GADGET_SELECTED=y
# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_ATMEL_USBA is not set
# CONFIG_USB_GADGET_FSL_USB2 is not set
CONFIG_USB_GADGET_NET2280=y
CONFIG_USB_NET2280=m
# CONFIG_USB_GADGET_PXA2XX is not set
# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_PXA27X is not set
# CONFIG_USB_GADGET_GOKU is not set
# CONFIG_USB_GADGET_LH7A40X is not set
# CONFIG_USB_GADGET_OMAP is not set
@@ -2548,33 +2823,43 @@
# CONFIG_USB_FILE_STORAGE_TEST is not set
CONFIG_USB_G_SERIAL=m
CONFIG_USB_MIDI_GADGET=m
-CONFIG_MMC=y
+# CONFIG_USB_G_PRINTER is not set
+CONFIG_MMC=m
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
#
# MMC/SD Card Drivers
#
-CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
#
# MMC/SD Host Controller Drivers
#
-CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_RICOH_MMC=m
CONFIG_MMC_WBSD=m
CONFIG_MMC_TIFM_SD=m
+# CONFIG_MEMSTICK is not set
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=m
#
# LED drivers
#
+# CONFIG_LEDS_CLEVO_MAIL is not set
#
# LED Triggers
#
-# CONFIG_LEDS_TRIGGERS is not set
+CONFIG_LEDS_TRIGGERS=y
+# CONFIG_LEDS_TRIGGER_TIMER is not set
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+# CONFIG_ACCESSIBILITY is not set
# CONFIG_INFINIBAND is not set
# CONFIG_EDAC is not set
CONFIG_RTC_LIB=m
@@ -2593,6 +2878,7 @@
# I2C RTC drivers
#
CONFIG_RTC_DRV_DS1307=m
+# CONFIG_RTC_DRV_DS1374 is not set
CONFIG_RTC_DRV_DS1672=m
CONFIG_RTC_DRV_MAX6900=m
CONFIG_RTC_DRV_RS5C372=m
@@ -2602,6 +2888,8 @@
CONFIG_RTC_DRV_PCF8583=m
CONFIG_RTC_DRV_M41T80=m
# CONFIG_RTC_DRV_M41T80_WDT is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
#
# SPI RTC drivers
@@ -2611,9 +2899,10 @@
# Platform RTC drivers
#
CONFIG_RTC_DRV_CMOS=m
+# CONFIG_RTC_DRV_DS1511 is not set
CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_DS1742=m
CONFIG_RTC_DRV_M48T86=m
CONFIG_RTC_DRV_M48T59=m
CONFIG_RTC_DRV_V3020=m
@@ -2621,35 +2910,37 @@
#
# on-CPU RTC drivers
#
+CONFIG_DMADEVICES=y
#
-# DMA Engine support
+# DMA Devices
#
+CONFIG_INTEL_IOATDMA=m
CONFIG_DMA_ENGINE=y
#
# DMA Clients
#
CONFIG_NET_DMA=y
-
-#
-# DMA Devices
-#
-CONFIG_INTEL_IOATDMA=m
+CONFIG_DCA=m
CONFIG_AUXDISPLAY=y
CONFIG_KS0108=m
CONFIG_KS0108_PORT=0x378
CONFIG_KS0108_DELAY=2
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=y
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
+CONFIG_UIO=y
+CONFIG_UIO_CIF=m
+# CONFIG_UIO_SMX is not set
#
-# Userspace I/O
+# Firmware Drivers
#
-CONFIG_UIO=y
-CONFIG_UIO_CIF=m
+CONFIG_EDD=m
+# CONFIG_EDD_OFF is not set
+CONFIG_EFI_VARS=m
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+# CONFIG_ISCSI_IBFT_FIND is not set
#
# File systems
@@ -2668,10 +2959,9 @@
CONFIG_EXT4DEV_FS_POSIX_ACL=y
CONFIG_EXT4DEV_FS_SECURITY=y
CONFIG_JBD=y
-# CONFIG_JBD_DEBUG is not set
CONFIG_JBD2=m
CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=y
+CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
CONFIG_REISERFS_PROC_INFO=y
CONFIG_REISERFS_FS_XATTR=y
@@ -2685,22 +2975,22 @@
CONFIG_FS_POSIX_ACL=y
CONFIG_XFS_FS=m
CONFIG_XFS_QUOTA=y
-CONFIG_XFS_SECURITY=y
CONFIG_XFS_POSIX_ACL=y
# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
CONFIG_GFS2_FS=m
CONFIG_GFS2_FS_LOCKING_NOLOCK=m
CONFIG_GFS2_FS_LOCKING_DLM=m
# CONFIG_OCFS2_FS is not set
-CONFIG_MINIX_FS=m
-# CONFIG_ROMFS_FS is not set
+CONFIG_DNOTIFY=y
CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
CONFIG_QUOTA=y
+# CONFIG_QUOTA_NETLINK_INTERFACE is not set
+CONFIG_PRINT_QUOTA_WARNING=y
CONFIG_QFMT_V1=y
CONFIG_QFMT_V2=y
CONFIG_QUOTACTL=y
-CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=m
@@ -2738,7 +3028,6 @@
CONFIG_TMPFS_POSIX_ACL=y
# CONFIG_HUGETLBFS is not set
# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
CONFIG_CONFIGFS_FS=m
#
@@ -2755,33 +3044,33 @@
CONFIG_JFFS2_FS=m
CONFIG_JFFS2_FS_DEBUG=0
CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
# CONFIG_JFFS2_SUMMARY is not set
CONFIG_JFFS2_FS_XATTR=y
CONFIG_JFFS2_FS_POSIX_ACL=y
CONFIG_JFFS2_FS_SECURITY=y
# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
CONFIG_JFFS2_RTIME=y
# CONFIG_JFFS2_RUBIN is not set
CONFIG_CRAMFS=m
# CONFIG_VXFS_FS is not set
+CONFIG_MINIX_FS=m
CONFIG_HPFS_FS=m
# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
# CONFIG_SYSV_FS is not set
CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
# CONFIG_UFS_DEBUG is not set
-
-#
-# Network File Systems
-#
+CONFIG_NETWORK_FILESYSTEMS=y
# CONFIG_NFS_FS is not set
CONFIG_NFSD=m
CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
-CONFIG_NFSD_TCP=y
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
@@ -2820,10 +3109,6 @@
# CONFIG_KARMA_PARTITION is not set
# CONFIG_EFI_PARTITION is not set
# CONFIG_SYSV68_PARTITION is not set
-
-#
-# Native Language Support
-#
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="iso8859-1"
CONFIG_NLS_CODEPAGE_437=m
@@ -2864,23 +3149,17 @@
CONFIG_NLS_KOI8_R=m
CONFIG_NLS_KOI8_U=m
CONFIG_NLS_UTF8=m
-
-#
-# Distributed Lock Manager
-#
CONFIG_DLM=m
# CONFIG_DLM_DEBUG is not set
-CONFIG_INSTRUMENTATION=y
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-# CONFIG_KPROBES is not set
#
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
# CONFIG_MAGIC_SYSRQ is not set
CONFIG_UNUSED_SYMBOLS=y
# CONFIG_DEBUG_FS is not set
@@ -2891,7 +3170,9 @@
CONFIG_SCHED_DEBUG=y
CONFIG_SCHEDSTATS=y
CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
CONFIG_DEBUG_PREEMPT=y
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_RT_MUTEX_TESTER is not set
@@ -2902,28 +3183,48 @@
# CONFIG_LOCK_STAT is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_HIGHMEM is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
# CONFIG_DEBUG_LIST is not set
-# CONFIG_FRAME_POINTER is not set
-CONFIG_FORCED_INLINING=y
+# CONFIG_DEBUG_SG is not set
+CONFIG_FRAME_POINTER=y
+# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
# CONFIG_FAULT_INJECTION is not set
+CONFIG_LATENCYTOP=y
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+# CONFIG_NONPROMISC_DEVMEM is not set
CONFIG_EARLY_PRINTK=y
# CONFIG_DEBUG_STACKOVERFLOW is not set
# CONFIG_DEBUG_STACK_USAGE is not set
-
-#
-# Page alloc debug is incompatible with Software Suspend on i386
-#
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_X86_PTDUMP is not set
# CONFIG_DEBUG_RODATA is not set
+# CONFIG_DEBUG_NX_TEST is not set
# CONFIG_4KSTACKS is not set
CONFIG_X86_FIND_SMP_CONFIG=y
CONFIG_X86_MPPARSE=y
CONFIG_DOUBLEFAULT=y
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_CPA_DEBUG is not set
#
# Security options
@@ -2931,62 +3232,113 @@
CONFIG_KEYS=y
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
CONFIG_XOR_BLOCKS=m
CONFIG_ASYNC_CORE=m
CONFIG_ASYNC_MEMCPY=m
CONFIG_ASYNC_XOR=m
CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ABLKCIPHER=m
+CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_BLKCIPHER=y
CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_NULL=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_SHA1=m
CONFIG_CRYPTO_SHA256=m
CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_CRYPTD=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_AES_586=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_KHAZAD=m
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SALSA20_586 is not set
+# CONFIG_CRYPTO_SEED is not set
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_TWOFISH_COMMON=m
CONFIG_CRYPTO_TWOFISH_586=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_AES_586=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
+
+#
+# Compression
+#
CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CAMELLIA=m
-# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_LZO is not set
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m
CONFIG_CRYPTO_DEV_PADLOCK_AES=m
CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
CONFIG_CRYPTO_DEV_GEODE=m
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+CONFIG_HAVE_KVM=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=y
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+# CONFIG_LGUEST is not set
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTIO_BALLOON is not set
#
# Library routines
#
CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=m
CONFIG_CRC_ITU_T=m
@@ -3007,11 +3359,3 @@
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_CHECK_SIGNATURE=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_X86_SMP=y
-CONFIG_X86_HT=y
-CONFIG_X86_BIOS_REBOOT=y
-CONFIG_X86_TRAMPOLINE=y
-CONFIG_KTIME_SCALAR=y
Modified: lunar-iso/trunk/lunar-install/sbin/lunar-install
===================================================================
--- lunar-iso/trunk/lunar-install/sbin/lunar-install 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/lunar-install/sbin/lunar-install 2008-09-14 06:16:51 UTC (rev 27024)
@@ -6,6 +6,7 @@
# portions Copyright 2002 by rodzilla #
# portions Copyright 2003-2004 by tchan, kc8apf #
# portions Copyright 2004-2007 by Auke Kok #
+# portions Copyright 2008 by Stefan Wold #
# #
#############################################################
# #
@@ -245,8 +246,12 @@
list_block_devices()
{(
export IFS=$' \t\n'
- local DEVICE FDEVICE
- for DEVICE in $(tail +3 /proc/partitions | awk '{print $4}') ; do
+ local DEVICE FDEVICE PDEVICE
+
+ # Grab protected device when booting iso from other media then cdrom
+ PDEVICE=$(basename `grep '/mnt/device' /proc/mounts | cut -d' ' -f1` 2> /dev/null)
+
+ for DEVICE in $(tail +3 /proc/partitions | awk '{print $4}' | grep -v -e ${PDEVICE:-^$} -e loop); do
FDEVICE=$(lsh unmap_device /dev/$DEVICE)
# if the device node ends with [0-9] then it's never a disc
if [[ $DEVICE =~ '[0-9]$' ]]; then
@@ -295,7 +300,7 @@
*Reiser*) PTYPE="(reiserfs)" ;;
*) PTYPE="(unknown)" ;;
esac
-
+
for (( N=0 ; N<${#PARTITIONS[@]} ; N++ )); do
if [ "$(echo ${PARTITIONS[$N]} | cut -d: -f1)" == "$DEVICE" ]; then
FSTYPE=$(echo ${PARTITIONS[$N]} | cut -d: -f2)
@@ -303,7 +308,7 @@
FSTYPE=${FSTYPE/none/swap}
echo "$FSTYPE partition, size $FSIZE"
continue 2
- fi
+ fi
done
echo "unassigned, size $FSIZE, $PTYPE"
fi
@@ -380,7 +385,7 @@
{
TITLE="Filesystem Selection Menu"
HELP="Please select a filesystem. A '*' means that this is a journalling filesystem, which provides better data security against system crashes etc."
-
+
EXT3="Third Extended file system (*)"
EXT2="Second Extended file system"
REISER="Reiserfs file system (*)"
@@ -456,7 +461,7 @@
"fdisk" "$FDISK" \
"parted" "$PARTED"`
;;
- esac &&
+ esac &&
PROMPT="Are you certain that you want to run $PROG on $DISC? (This will erase any partition selection you might have already performed)" &&
if confirm "$PROMPT"; then
unset PARTITIONS
@@ -644,7 +649,7 @@
# udev might fail to create these devices
if [ ! -b /dev/md/${ARRAYNAME/md/} ]; then
mkdir -p /dev/md
- mknod -m 660 /dev/md/${ARRAYNAME/md/} b 9 ${$ARRAYNAME/md/}
+ mknod -m 660 /dev/md/${ARRAYNAME/md/} b 9 ${ARRAYNAME/md/}
chgrp disc /dev/md/${ARRAYNAME/md/}
ln -s md/${ARRAYNAME/md/} /dev/$ARRAYNAME
fi
@@ -655,7 +660,7 @@
mdadm --create --level $LEVEL -n ${#DISCS_A[@]} -x ${#SPARE_A[@]} /dev/$ARRAYNAME ${DISCS_A[@]} ${SPARE_A[@]}
sleep 2
if ! grep -qw "^$ARRAYNAME" /proc/mdstat ; then
-
+
sleep 5
msgbox "Initialization and starting of the RAID array failed. You should inspect the output for errors and try manually to start the array before using it."
else
@@ -808,6 +813,10 @@
is_26 || echo "append=\"devfs=nomount\""
echo "read-only"
echo ""
+ if [ ! echo $BOOT | grep -qw md ]; then
+ BOOTDISCS=$(mdadm --detail $BOOT | tail -n2 | awk '{print $7}')
+ echo "raid-extra-boot=$(echo $BOOTDISCS | sed s@\ @, at g)"
+ fi
echo "boot=$DISC"
echo "root=$ROOT"
echo ""
@@ -849,7 +858,7 @@
GRUB_PART=$(lsh map_device_to_grub $BOOT)
# and we go straight to the MBR
GRUB_MBR=$(echo $GRUB_PART | cut -d, -f1)
-
+
(
echo "root ($GRUB_PART)"
echo "setup ($GRUB_MBR)"
@@ -906,7 +915,7 @@
msgbox "You should now be ready to install lunar to your system. Lunar will now create filesystems if needed, make a swapfile if it was selected, and install all lunar packages to the newly setup system. Make sure you are done with partitioning and filesystem selection."
if confirm "Are you ready to install lunar?" ; then
clear
-
+
ORDER=$(for (( N=0 ; N<${#PARTITIONS[@]} ; N++ )); do echo ${PARTITIONS[$N]} | cut -d: -f2 ; done | sort)
for MOUNTPOINT in $ORDER; do
@@ -920,6 +929,11 @@
CHECK=$(echo ${PARTITIONS[$N]} | cut -d: -f6)
FORCE=$(echo ${PARTITIONS[$N]} | cut -d: -f7)
FORMAT=$(echo ${PARTITIONS[$N]} | cut -d: -f8)
+ # handle /tmp, TODO: Automatic fstab scanning for all mountpints
+ if [ "$MOUNTPOINT" == "/tmp" ]; then
+ TMP_TMPFS_NO=1
+ fi
+
# handle swap
if [ "$FSYS" == "swap" ]; then
echo "Setting up swap on $PART..."
@@ -1090,6 +1104,10 @@
cp etc/fstab etc/fstab-
fi
+ if [ -n "$TMP_TMPFS_NO" ]; then
+ sed -i 's;^tmpfs.*/tmp;#&;' etc/fstab
+ fi
+
echo -e "$FSTAB" >> etc/fstab
make_lilo_conf
make_grub_conf
@@ -1098,17 +1116,24 @@
cp /etc/lunar.release $TARGET/etc/
echo " LUNAR_MODULE=lunar" > $TARGET/etc/lunar/local/config
cp /etc/lunar/local/.config* $TARGET/etc/lunar/local/
-
+
# initialize the new machine:
touch $TARGET/var/log/{btmp,utmp,wtmp,lastlog}
chmod 0644 $TARGET/var/log/{utmp,wtmp,lastlog}
chmod 0600 $TARGET/var/log/btmp
-
+
+ # disable some services
+ if [ -e /.initd.disable.list ]; then
+ while read INITD; do
+ chroot_run /sbin/chkconfig --del $INITD
+ done < /.initd.disable.list
+ fi
+
# really we are done now ;^)
) | $DIALOG --title " Installing Lunar-Linux " --gauge "" 10 70 0
cd /
-
+
if (( STEP == 6 )); then
(( STEP++ ))
fi
@@ -1187,7 +1212,7 @@
{
FONTDIR="/usr/share/consolefonts"
cd $FONTDIR
- FONTS=`ls *.gz | sed "s/\.psf\.gz//"`
+ FONTS=`ls *.{psf,psfu}.gz | sed -r "s/\.psfu?\.gz//"`
for FONT in $FONTS; do
echo $FONT
@@ -1213,11 +1238,15 @@
show_languages()
{
- while read L D; do
- echo "$L" | cut -d/ -f1
- echo "$D"
- shift 2
- done < /etc/lunar/local/locales
+ local IFS
+ IFS=$' \t\n'
+ locale -a -v | egrep "(locale:|language \||territory \|)" |
+ sed -r 's;archive:.*|locale:|language \| |territory \|;;g' |
+ awk '{printf $0 ; printf " "} NR % 3 == 0 {print " "}' |
+ while read locale language territory; do
+ echo "$locale"
+ echo "$language ($territory)"
+ done
}
@@ -1303,7 +1332,7 @@
KCOMMAND=`$DIALOG --title "Kernel selection menu" --cancel-label "Exit" --default-item "P" --item-help --menu "In order to succesfully run linux you need to install the linux kernel, the heart of the operating system. You can choose between compiling one yourself or select a precompiled modular kernel." 0 0 0 \
"P" "Install a precompiled kernel" "Fast and safe: these kernels should work on almost all machines" \
"C" "Compile a kernel" "Custom configure and compile one of the linux kernels"`
-
+
if [ $? != 0 ]; then
return
fi
@@ -1449,7 +1478,7 @@
time zone information and adjust daylight savings."
SH[15]="You are done! you should remove the ISO from the
cd-rom tray and reboot. See you at the login prompt!"
-
+
B_LABEL="One step back"
B_HELP="Go back one step in the installation procedure"
F_LABEL="One step forward"
@@ -1488,7 +1517,7 @@
K_LABEL="Install kernel(s)"
K_HELP="Install kernel(s) on the new installation"
K_OK="\\Z1"
-
+
R_LABEL="Set root password"
R_HELP="Set root password needed to access this system (the default password is empty)"
R_OK="\\Z1"
Modified: lunar-iso/trunk/scripts/aaa_base
===================================================================
--- lunar-iso/trunk/scripts/aaa_base 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/scripts/aaa_base 2008-09-14 06:16:51 UTC (rev 27024)
@@ -1,17 +1,10 @@
#!/bin/bash
-umount $ISO_TARGET/proc &> /dev/null
-umount $ISO_TARGET/dev &> /dev/null
-
. /etc/lunar/config
unset VERBOSE
echo "+ cleaning up (some) file structure items"
-rm -f $ISO_TARGET/etc/rc*/*nfslock
-rm -f $ISO_TARGET/etc/rc*/*nfs
-rm -f $ISO_TARGET/etc/rc*/*xinetd
-rm -f $ISO_TARGET/etc/rc*/*serial
-rm -f $ISO_TARGET/etc/rc*/*portmap
+#rm -f $ISO_TARGET/etc/rc?.d/{*nfs,*xinetd,*serial,*portmap}
rm -rf $ISO_TARGET/var/cache/ccache/*
rmdir /usr/lib/locale/*
chroot $ISO_TARGET ccache -C
@@ -27,7 +20,7 @@
echo "+ creating list of prepackaged modules"
mkdir -p $ISO_SOURCE/aaa_base
> $ISO_SOURCE/aaa_base/packages
-for mod in $(cat conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list) kernel-headers-${ISO_KSUFFIX} ; do
+for mod in $(cat conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list); do
grep "^$mod:" $ISO_TARGET/var/state/lunar/packages >> $ISO_SOURCE/aaa_base/packages
done
Modified: lunar-iso/trunk/scripts/etc
===================================================================
--- lunar-iso/trunk/scripts/etc 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/scripts/etc 2008-09-14 06:16:51 UTC (rev 27024)
@@ -20,6 +20,9 @@
# random misc stuff
mkdir -p $ISO_TARGET/var/lock/subsys
+# /dev/null is required when some lunar core functions are called
+mknod -m 666 $ISO_TARGET/dev/null c 1 3
+
# rerun ldconfig to make sure we're not stale
touch $ISO_TARGET/etc/ld.so.conf
chroot $ISO_TARGET ldconfig
Modified: lunar-iso/trunk/scripts/initrd
===================================================================
--- lunar-iso/trunk/scripts/initrd 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/scripts/initrd 2008-09-14 06:16:51 UTC (rev 27024)
@@ -2,6 +2,11 @@
. /etc/lunar/config
+if [ -e /proc/modules ] && ! grep -qs "loop" /proc/devices; then
+ modprobe loop
+ grep -qs loop /proc/devices || echo "Bailing out, "loop" driver is missing"
+fi
+
cd $ISO_SOURCE/initrd
umount $ISO_TARGET/dev &> /dev/null
@@ -14,7 +19,7 @@
# template first
cp -a --no-dereference template BUILD
find BUILD -type d -name '.svn' -exec rm -rf {} \; >/dev/null 2>&1
-mkdir -p BUILD/{mnt,proc,var/lib/discover,usr}
+mkdir -p BUILD/{mnt/cdrom,mnt/device,proc,var/lib/discover,usr}
if [ "$ISO_KSUFFIX" == "2.6" ]; then
mkdir BUILD/sys
fi
@@ -46,7 +51,16 @@
$ISO_SOURCE/scripts/ldd-gather $ISO_SOURCE/initrd/initrd.list-$ISO_KSUFFIX | transfer
)
+echo "+ copying and setting up udev rules"
+(
+ cd $ISO_TARGET
+ cp --no-dereference -r etc/udev $ISO_SOURCE/initrd/BUILD/etc/
+ for i in $ISO_SOURCE/initrd/BUILD/etc/udev/rules.d/*; do
+ sed -i 's;GROUP=".*";;g' $i
+ done
+)
+
# bare minimum of device nodes
echo "+ filling /dev"
mkdir -p BUILD/dev &&
@@ -91,8 +105,11 @@
cd TMP
tar xjf $ISO_SOURCE/kernels/TAR/$KVER.tar.bz2
mkdir -p $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/kernel/drivers/
+ mkdir -p $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/kernel/fs/
echo "+ cp -a --no-dereference lib/modules/$KVER/kernel/drivers/{block,md,ata,ide,scsi,usb/host} $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/kernel/drivers/"
cp -a --no-dereference lib/modules/$KVER/kernel/drivers/{block,md,ata,ide,scsi,usb/host} $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/kernel/drivers/
+ echo "+ cp -a --no-dereference lib/modules/$KVER/kernel/drivers/fs/{nls,fat,vfat,reiserfs,xfs,ext4} $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/kernel/fs/"
+ cp -a --no-dereference lib/modules/$KVER/kernel/fs/{nls,fat,vfat,reiserfs,xfs,ext4} $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/kernel/fs/
echo "+ cp lib/modules/$KVER/modules.* $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/"
cp lib/modules/$KVER/* $ISO_SOURCE/initrd/BUILD/lib/modules/$KVER/
echo "+ depmod -b $ISO_SOURCE/initrd/BUILD -a -F $ISO_SOURCE/kernels/$KERNEL.map $KVER"
@@ -110,7 +127,7 @@
done
chown -R root:root BUILD/*
-
+
echo "+ running ldconfig"
chroot BUILD /sbin/ldconfig &&
rm -f BUILD/etc/mtab &&
@@ -127,7 +144,7 @@
dd if=/dev/zero of=initrd.raw bs=1024 count=$SIZE &&
losetup /dev/loop/0 initrd.raw &&
-mkfs.ext2 -b 1024 -m 0 -i 1024 -N 512 /dev/loop/0 &&
+mkfs.ext2 -b 1024 -m 0 -i 1024 -N 768 /dev/loop/0 &&
mkdir BUILD.mnt &&
mount /dev/loop/0 BUILD.mnt &&
cp -a BUILD/* BUILD.mnt/ &&
Modified: lunar-iso/trunk/scripts/isofs
===================================================================
--- lunar-iso/trunk/scripts/isofs 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/scripts/isofs 2008-09-14 06:16:51 UTC (rev 27024)
@@ -2,6 +2,13 @@
. /etc/lunar/config
+echo "+ Checking if cdrtools is installed"
+if ! lsh module_installed cdrtools; then
+ echo "Cdrtools missing: installing..."
+ lin -c cdrtools
+ lsh module_installed cdrtools || exit 1
+fi
+
echo "+ tagging release version"
echo "Lunar Linux $ISO_CNAME" > $ISO_TARGET/etc/lunar.release
echo "lunar" > $ISO_TARGET/etc/hostname
@@ -47,13 +54,16 @@
echo "+ copying motd"
cp $ISO_SOURCE/template/motd $ISO_TARGET/etc/
cp $ISO_SOURCE/template/motd.target $ISO_TARGET/etc/
+echo "+ copying initd disable list"
+cp $ISO_SOURCE/conf/initd.disable.list $ISO_TARGET/.initd.disable.list
for file in $ISO_TARGET/isolinux/{f{1,2,3,4}.txt,boot.cat,isolinux.{bin,cfg}} $ISO_TARGET/etc/motd $ISO_TARGET/etc/motd $ISO_TARGET/sbin/lunar-install $ISO_TARGET/README $ISO_TARGET/etc/motd $ISO_TARGET/etc/motd.target ; do
sed -i -e "s:%VERSION%:${ISO_VERSION}:g" \
-e "s:%CODENAME%:${ISO_CODENAME}:g" \
-e "s:%DATE%:${ISO_DATE}:g" \
-e "s:%KERNEL%:${ISO_PVER}:g" \
- -e "s:%CNAME%:${ISO_CNAME}:g" $file
+ -e "s:%CNAME%:${ISO_CNAME}:g" \
+ -e "s:%COPYRIGHTYEAR%:${ISO_DATE:0:4}:g" $file
done
# reverse approach this:
Modified: lunar-iso/trunk/scripts/kernels
===================================================================
--- lunar-iso/trunk/scripts/kernels 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/scripts/kernels 2008-09-14 06:16:51 UTC (rev 27024)
@@ -1,7 +1,7 @@
#!/bin/bash
-mv /etc/localtime /etc/localtime-
-ln -sf /usr/share/zoneinfo/UTC /etc/localtime
+#mv /etc/localtime /etc/localtime-
+#ln -sf /usr/share/zoneinfo/UTC /etc/localtime
echo "+ Starting compile of kernels"
. /etc/lunar/config
@@ -90,7 +90,7 @@
{
echo "+ building $VERSION$1"
cd $ISO_SOURCE/kernels/linux-$VERSION
- yes n | make oldconfig &&
+ echo | make oldconfig &&
if [ "${ISO_KSUFFIX}" = "2.4" ]; then
make dep || exit 1
fi &&
@@ -161,5 +161,5 @@
mv $ISO_SOURCE/kernels/.kernels-tmp $ISO_SOURCE/kernels/.kernels
mv $ISO_SOURCE/kernels/.initrd_kernels-tmp $ISO_SOURCE/kernels/.initrd_kernels
-rm -f /etc/localtime
-mv /etc/localtime- /etc/localtime
+#rm -f /etc/localtime
+#mv /etc/localtime- /etc/localtime
Added: lunar-iso/trunk/scripts/prebuild
===================================================================
--- lunar-iso/trunk/scripts/prebuild (rev 0)
+++ lunar-iso/trunk/scripts/prebuild 2008-09-14 06:16:51 UTC (rev 27024)
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+. /etc/lunar/config
+export VERBOSE=off
+
+LISTS="conf/base.list conf/base.list-$ISO_KSUFFIX conf/extended.list"
+MODULES="$(cat $LISTS) ${ISO_LUNAR_MODULE} kernel-headers-$ISO_KSUFFIX"
+
+for MODULE in $MODULES ; do
+ if ! module_installed $MODULE ; then
+ echo "Compiling module $MODULE since we're missing a valid cache tarball"
+ /sbin/lin -c $MODULE
+ elif module_is_expired $MODULE ; then
+ echo "Compiling module $MODULE since it is out of date"
+ /sbin/lin -c $MODULE
+ else
+ echo "Module $MODULE appears to be installed and has a valid cache"
+ fi
+done
Property changes on: lunar-iso/trunk/scripts/prebuild
___________________________________________________________________
Added: svn:executable
+ *
Modified: lunar-iso/trunk/scripts/proper
===================================================================
--- lunar-iso/trunk/scripts/proper 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/scripts/proper 2008-09-14 06:16:51 UTC (rev 27024)
@@ -70,9 +70,6 @@
echo "+ stripping binaries"
find $ISO_TARGET -name "lib*.so*" -exec strip {} \; 2> /dev/null
-echo "+ archiving locale"
-cp $ISO_TARGET/var/lib/lunar/moonbase/*/glibc/locales $ISO_TARGET/etc/lunar/local/
-
# moonbase
echo "+ archiving moonbase"
if [ -d $ISO_TARGET/var/lib/lunar/moonbase ] ; then (
Modified: lunar-iso/trunk/scripts/rebuild
===================================================================
--- lunar-iso/trunk/scripts/rebuild 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/scripts/rebuild 2008-09-14 06:16:51 UTC (rev 27024)
@@ -19,23 +19,57 @@
mkdir -p $ISO_TARGET/usr/src/
-mount -t proc proc $ISO_TARGET/proc
+# Lets get a full-featured environment FIXME: No failsafes!
+function mount_system_fs ()
+{
+ echo "$ISO_TARGET"
+ for mpoint in proc sys dev ; do
+ mount --bind /${mpoint} $ISO_TARGET/${mpoint} &> /dev/null
+ done
+}
+function umount_system_fs ()
+{
+ for mpoint in proc sys dev ; do
+ if ! umount $ISO_TARGET/${mpoint} &> /dev/null ; then
+ umount -l -f $ISO_TARGET/${mpoint} &> /dev/null
+ fi
+ done
+}
+
+# iptables needs the current kernel sources
+function compile_iptables ()
+{
+ echo "Setting up kernel directory"
+ mkdir -p $ISO_TARGET/usr/src/linux
+ mount --bind /usr/src/linux $ISO_TARGET/usr/src/linux
+
+ echo "Compiling iptables"
+ chroot $ISO_TARGET /sbin/lin -c iptables
+
+ echo "Resetting kernel directory"
+ umount $ISO_TARGET/usr/src/linux
+ rm -rf $ISO_TARGET/usr/src/linux
+}
+
echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
echo "+ STARTING CONFIGURING MODULES +"
echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
echo ""
-for mod in $(cat conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list) ; do
- yes '' | NEVER_ASK=y chroot $ISO_TARGET /sbin/lin --deps $mod
-done
+mount_system_fs &&
-umount $ISO_TARGET/proc &> /dev/null
-chroot $ISO_TARGET lin makedev
-mount -t proc proc $ISO_TARGET/proc
+# We have no dependency cache or status file
+echo "Creating preliminary dependency index and cache"
+chroot $ISO_TARGET lsh create_module_index
+chroot $ISO_TARGET lsh create_depends_cache
+#exit 0
+# glibc is special
+chroot $ISO_TARGET /sbin/lin --deps --reconfigure glibc
-chroot $ISO_TARGET /dev/install-devices.sh
-chroot $ISO_TARGET rm -rf /var/build/makedev-*
+for mod in $(cat conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list | grep -v glibc | grep -v perl) ; do
+ yes '' | NEVER_ASK=y chroot $ISO_TARGET /sbin/lin --deps --reconfigure $mod
+done
case ${ISO_KSUFFIX} in
2.4)
@@ -46,7 +80,7 @@
;;
esac
-chroot $ISO_TARGET lin kernel-headers-${ISO_KSUFFIX}
+chroot $ISO_TARGET /sbin/lin kernel-headers-${ISO_KSUFFIX}
# install core tools manually, since we can't download
@@ -57,12 +91,24 @@
echo ""
# perl is notoriously problematic and needs to be built before glibc
-chroot $ISO_TARGET lin perl
+chroot $ISO_TARGET /sbin/lin -c perl
+chroot $ISO_TARGET /sbin/lin -c glibc
+chroot $ISO_TARGET /sbin/lin -c gcc
-for mod in $(cat conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list) ; do
- chroot $ISO_TARGET /sbin/lin -c $mod
+# Compile everything but iptables (see next paragraph)
+for mod in `lsh sort_by_dependency $(cat conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list | grep -v iptables)` ; do
+ if [ "$mod" == "glibc" ]; then
+ # Remove bits/syscall.h or it will be missing on the iso
+ rm -f $ISO_TARGET/usr/include/bits/syscall.h
+ chroot $ISO_TARGET /sbin/lin -c $mod
+ else
+ chroot $ISO_TARGET /sbin/lin -c $mod
+ fi
done
+# We need to setup a special environment for iptables to compile in
+compile_iptables &&
+
# openssh installs ssh keys so these are now tracked in the module :^(
chroot $ISO_TARGET /sbin/lin -c openssh
# e2fsprogs nabs /etc/mtab
@@ -78,7 +124,6 @@
(cd $ISO_TARGET/usr/src/ && ls -1)
echo ""
-umount $ISO_TARGET/proc
+umount_system_fs &&
touch $ISO_TARGET/.rebuild
-
Modified: lunar-iso/trunk/scripts/unpack
===================================================================
--- lunar-iso/trunk/scripts/unpack 2008-09-10 18:21:30 UTC (rev 27023)
+++ lunar-iso/trunk/scripts/unpack 2008-09-14 06:16:51 UTC (rev 27024)
@@ -3,14 +3,14 @@
. /etc/lunar/config
export VERBOSE=off
-resurrect ()
+resurrect_mod ()
{
CACHE=$1-$(module_version $1)-$ISO_BUILD.tar.bz2
if [ ! -f cache/$CACHE ] ; then
echo -e "\n! $1: $CACHE missing"
else
echo -n "+"
- tar xjf cache/$CACHE -C $ISO_TARGET > /dev/null 2>&1
+ tar xf cache/$CACHE -C $ISO_TARGET > /dev/null 2>&1
echo "$1:$ISO_DATE:installed:$(module_version $1):" >> $ISO_TARGET/var/state/lunar/packages
echo "$1:$ISO_DATE:installed:$(module_version $1):" >> $ISO_TARGET/var/state/lunar/packages.backup
fi
@@ -20,11 +20,11 @@
# unpack all the ISO required var/cache/lunar tarballs
# in case of file conflict preserve glibc and gcc files first!
for mods in ${ISO_LUNAR_MODULE} $(cat conf/base.list conf/base.list-$ISO_KSUFFIX conf/extended.list) ; do
- resurrect $mods
+ resurrect_mod $mods
done
# we need kernel headers too
-resurrect kernel-headers-$ISO_KSUFFIX
+#resurrect_mod kernel-headers-$ISO_KSUFFIX
# fill var/spool/lunar dir
for mod in $(cat conf/sources.list conf/sources.list-${ISO_KSUFFIX} conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list) ; do
More information about the Lunar-commits
mailing list