Changeset 450

Timestamp:

02/16/09 19:09:38 (3 years ago)

Author:

tschmitt

Message:

• trunk mit testing zusammengeführt
• NIC-Treiber jetzt modular, werden mit hwinfo ausgelesen und gezielt geladen
• Staging-Treiber für Agere ET1310 GB Netzwerkkarte aktiviert

Location:

main/linuxmuster-linbo/trunk

Files:

• conf/busybox.conf (modified) (18 diffs)
• conf/initramfs.conf (modified) (2 diffs)
• conf/initramfs_kernel.conf (modified) (1 diff)
• conf/kernel.conf (modified) (63 diffs)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)
• debian/md5sums.src (modified) (1 diff)
• debian/rules (modified) (8 diffs)
• linbo/etc/ide_modules (modified) (2 diffs)
• linbo/init.sh (modified) (3 diffs)
• linbo/linbo_cmd.sh (modified) (11 diffs)
• patches/hwinfo (added)
• patches/hwinfo/01_hwinfo.8-strip_suse (added)
• patches/hwinfo/02_new_archs (added)
• patches/hwinfo/03_sparc_kioc (added)
• patches/hwinfo/04_serial_struct (added)
• patches/hwinfo/05_kbd.c-tiocgdev_undefined (added)
• patches/hwinfo/06_cpu.c-alpha_bogo (added)
• patches/hwinfo/07_workaround_obsolete_defines (added)

main/linuxmuster-linbo/trunk/conf/busybox.conf

@@ -1 +1 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.12.2
-# Sun Nov 16 17:47:43 2008
+# Busybox version: 1.13.2
+# Sat Feb 14 12:33:52 2009
 #
 CONFIG_HAVE_DOT_CONFIG=y
@@ -59 +59 @@
 # CONFIG_EFENCE is not set
 CONFIG_INCLUDE_SUSv2=y
-# CONFIG_PARSE is not set
 
 #
@@ -128 +127 @@
 CONFIG_FEATURE_TAR_LONG_OPTIONS=y
 # CONFIG_FEATURE_TAR_UNAME_GNAME is not set
-CONFIG_UNCOMPRESS=y
-CONFIG_UNLZMA=y
-CONFIG_FEATURE_LZMA_FAST=y
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
 CONFIG_UNZIP=y
 
@@ -137 +136 @@
 #
 CONFIG_BASENAME=y
-CONFIG_CAL=y
+# CONFIG_CAL is not set
 CONFIG_CAT=y
 CONFIG_CATV=y
@@ -154 +153 @@
 CONFIG_FEATURE_DD_IBS_OBS=y
 CONFIG_DF=y
-# CONFIG_FEATURE_DF_INODE is not set
+# CONFIG_FEATURE_DF_FANCY is not set
 CONFIG_DIRNAME=y
 CONFIG_DOS2UNIX=y
@@ -284 +283 @@
 CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y
 # CONFIG_SETFONT is not set
+# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
+CONFIG_DEFAULT_SETFONT_DIR=""
 CONFIG_SETKEYCODES=y
 CONFIG_SETLOGCONS=y
@@ -305 +306 @@
 #
 CONFIG_AWK=y
-CONFIG_FEATURE_AWK_MATH=y
+# CONFIG_FEATURE_AWK_LIBM is not set
 CONFIG_CMP=y
 CONFIG_DIFF=y
@@ -368 +369 @@
 #
 CONFIG_INIT=y
-# CONFIG_DEBUG_INIT is not set
 CONFIG_FEATURE_USE_INITTAB=y
 CONFIG_FEATURE_KILL_REMOVED=y
@@ -423 +423 @@
 # Linux Module Utilities
 #
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 # CONFIG_MODPROBE_SMALL is not set
 # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
 # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
-CONFIG_DEPMOD=y
-CONFIG_FEATURE_DEPMOD_PRUNE_FANCY=y
-CONFIG_FEATURE_DEPMOD_ALIAS=y
 CONFIG_INSMOD=y
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-CONFIG_FEATURE_INSMOD_LOAD_MAP=y
-CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y
 CONFIG_RMMOD=y
 CONFIG_LSMOD=y
 CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
 CONFIG_MODPROBE=y
-CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
-CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
 CONFIG_FEATURE_MODPROBE_BLACKLIST=y
+CONFIG_DEPMOD=y
 
 #
 # Options common to multiple modutils
 #
+# CONFIG_FEATURE_2_4_MODULES is not set
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
 CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-# CONFIG_FEATURE_2_4_MODULES is not set
-CONFIG_FEATURE_2_6_MODULES=y
-CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
-CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
-# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+CONFIG_FEATURE_MODUTILS_ALIAS=y
+CONFIG_FEATURE_MODUTILS_SYMBOLS=y
 
 #
 # Linux System Utilities
 #
+# CONFIG_BLKID is not set
 CONFIG_DMESG=y
 CONFIG_FEATURE_DMESG_PRETTY=y
@@ -560 +557 @@
 CONFIG_CHRT=y
 # CONFIG_CROND is not set
-# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_D is not set
 # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
 # CONFIG_CRONTAB is not set
 CONFIG_DC=y
+# CONFIG_FEATURE_DC_LIBM is not set
 # CONFIG_DEVFSD is not set
 # CONFIG_DEVFSD_MODLOAD is not set
@@ -569 +567 @@
 # CONFIG_DEVFSD_VERBOSE is not set
 # CONFIG_FEATURE_DEVFS is not set
+# CONFIG_DEVMEM is not set
 CONFIG_EJECT=y
 # CONFIG_FEATURE_EJECT_SCSI is not set
@@ -580 +579 @@
 CONFIG_FEATURE_LESS_BRACKETS=y
 CONFIG_FEATURE_LESS_FLAGS=y
-CONFIG_FEATURE_LESS_FLAGCS=y
+# CONFIG_FEATURE_LESS_DASHCMD is not set
 CONFIG_FEATURE_LESS_MARKS=y
 CONFIG_FEATURE_LESS_REGEXP=y
+# CONFIG_FEATURE_LESS_LINENUMS is not set
+# CONFIG_FEATURE_LESS_WINCH is not set
 CONFIG_HDPARM=y
 CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
@@ -694 +695 @@
 CONFIG_PSCAN=y
 CONFIG_ROUTE=y
-# CONFIG_SENDMAIL is not set
-# CONFIG_FETCHMAIL is not set
 CONFIG_SLATTACH=y
 # CONFIG_TELNET is not set
@@ -707 +706 @@
 # CONFIG_FEATURE_TFTP_PUT is not set
 # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-# CONFIG_DEBUG_TFTP is not set
+# CONFIG_TFTP_DEBUG is not set
 CONFIG_TRACEROUTE=y
 # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
@@ -720 +719 @@
 CONFIG_FEATURE_UDHCPC_ARPING=y
 CONFIG_FEATURE_UDHCP_PORT=y
-# CONFIG_FEATURE_UDHCP_DEBUG is not set
-CONFIG_FEATURE_RFC3397=y
-CONFIG_DHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+# CONFIG_UDHCP_DEBUG is not set
+# CONFIG_FEATURE_UDHCP_RFC3397 is not set
+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 CONFIG_VCONFIG=y
@@ -732 +731 @@
 # CONFIG_TCPSVD is not set
 # CONFIG_UDPSVD is not set
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+# CONFIG_LPR is not set
+# CONFIG_LPQ is not set
+
+#
+# Mail Utilities
+#
+# CONFIG_MAKEMIME is not set
+CONFIG_FEATURE_MIME_CHARSET=""
+# CONFIG_POPMAILDIR is not set
+# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
+# CONFIG_REFORMIME is not set
+# CONFIG_FEATURE_REFORMIME_COMPAT is not set
+# CONFIG_SENDMAIL is not set
+# CONFIG_FEATURE_SENDMAIL_MAILX is not set
+# CONFIG_FEATURE_SENDMAIL_MAILXX is not set
 
 #
@@ -756 +775 @@
 CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
 CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+# CONFIG_FEATURE_TOP_SMP_CPU is not set
 # CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
 CONFIG_FEATURE_TOPMEM=y
 CONFIG_UPTIME=y
 CONFIG_WATCH=y
+
+#
+# Runit Utilities
+#
+CONFIG_RUNSV=y
+CONFIG_RUNSVDIR=y
+# CONFIG_FEATURE_RUNSVDIR_LOG is not set
+CONFIG_SV=y
+CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service"
+CONFIG_SVLOGD=y
+CONFIG_CHPST=y
+CONFIG_SETUIDGID=y
+CONFIG_ENVUIDGID=y
+CONFIG_ENVDIR=y
+CONFIG_SOFTLIMIT=y
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
 
 #
@@ -821 +872 @@
 CONFIG_KLOGD=y
 CONFIG_LOGGER=y
-
-#
-# Runit Utilities
-#
-CONFIG_RUNSV=y
-CONFIG_RUNSVDIR=y
-CONFIG_SV=y
-CONFIG_SVLOGD=y
-CONFIG_CHPST=y
-CONFIG_SETUIDGID=y
-CONFIG_ENVUIDGID=y
-CONFIG_ENVDIR=y
-CONFIG_SOFTLIMIT=y
-# CONFIG_CHCON is not set
-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
-# CONFIG_GETENFORCE is not set
-# CONFIG_GETSEBOOL is not set
-# CONFIG_LOAD_POLICY is not set
-# CONFIG_MATCHPATHCON is not set
-# CONFIG_RESTORECON is not set
-# CONFIG_RUNCON is not set
-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
-# CONFIG_SELINUXENABLED is not set
-# CONFIG_SETENFORCE is not set
-# CONFIG_SETFILES is not set
-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
-# CONFIG_SETSEBOOL is not set
-# CONFIG_SESTATUS is not set
-
-#
-# Print Utilities
-#
-# CONFIG_LPD is not set
-# CONFIG_LPR is not set
-# CONFIG_LPQ is not set

main/linuxmuster-linbo/trunk/conf/initramfs.conf

@@ -19 +19 @@
 
 # modules lists
-file /etc/ata_modules ../../linbo/etc/ata_modules 644 0 0
+#file /etc/ata_modules ../../linbo/etc/ata_modules 644 0 0
 file /etc/ide_modules ../../linbo/etc/ide_modules 644 0 0
 
@@ -145 +145 @@
 
 # hwinfo
-dir /usr/share/misc 755 0 0
-file /bin/lspci /usr/bin/lspci 755 0 0
-file /sbin/hwinfo /usr/sbin/hwinfo 755 0 0
-file /usr/lib/libhd.so.13 /usr/lib/libhd.so.13 755 0 0
+file /sbin/hwinfo ../../src/hwinfo/hwinfo 755 0 0
+file /usr/lib/libhd.so.15 ../../src/hwinfo/src/libhd.so.15 755 0 0
 file /usr/lib/libdbus-1.so.3 /usr/lib/libdbus-1.so.3 755 0 0
 file /usr/lib/libhal.so.1 /usr/lib/libhal.so.1 755 0 0
-file /usr/share/misc/pci.ids ../../src/pci.ids 644 0 0
 

main/linuxmuster-linbo/trunk/conf/initramfs_kernel.conf

@@ -229 +229 @@
 nod /dev/hdh8 644 0 0 b 34 72
 nod /dev/hdh9 644 0 0 b 34 73
+nod /dev/kvm 660 0 0 c 10 232
 nod /dev/sda 644 0 0 b 8 0
 nod /dev/sda1 644 0 0 b 8 1

main/linuxmuster-linbo/trunk/conf/kernel.conf

@@ -1 +1 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.28.4
-# Tue Feb 10 19:15:10 2009
+# Linux kernel version: 2.6.29-rc5
+# Mon Feb 16 18:24:42 2009
 #
 # CONFIG_64BIT is not set
@@ -67 +67 @@
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_CLASSIC_RCU=y
+# CONFIG_TREE_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_PREEMPT_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=15
-# CONFIG_CGROUPS is not set
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 # CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
@@ -80 +89 @@
 CONFIG_INITRAMFS_ROOT_UID=0
 CONFIG_INITRAMFS_ROOT_GID=0
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
@@ -107 +116 @@
 # CONFIG_SLOB is not set
 # CONFIG_PROFILING is not set
-# CONFIG_MARKERS is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -117 +125 @@
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -125 +132 @@
 CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 CONFIG_LBD=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_LSF=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
@@ -146 +151 @@
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_CLASSIC_RCU=y
 CONFIG_FREEZER=y
 
@@ -158 +161 @@
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_SMP=y
+# CONFIG_SPARSE_IRQ is not set
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
@@ -166 +170 @@
 # CONFIG_X86_VSMP is not set
 # CONFIG_X86_RDC321X is not set
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_PARAVIRT_GUEST=y
-# CONFIG_VMI is not set
+CONFIG_VMI=y
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
@@ -218 +222 @@
 CONFIG_DMI=y
 # CONFIG_IOMMU_HELPER is not set
+# CONFIG_IOMMU_API is not set
 CONFIG_NR_CPUS=8
 # CONFIG_SCHED_SMT is not set
@@ -226 +231 @@
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 # CONFIG_X86_MCE is not set
 CONFIG_VM86=y
@@ -260 +266 @@
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_RESOURCES_64BIT=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
@@ -266 +271 @@
 CONFIG_VIRT_TO_BUS=y
 CONFIG_UNEVICTABLE_LRU=y
-CONFIG_MMU_NOTIFIER=y
 CONFIG_HIGHPTE=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
@@ -317 +321 @@
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_WMI=y
-# CONFIG_ACPI_ASUS is not set
-# CONFIG_ACPI_TOSHIBA is not set
 # CONFIG_ACPI_CUSTOM_DSDT is not set
 CONFIG_ACPI_BLACKLIST_YEAR=0
@@ -335 +336 @@
 # CONFIG_APM_DISPLAY_BLANK is not set
 # CONFIG_APM_ALLOW_INTS is not set
-# CONFIG_APM_REAL_MODE_POWER_OFF is not set
 
 #
@@ -378 +378 @@
 # shared options
 #
-CONFIG_X86_ACPI_CPUFREQ_PROC_INTF=y
 CONFIG_X86_SPEEDSTEP_LIB=y
 CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
@@ -400 +399 @@
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
 # CONFIG_PCIEAER is not set
 # CONFIG_PCIEASPM is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
+CONFIG_PCI_STUB=y
 CONFIG_HT_IRQ=y
 CONFIG_ISA_DMA_API=y
-CONFIG_ISA=y
-CONFIG_EISA=y
-# CONFIG_EISA_VLB_PRIMING is not set
-CONFIG_EISA_PCI_EISA=y
-CONFIG_EISA_VIRTUAL_ROOT=y
-CONFIG_EISA_NAMES=y
-CONFIG_MCA=y
-CONFIG_MCA_LEGACY=y
-CONFIG_MCA_PROC_FS=y
+# CONFIG_ISA is not set
+# CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 CONFIG_OLPC=y
@@ -437 +429 @@
 # CONFIG_PD6729 is not set
 # CONFIG_I82092 is not set
-# CONFIG_I82365 is not set
-# CONFIG_TCIC is not set
-CONFIG_PCMCIA_PROBE=y
 CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_FAKE=y
-CONFIG_HOTPLUG_PCI_COMPAQ=y
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-CONFIG_HOTPLUG_PCI_IBM=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=y
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=y
-CONFIG_HOTPLUG_PCI_SHPC=y
+# CONFIG_HOTPLUG_PCI is not set
 
 #
@@ -457 +436 @@
 #
 CONFIG_BINFMT_ELF=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_HAVE_AOUT=y
 CONFIG_BINFMT_AOUT=y
@@ -467 +445 @@
 # Networking options
 #
+CONFIG_COMPAT_NET_DEV_OPS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
@@ -523 +502 @@
 # CONFIG_WAN_ROUTER is not set
 # CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
 
 #
@@ -535 +515 @@
 # CONFIG_PHONET is not set
 # CONFIG_WIRELESS is not set
+# CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
@@ -561 +542 @@
 # Protocols
 #
-# CONFIG_ISAPNP is not set
-# CONFIG_PNPBIOS is not set
 CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_XD is not set
-CONFIG_BLK_CPQ_DA=y
-CONFIG_BLK_CPQ_CISS_DA=y
+CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_CISS_SCSI_TAPE=y
 CONFIG_BLK_DEV_DAC960=m
@@ -602 +580 @@
 # CONFIG_BLK_DEV_IDECD is not set
 # CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
 CONFIG_BLK_DEV_IDEACPI=y
 # CONFIG_IDE_TASK_IOCTL is not set
@@ -635 +612 @@
 CONFIG_BLK_DEV_CS5530=m
 CONFIG_BLK_DEV_CS5535=m
+CONFIG_BLK_DEV_CS5536=m
 CONFIG_BLK_DEV_HPT366=m
 CONFIG_BLK_DEV_JMICRON=m
 CONFIG_BLK_DEV_SC1200=m
 CONFIG_BLK_DEV_PIIX=m
+CONFIG_BLK_DEV_IT8172=m
 CONFIG_BLK_DEV_IT8213=m
 CONFIG_BLK_DEV_IT821X=m
@@ -651 +630 @@
 CONFIG_BLK_DEV_VIA82CXXX=m
 CONFIG_BLK_DEV_TC86C001=m
-
-#
-# Other IDE chipsets support
-#
-
-#
-# Note: most of these also require special kernel boot parameters
-#
-# CONFIG_BLK_DEV_4DRIVES is not set
-# CONFIG_BLK_DEV_ALI14XX is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-# CONFIG_BLK_DEV_HT6560B is not set
-# CONFIG_BLK_DEV_QD65XX is not set
-# CONFIG_BLK_DEV_UMC8672 is not set
 CONFIG_BLK_DEV_IDEDMA=y
 
@@ -709 +674 @@
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
 CONFIG_BLK_DEV_3W_XXXX_RAID=y
 CONFIG_SCSI_3W_9XXX=y
-# CONFIG_SCSI_7000FASST is not set
 # CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AHA1740 is not set
 # CONFIG_SCSI_AACRAID is not set
 # CONFIG_SCSI_AIC7XXX is not set
@@ -724 +686 @@
 # CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_IN2000 is not set
 CONFIG_SCSI_ARCMSR=y
 # CONFIG_MEGARAID_NEWGEN is not set
@@ -731 +692 @@
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_LIBFC is not set
+# CONFIG_FCOE is not set
 # CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DTC3280 is not set
 # CONFIG_SCSI_EATA is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_FD_MCS is not set
 # CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_IBMMCA is not set
 # CONFIG_SCSI_IPS is not set
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_INIA100 is not set
 CONFIG_SCSI_MVSAS=y
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NCR_D700 is not set
 # CONFIG_SCSI_STEX is not set
 # CONFIG_SCSI_SYM53C8XX_2 is not set
 # CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_NCR_Q720 is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
 # CONFIG_SCSI_QLA_FC is not set
 # CONFIG_SCSI_QLA_ISCSI is not set
 # CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_SIM710 is not set
-# CONFIG_SCSI_SYM53C416 is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
 # CONFIG_SCSI_NSP32 is not set
 # CONFIG_SCSI_DEBUG is not set
@@ -781 +729 @@
 CONFIG_SATA_SVW=m
 CONFIG_ATA_PIIX=m
-# CONFIG_SATA_MV is not set
+CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
 CONFIG_PDC_ADMA=m
@@ -815 +763 @@
 CONFIG_PATA_IT8213=m
 CONFIG_PATA_JMICRON=m
-CONFIG_PATA_LEGACY=m
 CONFIG_PATA_TRIFLEX=m
 CONFIG_PATA_MARVELL=m
@@ -828 +775 @@
 CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_QDI=m
 CONFIG_PATA_RADISYS=m
 CONFIG_PATA_RZ1000=m
@@ -838 +784 @@
 CONFIG_PATA_VIA=m
 CONFIG_PATA_WINBOND=m
-CONFIG_PATA_WINBOND_VLB=m
 CONFIG_PATA_PLATFORM=m
 CONFIG_PATA_SCH=m
@@ -886 +831 @@
 CONFIG_ARCNET_RIM_I=y
 CONFIG_ARCNET_COM20020=y
-# CONFIG_ARCNET_COM20020_ISA is not set
 CONFIG_ARCNET_COM20020_PCI=y
 CONFIG_PHYLIB=y
@@ -903 +847 @@
 CONFIG_ICPLUS_PHY=y
 CONFIG_REALTEK_PHY=y
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
 CONFIG_FIXED_PHY=y
 # CONFIG_MDIO_BITBANG is not set
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
-CONFIG_HAPPYMEAL=y
-CONFIG_SUNGEM=y
-CONFIG_CASSINI=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
 CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL1=y
-CONFIG_EL2=y
-CONFIG_ELPLUS=y
-CONFIG_EL16=y
-CONFIG_EL3=y
-CONFIG_3C515=y
-CONFIG_ELMC=y
-CONFIG_ELMC_II=y
-CONFIG_VORTEX=y
-CONFIG_TYPHOON=y
-CONFIG_LANCE=y
-CONFIG_NET_VENDOR_SMC=y
-CONFIG_WD80x3=y
-CONFIG_ULTRAMCA=y
-CONFIG_ULTRA=y
-CONFIG_ULTRA32=y
-CONFIG_SMC9194=y
-CONFIG_NET_VENDOR_RACAL=y
-CONFIG_NI52=y
-CONFIG_NI65=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
 CONFIG_NET_TULIP=y
 CONFIG_DE2104X=y
@@ -942 +871 @@
 CONFIG_ULI526X=y
 CONFIG_PCMCIA_XIRCOM=y
-CONFIG_AT1700=y
-CONFIG_DEPCA=y
-CONFIG_HP100=y
-# CONFIG_NET_ISA is not set
-# CONFIG_NE2_MCA is not set
-# CONFIG_IBMLANA is not set
+CONFIG_HP100=m
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
@@ -956 +880 @@
 # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
 CONFIG_NET_PCI=y
-CONFIG_PCNET32=y
-CONFIG_AMD8111_ETH=y
-CONFIG_ADAPTEC_STARFIRE=y
-CONFIG_AC3200=y
-CONFIG_APRICOT=y
-CONFIG_B44=y
+CONFIG_PCNET32=m
+CONFIG_AMD8111_ETH=m
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
 CONFIG_B44_PCICORE_AUTOSELECT=y
 CONFIG_B44_PCI=y
-CONFIG_FORCEDETH=y
+CONFIG_FORCEDETH=m
 # CONFIG_FORCEDETH_NAPI is not set
-CONFIG_CS89x0=y
-CONFIG_EEPRO100=y
-CONFIG_E100=y
-CONFIG_LNE390=y
-CONFIG_FEALNX=y
-CONFIG_NATSEMI=y
-CONFIG_NE2K_PCI=y
-CONFIG_NE3210=y
-CONFIG_ES3210=y
-CONFIG_8139CP=y
-CONFIG_8139TOO=y
+CONFIG_E100=m
+CONFIG_FEALNX=m
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
 CONFIG_8139TOO_TUNE_TWISTER=y
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R6040=y
-CONFIG_SIS900=y
-CONFIG_EPIC100=y
-CONFIG_SUNDANCE=y
+CONFIG_R6040=m
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+CONFIG_SMSC9420=m
+CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=y
-CONFIG_VIA_RHINE=y
+CONFIG_TLAN=m
+CONFIG_VIA_RHINE=m
 CONFIG_VIA_RHINE_MMIO=y
-CONFIG_SC92031=y
-CONFIG_ATL2=y
+CONFIG_SC92031=m
+CONFIG_ATL2=m
 CONFIG_NETDEV_1000=y
-CONFIG_ACENIC=y
+CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=y
-CONFIG_E1000=y
-CONFIG_E1000E=y
-CONFIG_IP1000=y
-CONFIG_IGB=y
+CONFIG_DL2K=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IP1000=m
+CONFIG_IGB=m
 # CONFIG_IGB_LRO is not set
 CONFIG_IGB_DCA=y
-CONFIG_NS83820=y
-CONFIG_HAMACHI=y
-CONFIG_YELLOWFIN=y
-CONFIG_R8169=y
-CONFIG_SIS190=y
-CONFIG_SKGE=y
-CONFIG_SKY2=y
-CONFIG_VIA_VELOCITY=y
-CONFIG_TIGON3=y
-CONFIG_BNX2=y
-CONFIG_QLA3XXX=y
-CONFIG_ATL1=y
-CONFIG_ATL1E=y
-CONFIG_JME=y
+CONFIG_NS83820=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_R8169=m
+CONFIG_SIS190=m
+CONFIG_SKGE=m
+CONFIG_SKY2=m
+CONFIG_VIA_VELOCITY=m
+CONFIG_TIGON3=m
+CONFIG_BNX2=m
+CONFIG_QLA3XXX=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_JME=m
 CONFIG_NETDEV_10000=y
-CONFIG_CHELSIO_T1=y
+CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=y
-CONFIG_ENIC=y
-CONFIG_IXGBE=y
+CONFIG_CHELSIO_T3_DEPENDS=y
+CONFIG_CHELSIO_T3=m
+CONFIG_ENIC=m
+CONFIG_IXGBE=m
 CONFIG_IXGBE_DCA=y
-CONFIG_IXGB=y
-CONFIG_S2IO=y
-CONFIG_MYRI10GE=y
+CONFIG_IXGB=m
+CONFIG_S2IO=m
+CONFIG_MYRI10GE=m
 CONFIG_MYRI10GE_DCA=y
-CONFIG_NETXEN_NIC=y
-CONFIG_NIU=y
-CONFIG_MLX4_EN=y
-CONFIG_MLX4_CORE=y
+CONFIG_NETXEN_NIC=m
+CONFIG_NIU=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
 # CONFIG_MLX4_DEBUG is not set
-CONFIG_TEHUTI=y
-CONFIG_BNX2X=y
-CONFIG_QLGE=y
-CONFIG_SFC=y
+CONFIG_TEHUTI=m
+CONFIG_BNX2X=m
+CONFIG_QLGE=m
+CONFIG_SFC=m
 # CONFIG_TR is not set
 
@@ -1044 +963 @@
 # CONFIG_WLAN_80211 is not set
 # CONFIG_IWLWIFI_LEDS is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
 
 #
@@ -1108 +1031 @@
 # CONFIG_MOUSE_APPLETOUCH is not set
 # CONFIG_MOUSE_BCM5974 is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_INPUT_JOYSTICK is not set
@@ -1152 +1072 @@
 # CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_HVC_DRIVER=y
@@ -1159 +1080 @@
 # CONFIG_NVRAM is not set
 CONFIG_RTC=y
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
@@ -1185 +1105 @@
 # CONFIG_I2C_CHARDEV is not set
 CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOBIT=m
 
 #
@@ -1230 +1150 @@
 # Other I2C/SMBus bus drivers
 #
-# CONFIG_I2C_PCA_ISA is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_I2C_STUB is not set
@@ -1239 +1158 @@
 #
 # CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
-# CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_PCF8575 is not set
@@ -1287 +1204 @@
 # CONFIG_MFD_SM501 is not set
 # CONFIG_HTC_PASIC3 is not set
+# CONFIG_TWL4030_CORE is not set
 # CONFIG_MFD_TMIO is not set
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_MFD_WM8400 is not set
 # CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_PCF50633 is not set
 # CONFIG_REGULATOR is not set
 
@@ -1391 +1310 @@
 # CONFIG_LCD_PLATFORM is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_CORGI is not set
+CONFIG_BACKLIGHT_GENERIC=y
 # CONFIG_BACKLIGHT_PROGEAR is not set
 # CONFIG_BACKLIGHT_MBP_NVIDIA is not set
@@ -1406 +1325 @@
 CONFIG_VGA_CONSOLE=y
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
-# CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -1438 +1356 @@
 # CONFIG_HID_APPLE is not set
 CONFIG_HID_BELKIN=y
-CONFIG_HID_BRIGHT=y
 CONFIG_HID_CHERRY=y
 CONFIG_HID_CHICONY=y
 CONFIG_HID_CYPRESS=y
-CONFIG_HID_DELL=y
 CONFIG_HID_EZKEY=y
 CONFIG_HID_GYRATION=y
@@ -1450 +1366 @@
 CONFIG_HID_MICROSOFT=y
 CONFIG_HID_MONTEREY=y
+# CONFIG_HID_NTRIG is not set
 CONFIG_HID_PANTHERLORD=y
 # CONFIG_PANTHERLORD_FF is not set
@@ -1456 +1373 @@
 # CONFIG_HID_SONY is not set
 CONFIG_HID_SUNPLUS=y
+# CONFIG_GREENASIA_FF is not set
+# CONFIG_HID_TOPSEED is not set
 # CONFIG_THRUSTMASTER_FF is not set
 # CONFIG_ZEROPLUS_FF is not set
@@ -1487 +1406 @@
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_OXU210HP_HCD=y
 CONFIG_USB_ISP116X_HCD=y
 CONFIG_USB_ISP1760_HCD=y
 CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_HCD_SSB is not set
+CONFIG_USB_OHCI_HCD_SSB=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
@@ -1521 +1441 @@
 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
@@ -1527 +1446 @@
 CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_STORAGE_ALAUDA=y
-# CONFIG_USB_STORAGE_ONETOUCH is not set
+CONFIG_USB_STORAGE_ONETOUCH=y
 CONFIG_USB_STORAGE_KARMA=y
 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
@@ -1569 +1488 @@
 # CONFIG_USB_VST is not set
 # CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
 # CONFIG_UWB is not set
 # CONFIG_MMC is not set
@@ -1592 +1515 @@
 CONFIG_DCA=y
 # CONFIG_UIO is not set
-# CONFIG_STAGING is not set
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+CONFIG_ET131X=m
+# CONFIG_ET131X_DEBUG is not set
+# CONFIG_SLICOSS is not set
+# CONFIG_SXG is not set
+# CONFIG_ME4000 is not set
+# CONFIG_MEILHAUS is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_ECHO is not set
+# CONFIG_BENET is not set
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_ALTERA_PCIE_CHDMA is not set
+# CONFIG_RTL8187SE is not set
+# CONFIG_INPUT_MIMIO is not set
+# CONFIG_TRANZPORT is not set
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# CONFIG_ANDROID_BINDER_IPC is not set
+# CONFIG_ANDROID_LOGGER is not set
+# CONFIG_ANDROID_RAM_CONSOLE is not set
+# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
+CONFIG_X86_PLATFORM_DEVICES=y
+# CONFIG_FUJITSU_LAPTOP is not set
+# CONFIG_TC1100_WMI is not set
+# CONFIG_MSI_LAPTOP is not set
+# CONFIG_PANASONIC_LAPTOP is not set
+# CONFIG_COMPAL_LAPTOP is not set
+# CONFIG_SONY_LAPTOP is not set
+# CONFIG_THINKPAD_ACPI is not set
+# CONFIG_INTEL_MENLOW is not set
+# CONFIG_EEEPC_LAPTOP is not set
+CONFIG_ACPI_WMI=y
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_ACPI_TOSHIBA is not set
 
 #
@@ -1636 +1597 @@
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
 CONFIG_DNOTIFY=y
 # CONFIG_INOTIFY is not set
@@ -1677 +1639 @@
 CONFIG_HUGETLB_PAGE=y
 CONFIG_CONFIGFS_FS=y
-
-#
-# Miscellaneous filesystems
-#
+CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
@@ -1689 +1648 @@
 # CONFIG_EFS_FS is not set
 # CONFIG_CRAMFS is not set
+# CONFIG_SQUASHFS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_MINIX_FS is not set
@@ -1786 +1746 @@
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
@@ -1835 +1800 @@
 CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG2=y
@@ -1872 +1838 @@
 # Digest
 #
-# CONFIG_CRYPTO_CRC32C is not set
+CONFIG_CRYPTO_CRC32C=y
 # CONFIG_CRYPTO_CRC32C_INTEL is not set
 # CONFIG_CRYPTO_MD4 is not set
@@ -1922 +1888 @@
 CONFIG_HAVE_KVM=y
 CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=y
-CONFIG_KVM_INTEL=y
-CONFIG_KVM_AMD=y
+# CONFIG_KVM is not set
 # CONFIG_LGUEST is not set
 CONFIG_VIRTIO=y
@@ -1937 +1901 @@
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y

main/linuxmuster-linbo/trunk/debian/changelog

@@ +1 @@
+linuxmuster-linbo (1.1.12-1) unstable; urgency=low
+
+  * package:
+    - debian/rules: added code to handle hwinfo, vesamode change
+    - debian/control: added build dependencies for hwinfo
+    - hwinfo now self compiled from jaunty source package
+  * kernel:
+    - updated to 2.6.29-rc5
+    - removed pci hotplug drivers
+    - added missing /dev/kvm to initramfs_kernel.conf
+    - changed default vesamode to 771
+    - removed unecessary kvm dom0 support modules
+    - nic drivers now modular
+    - activated staging module for Agere ET-1310 GB nic
+  * linbofs:
+    - updated hwinfo to latest version 15.3
+    - removed /etc/ata_modules
+    - removed lspci, job is done by hwinfo
+    - removed pci.ids
+    - updated /etc/ide_modules
+    - linbo_cmd, mkgrubmenu(): grub's device.map will also be updated
+    - linbo_cmd, mkgrldr(): fstype is now fetched from start.conf
+    - linbo_cmd: added /dev/vda kvm virtio block device support
+    - linbo_cmd: logs start and ending time of imaging
+    - busybox: updated to 1.13.2, some size optimations
+    - init.sh: added mdev hotplugging
+    - init.sh: hwsetup() uses only ide_modules for controler detection
+    - init.sh: logs additional hw information
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Mon, 16 Feb 2009 18:51:58 +0100
+
 linuxmuster-linbo (1.1.11-1) unstable; urgency=low
 

main/linuxmuster-linbo/trunk/debian/control

@@ -5 +5 @@
 Build-Depends: debhelper (>= 4), build-essential, fakeroot, qt3-dev-tools, flex, wget, gcc-4.1, g++-4.1, ncurses-base,
                coreutils, sysvinit-utils, util-linux, libstdc++6, reiserfsprogs, e2fsprogs, dosfstools, unzip, tar, gzip,
-               gettext, zlib1g-dev, libncurses5-dev, tetex-base, tetex-bin, tetex-extra, udpcast, hwinfo
+               gettext, zlib1g-dev, libncurses5-dev, tetex-base, tetex-bin, tetex-extra, udpcast, libdbus-1-dev,
+               libhal-dev, doxygen, libdbus-1-3, libhal1
 Standards-Version: 3.6.1
 

main/linuxmuster-linbo/trunk/debian/md5sums.src

@@ -1 @@
-1a47c00828c7b38b7516f6fdc35800e2  busybox-1.12.2.tar.bz2
+9e2a604d18bef219a5a6bf3acf78b9e1  busybox-1.13.2.tar.bz2
 09addfe7ae469677da39ed66d83858d3  chntpw-source-080526.zip
 b44b62af69863fc74f2946a56466d19d  cloop_2.628-2.tar.gz
+a12e9e202657d9430baa19c30fcbb6e1  et131x-1.2.3-2-patched.tar.bz2
 dbd1afa4f96862af39497da78701a2e7  grub4dos-0.4.4-2009-02-09-src.zip
+7bd0f333fea8124cc83769b3f453efc0  hwinfo_15.3.orig.tar.gz
 d9f2ecd3c3307905f24130a25816e6cc  kexec-tools-2.0.0.tar.bz2
-8228bb7804d6d0099eadfabf701c295b  linux-2.6.28.4.tar.bz2
+62ec6b1e52b4d12ea5ae782130585955  linux-2.6.29-rc5.tar.bz2
 6fad0a69ac89440ad4f696dbbbf11497  ms-sys-2.1.3.tgz
 601db52936011902206dfe1be05e4756  ntfs-3g-1.5012.tgz

main/linuxmuster-linbo/trunk/debian/rules

@@ -11 +11 @@
 
 # kernel
-#  VESAMODE=771 # 800x600, 256 colors
-VESAMODE=0 # VGA16
+VESAMODE=771 # 800x600, 256 colors
+# VESAMODE=0 # VGA16
 # VESAMODE=791 # 1024x768, 64k colors # Currently not working
 KERNEL_ARCHIVE=$(shell grep linux- debian/md5sums.src | awk '{ print $$2 }')
-KVERS=$(shell echo $(KERNEL_ARCHIVE) | awk -F\- '{ print $$2 }' | sed -e 's/.tar.bz2//')
+KVERS=$(shell echo $(KERNEL_ARCHIVE) | sed -e 's/linux-//' | sed -e 's/.tar.bz2//')
 KERNEL_DIR=kernel/linux-$(KVERS)
-KERNEL_URL=http://www.kernel.org/pub/linux/kernel/v2.6
+KERNEL_URL=http://www.kernel.org/pub/linux/kernel/v2.6/testing
 
 # cloop
@@ -53 +53 @@
 MSSYS_ARCHIVE=$(shell grep ms-sys- debian/md5sums.src | awk '{ print $$2 }')
 MSSYS_DIR=src/$(shell echo $(MSSYS_ARCHIVE) | sed -e 's/.tgz//')
-MSSYS_URL=http://prdownloads.sourceforge.net/ms-sys
+MSSYS_URL=$(LML_URL)
 
 # ntfs-3g
@@ -63 +63 @@
 NTFSPROGS_ARCHIVE=$(shell grep ntfsprogs- debian/md5sums.src | awk '{ print $$2 }')
 NTFSPROGS_DIR=src/$(shell echo $(NTFSPROGS_ARCHIVE) | sed -e 's/.tar.bz2//')
-NTFSPROGS_URL=http://prdownloads.sourceforge.net/linux-ntfs
+NTFSPROGS_URL=$(LML_URL)
 
 #rsync
@@ -75 +75 @@
 SSMTP_URL=http://archive.ubuntu.com/ubuntu/pool/universe/s/ssmtp
 
-#pci.ids
-PCIIDS=http://pciids.sourceforge.net/v2.2/pci.ids.gz
+#hwinfo
+HWINFO_ARCHIVE=$(shell grep hwinfo_ debian/md5sums.src | awk '{ print $$2 }')
+HWINFO_DIR=src/$(shell echo $(HWINFO_ARCHIVE) | sed -e 's/.orig.tar.gz//' | sed -e 's/_/-/' )
+HWINFO_VER=$(shell echo $(HWINFO_ARCHIVE) | sed -e 's/.orig.tar.gz//' | sed -e 's/hwinfo_//' )
+HWINFO_URL=http://archive.ubuntu.com/ubuntu/pool/universe/h/hwinfo
 
 configure: configure-stamp
@@ -176 +179 @@
         fi
 
+        # hwinfo
+        -@if [ ! -d $(HWINFO_DIR) ]; then \
+                ( [ -e cache/$(HWINFO_ARCHIVE) ] || ( cd cache && wget $(HWINFO_URL)/$(HWINFO_ARCHIVE) ) ); \
+                ( cd cache && grep $(HWINFO_ARCHIVE) ../debian/md5sums.src | md5sum -c ); \
+                echo "[1mUnpacking $(HWINFO_ARCHIVE)...[0m" ; \
+                tar xf cache/$(HWINFO_ARCHIVE) -C src; \
+                echo "[1mPatching hwinfo sources...[0m" ; \
+                ( cd $(HWINFO_DIR) && for i in ../../patches/hwinfo/*; do patch -p1 <$$i; done ); \
+                ln -sf ../$(HWINFO_DIR) src/hwinfo; \
+        fi
+
         # qt
         -@if [ ! -d $(QT_DIR) ]; then \
@@ -195 +209 @@
                 #( cd $(CLOOP_DIR) && for i in ../../patches/cloop/*; do patch -p1 <$$i; done ); \
                 ln -sf ../$(CLOOP_DIR) kernel/cloop; \
-        fi
-
-        # pci.ids
-        wget $(PCIIDS) -O cache/pci.ids.gz
-        ( [ -e cache/pci.ids.gz ] && gzip -c cache/pci.ids.gz > src/pci.ids )
-        rm cache/pci.ids.gz
 
         # kernel
@@ -273 +281 @@
                 echo "[1mBuilding ssmtp...[0m" ; \
                 ( cd $(SSMTP_DIR) && ./configure --exec-prefix="/usr" --prefix="" --enable-static --with-cflags="-O2 -g -Wall" && make && strip ssmtp ); \
+        fi
+
+        # hwinfo
+        -@if [ ! -e $(HWINFO_DIR)/hwinfo ]; then \
+                echo "[1mBuilding hwinfo...[0m" ; \
+                ( cd $(HWINFO_DIR) && make && strip hwinfo src/libhd.so.$(HWINFO_VER) ); \
         fi
 
@@ -353 +367 @@
         echo >> ../initramfs.conf ; \
         echo "# modules" >> ../initramfs.conf ; \
-        ( cd ../modules && find . -type d -printf "dir %p %m 0 0\n" && find . -type f \( -path \*/ide/\* -o -path \*/ata/\* -o -path \*/net/\* -o -path \*/usb/\* -o -path \*/fs/\* -o -path \*/block/\* -o -name cloop.ko -o -name modules.\* \) -printf "file %p .../modules%p %m 0 0\n" ) | sed -e 's|\./|/|g' >>$(CURDIR)/kernel/initramfs.conf ; \
+        ( cd ../modules && find . -type d -printf "dir %p %m 0 0\n" && find . -type f \( -path \*/ide/\* -o -path \*/ata/\* -o -path \*/net/\* -o -path \*/usb/\* -o -path \*/fs/\* -o -path \*/net/\* -o -path \*/staging/\* -o -path \*/block/\* -o -name cloop.ko -o -name modules.\* \) -printf "file %p .../modules%p %m 0 0\n" ) | sed -e 's|\./|/|g' >>$(CURDIR)/kernel/initramfs.conf ; \
         echo >> ../initramfs.conf ; \
         echo "# busybox applets" >> ../initramfs.conf ; \

main/linuxmuster-linbo/trunk/linbo/etc/ide_modules

@@ +1 @@
+aec62xx
+alim15x3
+amd74xx
 atiixp
-amd74xx
-piix
-via82cxxx
-alim15x3
-sis5513
-siimage
-aec62xx
 cmd640
 cmd64x
 cs5530
 cs5535
+cs5536
 hpt366
+ide_core
+ide_gd_mod
+ide_generic
+ide_pci_generic
+ide_platform
+it8172
 it8213
 it821x
@@ -19 +22 @@
 pdc202xx_new
 pdc202xx_old
+piix
 rz1000
 sc1200
 serverworks
+siimage
+sis5513
 slc90e66
 tc86c001
 triflex
 trm290
+via82cxxx
 

main/linuxmuster-linbo/trunk/linbo/init.sh

@@ -71 +71 @@
   [ -f "$i" ] && echo "ondemand" > "$i" 2>/dev/null
  done
+ # activate hotplugging
+ echo /sbin/mdev > /proc/sys/kernel/hotplug
+ # populate /dev
+ /sbin/mdev -s
 }
 
@@ -181 +185 @@
  esac
  rm -f /tmp/linbo-network.done
- UNAME="$(uname -r)"
- NETMODULES="$(findmodules /lib/modules/$UNAME/kernel/drivers/net)"
- for m in $NETMODULES; do
-  if [ -n "$debug" ]; then
-   modprobe -v "$m"
-  else
-   modprobe -q "$m"
-  fi
- done
+ modules="$(hwinfo --netcard | grep modprobe | awk -F\" '{ print $2 }' | awk '{ print $2 }')"
+ if [ -n "$modules" ]; then
+  echo "## Loading NIC Modules - Begin ##" > /tmp/linbo.log
+  for m in $modules; do
+   echo "-> $m"  | tee -a /tmp/linbo.log
+   modprobe $m
+  done
+  echo "## Loading NIC Modules - End ##" >> /tmp/linbo.log
+ else
+  echo "Fatal! No netcard found!"
+ fi
  sleep 2
  if [ -n "$ipaddr" ]; then
@@ -228 +234 @@
 }
 
+# check if module name is in /etc/ide_modules
+check_idemod(){
+ local mod=$1
+ local found=1
+ local line
+ while read line; do
+  if [ "$line" = "$mod" ]; then
+   found=0
+   break
+  fi
+ done </etc/ide_modules
+ if [ $found = 0 ]; then
+  [ -z "$useide" ] && found=1
+ else
+  [ -z "$useide" ] && found=0
+ fi 
+ return $found
+}
+
 # HW Detection
 hwsetup(){
  rm -f /tmp/linbo-cache.done
- echo "Searching for storage controller ..." | tee /tmp/linbo.log
- hwinfo --storage-ctrl | tee -a /tmp/linbo.log
- modules=`grep modprobe /tmp/linbo.log | awk -F\" '{ print $2 }' | awk '{ print $2 }'`
+ echo "## Hardware Info - Begin ##" >> /tmp/linbo.log
+ hwinfo --short --pci >> /tmp/linbo.log
+ echo "## Hardware Info - End ##" >> /tmp/linbo.log
+ hwinfo --storage-ctrl > /tmp/storage.log
+ modules=`grep modprobe /tmp/storage.log | awk -F\" '{ print $2 }' | awk '{ print $2 }'`
+ echo "## Detailed Storage Controler Info - Begin ##" >> /tmp/linbo.log
+ cat /tmp/storage.log >> /tmp/linbo.log
+ echo "## Detailed Storage Controler Info - End ##" >> /tmp/linbo.log
+ rm /tmp/storage.log
+ [ -n "$useide" ] && echo "Using IDE modules only as requested on command line ..." | tee -a /tmp/linbo.log
  if [ -n "$modules" ]; then
-  if [ -n "$useide" ]; then
-   echo "Probing IDE modules (useide) ..."  | tee -a /tmp/linbo.log
-   HDDMODULES=/etc/ide_modules
-  else
-   echo "Probing SATA/PATA modules ..."  | tee -a /tmp/linbo.log
-   HDDMODULES=/etc/ata_modules
-  fi
-  found=0
+  echo "## Loading Storage Modules - Begin ##" >> /tmp/linbo.log
+  local found=0
   for m in $modules; do
-   if grep -q "$m" $HDDMODULES; then
-     echo "-> $m"  | tee -a /tmp/linbo.log
-     modprobe $m
-     found=1
+   if check_idemod $m; then
+    echo "-> $m"  | tee -a /tmp/linbo.log
+    modprobe $m
+    found=1
    fi
   done
+  echo "## Loading Storage Modules - End ##" >> /tmp/linbo.log
   if [ $found = 0 ]; then
-   echo "Fatal! No modules found!" | tee -a /tmp/linbo.log
+   echo "Fatal! No storage modules found!" | tee -a /tmp/linbo.log
   else
    [ -n "$useide" ] && enable_dma

main/linuxmuster-linbo/trunk/linbo/linbo_cmd.sh

@@ -440 +440 @@
 
 # mkgrubmenu partition [kernel initrd server append]
-# Creates/updates menu.lst with given partition
+# Creates/updates menu.lst and device.map with given partition/disk
+# installs grub in mbr of disk
 # /cache is already mounted when this is called.
 mkgrubmenu(){
- local menu="/cache/boot/grub/menu.lst"
+ local grubdir="/cache/boot/grub"
+ [ -e "$grubdir" ] || mkdir -p "$grubdir"
+ local menu="$grubdir/menu.lst"
  local grubdisk="hd0"
- case "$1" in
-  *[hs]da) grubdisk=hd0 ;;
-  *[hs]db) grubdisk=hd1 ;;
-  *[hs]dc) grubdisk=hd2 ;;
-  *[hs]dd) grubdisk=hd3 ;;
+ local disk="${1%%[1-9]*}"
+ local grubpart="${1##*[hsv]d[a-z]}"
+ grubpart="$((grubpart - 1))"
+ case "$disk" in
+  *[hsv]da) grubdisk=hd0 ;;
+  *[hsv]db) grubdisk=hd1 ;;
+  *[hsv]dc) grubdisk=hd2 ;;
+  *[hsv]dd) grubdisk=hd3 ;;
  esac
- local grubpart="${1##*[hs]d[a-z]}"
- grubpart="$((grubpart - 1))"
  local root="root ($grubdisk,$grubpart)"
- echo
+ echo "($grubdisk) $disk" > /cache/boot/grub/device.map
  case "$(cat $menu 2>/dev/null)" in
   *$root*) true ;; # Entry for this partition is already present
@@ -477 +481 @@
 }
 
-# tschmitt: mkmenulst bootpart bootfile
-# Creates menu.lst with given partition
+# tschmitt: mkgrldr bootpart bootfile
+# Creates menu.lst on given windows partition
 # /cache and /mnt is already mounted when this is called.
 mkgrldr(){
@@ -486 +490 @@
  local driveid="0x80"
  case "$1" in
-  *[hs]da) grubdisk=hd0; driveid="0x80" ;;
-  *[hs]db) grubdisk=hd1; driveid="0x81" ;;
-  *[hs]dc) grubdisk=hd2; driveid="0x82" ;;
-  *[hs]dd) grubdisk=hd3; driveid="0x83" ;;
+  *[hsv]da) grubdisk=hd0; driveid="0x80" ;;
+  *[hsv]db) grubdisk=hd1; driveid="0x81" ;;
+  *[hsv]dc) grubdisk=hd2; driveid="0x82" ;;
+  *[hsv]dd) grubdisk=hd3; driveid="0x83" ;;
  esac
- local grubpart="${1##*[hs]d[a-z]}"
+ local grubpart="${1##*[hsv]d[a-z]}"
  grubpart="$((grubpart - 1))"
- bootlace.com --"$(fstype "$1")" --floppy="$driveid" "$1"
+ bootlace.com --"$(fstype_startconf "$1")" --floppy="$driveid" "$1"
  echo -e "default 0\ntimeout 0\nhiddenmenu\n\ntitle Windows\nroot ($grubdisk,$grubpart)\nchainloader ($grubdisk,$grubpart)/$bootfile" > $menu
  cp /usr/lib/grub/grldr /mnt
@@ -543 +547 @@
   # tschmitt: repairing grub mbr on every start
   if mountcache "$6" && cache_writable ; then
-   [ -e /cache/boot/grub ] || mkdir -p /cache/boot/grub
+   mkgrubmenu "$1"
    grub-install --root-directory=/cache $disk
   fi
@@ -560 +564 @@
      # tschmitt: needed for local boot here
      if [ -e /cache/boot/grub ] && cache_writable; then
-      mkgrubmenu "$1"
       grub-set-default --root-directory=/cache 1
      fi
@@ -677 +680 @@
 # mk_cloop type inputdev imagename baseimage [timestamp]
 mk_cloop(){
+ echo "## $(date) : Starte Erstellung von $1." | tee -a /tmp/image.log
  echo -n "mk_cloop " ;  printargs "$@" | tee -a /tmp/image.log
  local RC=1
@@ -762 +766 @@
   ;; 
  esac
+ echo "## $(date) : Beende Erstellung von $1." | tee -a /tmp/image.log
  return "$RC"
 }
@@ -796 +801 @@
 # cp_cloop imagefile targetdev
 cp_cloop(){
+ echo "## $(date) : Starte Komplettrestore von $1." | tee -a /tmp/image.log
  echo -n "cp_cloop " ;  printargs "$@" | tee -a /tmp/image.log
  local RC=1
@@ -839 +845 @@
  fi
  [ "$RC" = "0" ] && update_status "$2" "$1"
+ echo "## $(date) : Beende Komplettrestore von $1." | tee -a /tmp/image.log
  return "$RC"
 }
@@ -845 +852 @@
 # sync_cloop imagefile targetdev
 sync_cloop(){
+ echo "## $(date) : Starte Synchronisation von $1." | tee -a /tmp/image.log
  # echo -n "sync_cloop " ;  printargs "$@"
  local RC=1
@@ -905 +913 @@
  fi
  [ "$RC" = "0" ] && update_status "$2" "$1"
+ echo "## $(date) : Beende Synchronisation von $1." | tee -a /tmp/image.log
  return "$RC"
 }