Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-andrew cauldron by Justin Boffemmyer (9cd102c14cb889cf1d8c59a3769bbca4104ee7ff)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Justin Boffemmyer <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-andrew cauldron by Justin Boffemmyer (9cd102c14cb889cf1d8c59a3769bbca4104ee7ff)
  • Date: Thu, 8 Jan 2009 13:42:13 -0600

GIT changes to devel-andrew cauldron by Justin Boffemmyer
<flux AT sourcemage.org>:

data/config-2.6 | 1964
++++++++++++++++++------------
doc/release.recipe | 145 +-
iso/usr/bin/539 | 2
iso/usr/share/doc/smgl.install/steps/grub | 2
iso/usr/share/smgl.install/smgl-alchemy | 196 ++
iso/usr/share/smgl.install/smgl-kernel | 2
iso/usr/share/smgl.install/smgl-spells | 2
scripts/add-sauce.sh | 18
scripts/cleaniso.sh | 76 -
scripts/fhs-hack.sh | 187 ++
scripts/mkinitrd.sh | 68 -
scripts/mkiso.sh | 24
scripts/mkrelease.sh | 24
scripts/mksystem.sh | 36
scripts/spellcaster.sh | 165 +-
scripts/twelve-step-program.sh | 53
16 files changed, 1936 insertions(+), 1028 deletions(-)

New commits:
commit 9cd102c14cb889cf1d8c59a3769bbca4104ee7ff
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/twelve-step-program.sh: update recipe

Updated for the new build recipe.

commit 10a7705ddf4f4ec10c794d0f6b75c232a492403a
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

doc/release.recipe: updated recipe

Updated the release recipe for the improved generation process.

commit e8738e5e14a4292782faddbff262ef58ee22c7c7
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/mkinitrd.sh: try to find kernel version

Try to automatically find the kernel version if it isn't specified on
the command-line. This works by checking to see if there is only one
kernel module directory in the ISO chroot, and using the version it
finds there. This should always work, because there should only be one
kernel version per ISO, but it's possible someone will use the scripts
to make an ISO with multiple kernel versions, in which case the version
will have to be specified as the first argument of the script.

commit 6f8d50c4c994e26a300cc49f16b464820c9e7550
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/mkinitrd.sh: more checking, default output

Added better sanity checks on the iso chroot dir, and defaulted the
output to be ISO/boot/initrd.gz instead of the current directory.

commit 1ba279f2c52aaa2b0380e0946e60a35334777928
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/mk*.sh: standardize script invocation

Standardized all the scripts to accept -i,-s flags to get the iso and
sys paths.

commit bd6c00b4d1497e97cc2f0df2879b93ddd0091adc
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/add-sauce.sh: don't add grub config to ISO

The ISO doesn't boot with grub, and even if it did this is a sample
config, so don't add it.

commit dd2e372f0e92d4987d2b92ea4c163a99b2eb03c0
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/spellcaster.sh: new NOBUILD option

New option for generating the ISO and SYS trees without going through
the build steps. Mostly useful when you've already run spellcaster.sh
once but messed something up later, and you need to regenerate your ISO
and SYS trees.

commit 2295ed3159af2266e55cf763c7943525c88669c1
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/spellcaster.sh: use smgl-fhs workaround

Use the new fhs-hack.sh as a workaround for the smgl-fhs problem, and do
early add-sauce.sh runs to put minimal files inside the respective
product dirs. Later add-sauce.sh runs will still be necessary to ensure
that all the files are correct.

commit a172e10b3d9840cc91f0864f98cf5d101276b109
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/fhs-hack.sh: new, hack for smgl-fhs bug

This is a modified version of the INSTALL script from the smgl-fhs spell
that will let us run the same "install" but on any target passed in.
This is a workaround for the bug with the smgl-fhs spell until that gets
resolved.

commit 3bf4d514a49703dbae0bc2cdcbc54266302aaf44
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/spellcaster.sh: remove spurious spaces

Remove unnecessary spaces from end of line.

commit bafb2c1918336a1ef66288adb2bd2357208e9e4f
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/spellcaster.sh: don't force rm resolv.conf

Don't blindly remove resolv.conf. Only swap it with the one in tmp/ if
that one exists.

commit ef0f9b27c1fa29609a7e42ef49c149b69a65e150
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/spellcaster.sh: fix codex path

Forgot to include 'codex' in the path to the grimoire.

commit 4758ac24da385950f8aad59c011371ae7553b648
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/spellcaster.sh: generate tablet in chroot

Generate all the tablet info from within the chroot, so the proper
sorcery config can be sourced. This is a much cleaner way to generate
the depends and packages files.

commit a684abf0ee496d76908177ed09f932c9d15488c0
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/spellcaster.sh: inc verbose output

Increased the verbosity of the script by adding a new function, msg,
that outputs it's argument if QUIET is not set. Correspondingly, there
is a new option for setting QUIET. Various messages were added using the
new msg function to make it clear what the script is doing as it's
processing things.

commit 1ddbdbd6bf2672bbb4f6a985ba0ce970c1db40d4
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/cleaniso.sh: simplify for new process

The new generation process doesn't require all the cleaning previously
necessary, since the iso dir only starts with what we specifically put
into it anyway. Therefore, cleaniso.sh does much less than it used to.
Cleaner files are no longer necessary. Instead, it only cleans out a few
specific directories of all their files, so this can be included
directly into the script.

commit 8e19197148132419dab77708cd4892432421cf18
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

modified smgl.install/smgl-alchemy help name

I forgot to modify help when I changed the name of the script from
alchemy to
smgl-alchemy.

commit 19aec69f15c09c9f6c2a8429977a37ce06139c24
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/spellcaster.sh: ensure kernel presence

Make sure that either the kernel sources are present within the build
directory (unpacked) or that the linux spell is being used. Otherwise
some of the casts can fail, and other cauldron scripts will not function
properly either.

commit fe1a4191a3379214e6a4d6b77e8a5d14acdad7bd
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/spellcaster.sh: better exits/error msgs

Be more verbose when exiting due to error, and don't force exit 0 at the
end of the script.

commit ab731d60d3e8b321b8a56abba32e4823f4c70f49
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/spellcaster.sh: no need to clean build

We don't need to clean the build directory of all the files, only the
casting script. If the user wants a clean build directory, the best
solution would be to rm -r the whole build tree and start from scratch.

commit 0ab80345f839631dd30dfbc10949075899af2cad
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/add-sauce.sh: inc verbosity of script

Added messages to signal what the script was doing, and to make errors
more clear to aid in debugging.

commit dbde32a76c9ff794eacdccfc2e94f128d9044f4a
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

iso/usr/bin/539: update link to smgl-keymap

Forgot to update the link when the script name changed. Fixes bug
15008.

commit 6a2f2e8c5487945f452f3c1fffe3498e6d60078e
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/spellcaster.sh: regen tablet files once

Only generate the sorcery packages and depends files once, instead of
one time per spell inside the loop.

commit 342970b659d1ac44ebf07ed6c39f755525f40137
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

smgl.install/smgl-alchemy: added new script

This new dialog based script permits to select optional spells from cache
directory, and then writes list into a file in order to cast them.
It remembers previously selected spells when called several times.

commit ab2be6c44b57754fb5458de22d6ef2c6869c10b9
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

Revert "smgl.install/smgl-alchemy: added new script"

This reverts commit e980c35be7ad633a6d58d046b65989c69dc9b04b.

git username and email address were misconfigured

commit e980c35be7ad633a6d58d046b65989c69dc9b04b
Author: Willow OffGood <quinq AT willow.quinq.eu.org>
Commit: Willow OffGood <quinq AT willow.quinq.eu.org>

smgl.install/smgl-alchemy: added new script

This new dialog based script permits to select optional spells from cache
directory, and then writes list into a file in order to cast them.
It remembers previously selected spells when called several times.

commit 909337d341523958a3b590cd9d9625b5d9a178e0
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

steps/grub: fix menu.lst naming

Accidentally called menu.lst "menu.list".

commit 21bd718c2deb13c9f49a28515649775e2fe45509
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

data/config-2.6: linux 2.6.27.10

Updated the in-repo kernel config for 2.6.27.10.

commit 94575e1d4b76ff538b5a182004e5e659edf1b197
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

smgl.install/smgl-kernel: fix symlink

The symlink was pointing to a target that was prefixed with TARGET,
which doesn't exist in the installed system but only from the
perspective of the running ISO. This was fixed.

commit ede179775c2ba25d2e0292922c5fa362283683a3
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

smgl.install/smgl-spells: fix improper test

The test in toggle_choice was testing the var without '$', so it wasn't
getting the value, resulting in the test always failing.

diff --git a/data/config-2.6 b/data/config-2.6
index 5b9d8ae..606dedc 100644
--- a/data/config-2.6
+++ b/data/config-2.6
@@ -1,56 +1,97 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22
-# Tue Sep 30 03:10:55 2008
+# Linux kernel version: 2.6.27.10
+# Tue Dec 30 23:02:35 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
CONFIG_GENERIC_CLOCKEVENTS=y
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=y
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 is not set
+# 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_X86_BIOS_REBOOT=y
+CONFIG_KTIME_SCALAR=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

#
-# Code maturity level options
+# General setup
#
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
CONFIG_LOCALVERSION="-SMGL-iso"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
# CONFIG_TASKSTATS is not set
-# CONFIG_UTS_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=18
-# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_LOG_BUF_SHIFT=17
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_NS=y
+CONFIG_CGROUP_DEVICE=y
+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_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_MM_OWNER=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
CONFIG_RELAY=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+# 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=y
@@ -59,12 +100,13 @@ CONFIG_SYSCTL=y
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
-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 is not set
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
CONFIG_ANON_INODES=y
@@ -77,27 +119,37 @@ CONFIG_VM_EVENT_COUNTERS=y
CONFIG_SLAB=y
# CONFIG_SLUB is not set
# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_ARCH_TRACEHOOK is not set
+# CONFIG_HAVE_DMA_ATTRS is not set
+# CONFIG_USE_GENERIC_SMP_HELPERS is not set
+# CONFIG_HAVE_CLK is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_KMOD=y
-
-#
-# Block layer
-#
CONFIG_BLOCK=y
CONFIG_LBD=y
CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_LSF=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_BLK_DEV_INTEGRITY=y

#
# IO Schedulers
@@ -111,6 +163,8 @@ CONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_CFQ is not set
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_CLASSIC_RCU=y

#
# Processor type and features
@@ -118,17 +172,26 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
CONFIG_TICK_ONESHOT=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
# CONFIG_SMP is not set
+CONFIG_X86_FIND_SMP_CONFIG=y
+CONFIG_X86_MPPARSE=y
CONFIG_X86_PC=y
# CONFIG_X86_ELAN is not set
# CONFIG_X86_VOYAGER is not set
-# CONFIG_X86_NUMAQ is not set
-# CONFIG_X86_SUMMIT is not set
-# CONFIG_X86_BIGSMP is not set
-# 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_VSMP is not set
+# CONFIG_X86_RDC321X is not set
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_PARAVIRT_GUEST=y
+CONFIG_XEN_SAVE_RESTORE=y
+CONFIG_VMI=y
+CONFIG_KVM_CLOCK=y
+CONFIG_KVM_GUEST=y
+CONFIG_LGUEST_GUEST=y
+CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_CLOCK=y
+CONFIG_MEMTEST=y
# CONFIG_M386 is not set
CONFIG_M486=y
# CONFIG_M586 is not set
@@ -138,7 +201,6 @@ CONFIG_M486=y
# 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
@@ -153,14 +215,14 @@ CONFIG_M486=y
# 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=y
+CONFIG_X86_CPU=y
CONFIG_X86_CMPXCHG=y
CONFIG_X86_L1_CACHE_SHIFT=7
CONFIG_X86_XADD=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_X86_PPRO_FENCE=y
CONFIG_X86_F00F_BUG=y
CONFIG_X86_WP_WORKS_OK=y
@@ -169,8 +231,11 @@ CONFIG_X86_BSWAP=y
CONFIG_X86_POPAD_OK=y
CONFIG_X86_ALIGNMENT_16=y
CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_MINIMUM_CPU_MODEL=4
+CONFIG_X86_MINIMUM_CPU_FAMILY=4
CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+# CONFIG_IOMMU_HELPER is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
# CONFIG_PREEMPT is not set
@@ -184,19 +249,11 @@ CONFIG_X86_MCE_P4THERMAL=y
CONFIG_VM86=y
CONFIG_TOSHIBA=m
CONFIG_I8K=m
-# CONFIG_X86_REBOOTFIXUPS is not set
+CONFIG_X86_REBOOTFIXUPS=y
CONFIG_MICROCODE=y
CONFIG_MICROCODE_OLD_INTERFACE=y
CONFIG_X86_MSR=y
CONFIG_X86_CPUID=y
-
-#
-# Firmware Drivers
-#
-# CONFIG_EDD is not set
-# CONFIG_EFI_VARS is not set
-# CONFIG_DELL_RBU is not set
-# CONFIG_DCDBAS is not set
# CONFIG_NOHIGHMEM is not set
CONFIG_HIGHMEM4G=y
# CONFIG_HIGHMEM64G is not set
@@ -205,7 +262,6 @@ CONFIG_HIGHMEM=y
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
@@ -213,21 +269,30 @@ CONFIG_FLATMEM_MANUAL=y
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 is not set
CONFIG_ZONE_DMA_FLAG=1
-CONFIG_NR_QUICK=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
# CONFIG_HIGHPTE is not set
+CONFIG_X86_RESERVE_LOW_64K=y
CONFIG_MATH_EMULATION=y
CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
CONFIG_EFI=y
-CONFIG_BOOT_IOREMAP=y
CONFIG_SECCOMP=y
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_1000 is not set
CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
# CONFIG_KEXEC is not set
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x100000
@@ -237,44 +302,48 @@ CONFIG_COMPAT_VDSO=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

#
-# Power management options (ACPI, APM)
+# Power management options
#
CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
CONFIG_PM_DEBUG=y
-# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
-# CONFIG_PM_TRACE is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
-CONFIG_SOFTWARE_SUSPEND=y
+# CONFIG_PM_VERBOSE is not set
+CONFIG_CAN_PM_TRACE=y
+# CONFIG_PM_TRACE_RTC is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_HIBERNATION=y
CONFIG_PM_STD_PARTITION=""
-
-#
-# ACPI (Advanced Configuration and Power Interface) Support
-#
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_SLEEP_PROC_FS=y
-# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
CONFIG_ACPI_PROCFS=y
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_SYSFS_POWER=y
+CONFIG_ACPI_PROC_EVENT=y
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
+# CONFIG_ACPI_VIDEO is not set
CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=m
+CONFIG_ACPI_DOCK=y
# CONFIG_ACPI_BAY is not set
CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_WMI is not set
CONFIG_ACPI_ASUS=m
CONFIG_ACPI_TOSHIBA=m
+# CONFIG_ACPI_CUSTOM_DSDT is not set
CONFIG_ACPI_BLACKLIST_YEAR=2001
CONFIG_ACPI_DEBUG=y
+# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
CONFIG_ACPI_EC=y
+# CONFIG_ACPI_PCI_SLOT is not set
CONFIG_ACPI_POWER=y
CONFIG_ACPI_SYSTEM=y
CONFIG_X86_PM_TIMER=y
# CONFIG_ACPI_CONTAINER is not set
# CONFIG_ACPI_SBS is not set
+CONFIG_X86_APM_BOOT=y
CONFIG_APM=m
# CONFIG_APM_IGNORE_USER_SUSPEND is not set
# CONFIG_APM_DO_ENABLE is not set
@@ -292,7 +361,10 @@ CONFIG_CPU_FREQ_DEBUG=y
CONFIG_CPU_FREQ_STAT=m
CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# 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
@@ -310,7 +382,6 @@ CONFIG_X86_POWERNOW_K8=m
CONFIG_X86_POWERNOW_K8_ACPI=y
CONFIG_X86_GX_SUSPMOD=m
CONFIG_X86_SPEEDSTEP_CENTRINO=m
-# CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI is not set
CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
CONFIG_X86_SPEEDSTEP_ICH=m
CONFIG_X86_SPEEDSTEP_SMI=m
@@ -326,25 +397,31 @@ CONFIG_X86_E_POWERSAVER=m
CONFIG_X86_ACPI_CPUFREQ_PROC_INTF=y
CONFIG_X86_SPEEDSTEP_LIB=m
CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
+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_OLPC=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_DEBUG=y
+CONFIG_PCI_LEGACY=y
CONFIG_HT_IRQ=y
CONFIG_ISA_DMA_API=y
CONFIG_ISA=y
@@ -358,11 +435,8 @@ CONFIG_MCA_LEGACY=y
CONFIG_MCA_PROC_FS=y
CONFIG_SCx200=m
CONFIG_SCx200HR_TIMER=m
+CONFIG_OLPC=y
CONFIG_K8_NB=y
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
CONFIG_PCCARD=m
CONFIG_PCMCIA_DEBUG=y
CONFIG_PCMCIA=m
@@ -398,15 +472,11 @@ CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
CONFIG_HOTPLUG_PCI_SHPC=m

#
-# Executable file formats
+# Executable file formats / Emulations
#
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_AOUT=m
CONFIG_BINFMT_MISC=m
-
-#
-# Networking
-#
CONFIG_NET=y

#
@@ -419,6 +489,8 @@ CONFIG_XFRM=y
CONFIG_XFRM_USER=y
# CONFIG_XFRM_SUB_POLICY is not set
# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
CONFIG_NET_KEY=m
# CONFIG_NET_KEY_MIGRATE is not set
CONFIG_INET=y
@@ -429,7 +501,6 @@ CONFIG_ASK_IP_FIB_HASH=y
CONFIG_IP_FIB_HASH=y
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_ROUTE_MULTIPATH=y
-# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
CONFIG_IP_ROUTE_VERBOSE=y
CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
@@ -451,6 +522,7 @@ CONFIG_INET_TUNNEL=m
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
@@ -491,13 +563,16 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_INET6_XFRM_MODE_BEET=m
# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
CONFIG_IPV6_TUNNEL=m
CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_SUBTREES=y
-# CONFIG_NETLABEL is not set
+# CONFIG_IPV6_MROUTE is not set
+CONFIG_NETLABEL=y
CONFIG_NETWORK_SECMARK=y
CONFIG_NETFILTER=y
CONFIG_NETFILTER_DEBUG=y
+CONFIG_NETFILTER_ADVANCED=y
CONFIG_BRIDGE_NETFILTER=y

#
@@ -506,14 +581,15 @@ CONFIG_BRIDGE_NETFILTER=y
CONFIG_NETFILTER_NETLINK=y
CONFIG_NETFILTER_NETLINK_QUEUE=y
CONFIG_NETFILTER_NETLINK_LOG=y
-CONFIG_NF_CONNTRACK_ENABLED=m
CONFIG_NF_CONNTRACK=m
CONFIG_NF_CT_ACCT=y
CONFIG_NF_CONNTRACK_MARK=y
CONFIG_NF_CONNTRACK_SECMARK=y
# CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
CONFIG_NF_CT_PROTO_GRE=m
# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
CONFIG_NF_CONNTRACK_AMANDA=m
CONFIG_NF_CONNTRACK_FTP=m
# CONFIG_NF_CONNTRACK_H323 is not set
@@ -532,32 +608,41 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
CONFIG_NETFILTER_XT_TARGET_SECMARK=m
CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
CONFIG_NETFILTER_XT_MATCH_DCCP=m
CONFIG_NETFILTER_XT_MATCH_DSCP=m
CONFIG_NETFILTER_XT_MATCH_ESP=m
CONFIG_NETFILTER_XT_MATCH_HELPER=m
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
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 is not set
CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
CONFIG_NETFILTER_XT_MATCH_REALM=m
# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
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 is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m

#
@@ -567,13 +652,10 @@ CONFIG_NF_CONNTRACK_IPV4=m
CONFIG_NF_CONNTRACK_PROC_COMPAT=y
CONFIG_IP_NF_QUEUE=m
CONFIG_IP_NF_IPTABLES=y
-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
@@ -584,7 +666,6 @@ CONFIG_NF_NAT_NEEDED=y
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 is not set
CONFIG_NF_NAT_PROTO_GRE=m
CONFIG_NF_NAT_FTP=m
@@ -595,17 +676,17 @@ CONFIG_NF_NAT_PPTP=m
# CONFIG_NF_NAT_H323 is not set
# CONFIG_NF_NAT_SIP is not set
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 is not set
CONFIG_IP_NF_RAW=m
+# CONFIG_IP_NF_SECURITY is not set
CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m

#
-# IPv6: Netfilter Configuration (EXPERIMENTAL)
+# IPv6: Netfilter Configuration
#
# CONFIG_NF_CONNTRACK_IPV6 is not set
CONFIG_IP6_NF_QUEUE=m
@@ -614,7 +695,6 @@ CONFIG_IP6_NF_MATCH_RT=m
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
@@ -625,6 +705,7 @@ CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_TARGET_HL=m
CONFIG_IP6_NF_RAW=m
+# CONFIG_IP6_NF_SECURITY is not set

#
# DECnet: Netfilter Configuration
@@ -642,6 +723,7 @@ CONFIG_BRIDGE_EBT_802_3=m
CONFIG_BRIDGE_EBT_AMONG=m
CONFIG_BRIDGE_EBT_ARP=m
CONFIG_BRIDGE_EBT_IP=m
+# CONFIG_BRIDGE_EBT_IP6 is not set
CONFIG_BRIDGE_EBT_LIMIT=m
CONFIG_BRIDGE_EBT_MARK=m
CONFIG_BRIDGE_EBT_PKTTYPE=m
@@ -654,6 +736,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
CONFIG_BRIDGE_EBT_SNAT=m
CONFIG_BRIDGE_EBT_LOG=m
CONFIG_BRIDGE_EBT_ULOG=m
+# CONFIG_BRIDGE_EBT_NFLOG is not set
# CONFIG_IP_DCCP is not set
CONFIG_IP_SCTP=y
# CONFIG_SCTP_DBG_MSG is not set
@@ -662,9 +745,18 @@ CONFIG_IP_SCTP=y
# CONFIG_SCTP_HMAC_SHA1 is not set
CONFIG_SCTP_HMAC_MD5=y
# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_STP=m
+CONFIG_GARP=m
CONFIG_BRIDGE=m
CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
CONFIG_DECNET=m
# CONFIG_DECNET_ROUTER is not set
CONFIG_LLC=y
@@ -684,12 +776,7 @@ CONFIG_IPDDP_DECAP=y
# CONFIG_LAPB is not set
# CONFIG_ECONET is not set
CONFIG_WAN_ROUTER=m
-
-#
-# QoS and/or fair queueing
-#
CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_FIFO=y

#
# Queueing/Scheduling
@@ -697,6 +784,7 @@ CONFIG_NET_SCH_FIFO=y
CONFIG_NET_SCH_CBQ=m
CONFIG_NET_SCH_HTB=m
CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
CONFIG_NET_SCH_PRIO=m
CONFIG_NET_SCH_RED=m
CONFIG_NET_SCH_SFQ=m
@@ -721,6 +809,7 @@ CONFIG_CLS_U32_PERF=y
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
@@ -734,10 +823,11 @@ CONFIG_NET_ACT_GACT=m
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 is not set
CONFIG_NET_CLS_IND=y
-CONFIG_NET_ESTIMATOR=y
+CONFIG_NET_SCH_FIFO=y

#
# Network testing
@@ -765,16 +855,25 @@ CONFIG_SCC=m
CONFIG_SCC_TRXECHO=y
CONFIG_BAYCOM_SER_FDX=m
CONFIG_BAYCOM_SER_HDX=m
-# CONFIG_BAYCOM_PAR is not set
-# CONFIG_BAYCOM_EPP is not set
+CONFIG_BAYCOM_PAR=m
+CONFIG_BAYCOM_EPP=m
CONFIG_YAM=m
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+# CONFIG_CAN_DEBUG_DEVICES is not set
CONFIG_IRDA=m

#
# IrDA protocols
#
CONFIG_IRLAN=m
-# CONFIG_IRNET is not set
+CONFIG_IRNET=m
CONFIG_IRCOMM=m
CONFIG_IRDA_ULTRA=y

@@ -797,27 +896,20 @@ CONFIG_IRTTY_SIR=m
#
# Dongle support
#
-# CONFIG_DONGLE is not set
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
CONFIG_KINGSUN_DONGLE=m
-
-#
-# Old SIR device drivers
-#
-CONFIG_IRPORT_SIR=m
-
-#
-# Old Serial dongle support
-#
-CONFIG_DONGLE_OLD=y
-CONFIG_ESI_DONGLE_OLD=m
-CONFIG_ACTISYS_DONGLE_OLD=m
-CONFIG_TEKRAM_DONGLE_OLD=m
-CONFIG_GIRBIL_DONGLE_OLD=m
-CONFIG_LITELINK_DONGLE_OLD=m
-CONFIG_MCP2120_DONGLE_OLD=m
-CONFIG_OLD_BELKIN_DONGLE_OLD=m
-# CONFIG_ACT200L_DONGLE_OLD is not set
-# CONFIG_MA600_DONGLE_OLD is not set
+# CONFIG_KSDAZZLE_DONGLE is not set
+# CONFIG_KS959_DONGLE is not set

#
# FIR device drivers
@@ -846,11 +938,12 @@ CONFIG_BT_HIDP=m
#
# Bluetooth device drivers
#
-CONFIG_BT_HCIUSB=m
-CONFIG_BT_HCIUSB_SCO=y
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_LL=y
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
@@ -868,20 +961,30 @@ CONFIG_FIB_RULES=y
# Wireless
#
CONFIG_CFG80211=m
+CONFIG_NL80211=y
CONFIG_WIRELESS_EXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
CONFIG_MAC80211=m
-# CONFIG_MAC80211_LEDS is not set
+
+#
+# Rate control algorithm selection
+#
+CONFIG_MAC80211_RC_PID=y
+CONFIG_MAC80211_RC_DEFAULT_PID=y
+CONFIG_MAC80211_RC_DEFAULT="pid"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_DEBUG is not set
+# CONFIG_MAC80211_DEBUG_MENU 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=m
CONFIG_RFKILL_INPUT=m
+CONFIG_RFKILL_LEDS=y
+# CONFIG_NET_9P is not set

#
# Device Drivers
@@ -890,16 +993,13 @@ CONFIG_RFKILL_INPUT=m
#
# Generic Driver Options
#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
# CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
CONFIG_CONNECTOR=m
CONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
@@ -910,6 +1010,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_CMDLINE_PARTS is not set
+CONFIG_MTD_AR7_PARTS=m

#
# User Modules And Translation Layers
@@ -924,6 +1025,7 @@ CONFIG_NFTL_RW=y
CONFIG_INFTL=m
CONFIG_RFD_FTL=m
CONFIG_SSFDC=m
+# CONFIG_MTD_OOPS is not set

#
# RAM/ROM/Flash chip drivers
@@ -963,7 +1065,6 @@ CONFIG_MTD_PHYSMAP=m
CONFIG_MTD_PHYSMAP_START=0x8000000
CONFIG_MTD_PHYSMAP_LEN=0
CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-CONFIG_MTD_PNC2000=m
CONFIG_MTD_SC520CDP=m
CONFIG_MTD_NETSC520=m
CONFIG_MTD_TS5500=m
@@ -979,6 +1080,7 @@ CONFIG_MTD_DILNETPC=m
CONFIG_MTD_DILNETPC_BOOTSIZE=0x80000
CONFIG_MTD_L440GX=m
CONFIG_MTD_PCI=m
+CONFIG_MTD_INTEL_VR_NOR=m
CONFIG_MTD_PLATRAM=m

#
@@ -987,8 +1089,9 @@ CONFIG_MTD_PLATRAM=m
CONFIG_MTD_PMC551=m
# CONFIG_MTD_PMC551_BUGFIX is not set
# CONFIG_MTD_PMC551_DEBUG is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
+CONFIG_MTD_DATAFLASH=m
+CONFIG_MTD_M25P80=m
+CONFIG_M25PXX_USE_FAST_READ=y
CONFIG_MTD_SLRAM=m
CONFIG_MTD_PHRAM=m
# CONFIG_MTD_MTDRAM is not set
@@ -1014,9 +1117,12 @@ CONFIG_MTD_NAND_CAFE=m
CONFIG_MTD_NAND_CS553X=m
CONFIG_MTD_NAND_NANDSIM=m
CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_ALAUDA=m
CONFIG_MTD_ONENAND=m
CONFIG_MTD_ONENAND_VERIFY_WRITE=y
CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_ONENAND_SIM=m

#
# UBI - Unsorted block images
@@ -1030,10 +1136,6 @@ CONFIG_MTD_UBI_BEB_RESERVE=1
# UBI debugging options
#
# CONFIG_MTD_UBI_DEBUG is not set
-
-#
-# Parallel port support
-#
CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
@@ -1044,10 +1146,6 @@ CONFIG_PARPORT_PC_PCMCIA=m
CONFIG_PARPORT_AX88796=m
CONFIG_PARPORT_1284=y
CONFIG_PARPORT_NOT_PC=y
-
-#
-# Plug and Play support
-#
CONFIG_PNP=y
# CONFIG_PNP_DEBUG is not set

@@ -1057,10 +1155,7 @@ CONFIG_PNP=y
CONFIG_ISAPNP=y
# CONFIG_PNPBIOS is not set
CONFIG_PNPACPI=y
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
CONFIG_BLK_DEV_FD=m
CONFIG_BLK_DEV_XD=m
CONFIG_PARIDE=m
@@ -1107,40 +1202,54 @@ CONFIG_BLK_DEV_UB=m
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=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
CONFIG_ATA_OVER_ETH=m
-
-#
-# Misc devices
-#
+# CONFIG_VIRTIO_BLK is not set
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_MISC_DEVICES=y
CONFIG_IBM_ASM=m
CONFIG_PHANTOM=m
+CONFIG_EEPROM_93CX6=m
CONFIG_SGI_IOC4=m
# CONFIG_TIFM_CORE is not set
+# CONFIG_ACER_WMI is not set
# CONFIG_ASUS_LAPTOP is not set
+CONFIG_FUJITSU_LAPTOP=m
+# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+# CONFIG_TC1100_WMI is not set
CONFIG_MSI_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
CONFIG_SONY_LAPTOP=m
CONFIG_SONYPI_COMPAT=y
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_HP_ILO=m
+CONFIG_HAVE_IDE=y
CONFIG_IDE=y
CONFIG_BLK_DEV_IDE=y

#
-# Please see Documentation/ide.txt for help/info on IDE drives
+# Please see Documentation/ide/ide.txt for help/info on IDE drives
#
+CONFIG_IDE_TIMINGS=y
+CONFIG_IDE_ATAPI=y
# CONFIG_BLK_DEV_IDE_SATA is not set
-# CONFIG_BLK_DEV_HD_IDE is not set
CONFIG_BLK_DEV_IDEDISK=y
CONFIG_IDEDISK_MULTI_MODE=y
CONFIG_BLK_DEV_IDECS=m
CONFIG_BLK_DEV_DELKIN=m
CONFIG_BLK_DEV_IDECD=m
-# CONFIG_BLK_DEV_IDETAPE is not set
+CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
+CONFIG_BLK_DEV_IDETAPE=m
CONFIG_BLK_DEV_IDEFLOPPY=m
CONFIG_BLK_DEV_IDESCSI=y
CONFIG_BLK_DEV_IDEACPI=y
@@ -1151,32 +1260,31 @@ CONFIG_IDE_PROC_FS=y
# IDE chipset support/bugfixes
#
CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_PLATFORM=m
CONFIG_BLK_DEV_CMD640=y
CONFIG_BLK_DEV_CMD640_ENHANCED=y
CONFIG_BLK_DEV_IDEPNP=y
+CONFIG_BLK_DEV_IDEDMA_SFF=y
+
+#
+# PCI IDE chipsets support
+#
CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
CONFIG_IDEPCI_PCIBUS_ORDER=y
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_BLK_DEV_GENERIC=m
# CONFIG_BLK_DEV_OPTI621 is not set
CONFIG_BLK_DEV_RZ1000=m
CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
CONFIG_BLK_DEV_AEC62XX=m
CONFIG_BLK_DEV_ALI15X3=m
-# CONFIG_WDC_ALI15X3 is not set
CONFIG_BLK_DEV_AMD74XX=m
CONFIG_BLK_DEV_ATIIXP=m
CONFIG_BLK_DEV_CMD64X=m
CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CY82C693=m
# CONFIG_BLK_DEV_CS5520 is not set
CONFIG_BLK_DEV_CS5530=m
CONFIG_BLK_DEV_CS5535=m
-CONFIG_BLK_DEV_HPT34X=m
-# CONFIG_HPT34X_AUTODMA is not set
CONFIG_BLK_DEV_HPT366=m
CONFIG_BLK_DEV_JMICRON=m
CONFIG_BLK_DEV_SC1200=m
@@ -1185,7 +1293,6 @@ CONFIG_BLK_DEV_IT8213=m
CONFIG_BLK_DEV_IT821X=m
CONFIG_BLK_DEV_NS87415=m
CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_PDC202XX_BURST=y
CONFIG_BLK_DEV_PDC202XX_NEW=m
CONFIG_BLK_DEV_SVWKS=m
CONFIG_BLK_DEV_SIIMAGE=m
@@ -1194,8 +1301,10 @@ CONFIG_BLK_DEV_SLC90E66=m
CONFIG_BLK_DEV_TRM290=m
CONFIG_BLK_DEV_VIA82CXXX=m
CONFIG_BLK_DEV_TC86C001=m
-# CONFIG_IDE_ARM is not set
-CONFIG_IDE_CHIPSETS=y
+
+#
+# Other IDE chipsets support
+#

#
# Note: most of these also require special kernel boot parameters
@@ -1207,14 +1316,13 @@ CONFIG_BLK_DEV_HT6560B=m
CONFIG_BLK_DEV_QD65XX=m
CONFIG_BLK_DEV_UMC8672=m
CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_BLK_DEV_HD is not set

#
# SCSI device support
#
CONFIG_RAID_ATTRS=y
CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
CONFIG_SCSI_TGT=m
CONFIG_SCSI_NETLINK=y
CONFIG_SCSI_PROC_FS=y
@@ -1229,6 +1337,7 @@ CONFIG_BLK_DEV_SR=m
CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=y
CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m

#
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -1247,11 +1356,12 @@ CONFIG_SCSI_FC_ATTRS=y
CONFIG_SCSI_ISCSI_ATTRS=y
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 is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_SRP_ATTRS=m
+# CONFIG_SCSI_SRP_TGT_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
CONFIG_ISCSI_TCP=m
CONFIG_BLK_DEV_3W_XXXX_RAID=m
CONFIG_SCSI_3W_9XXX=m
@@ -1280,6 +1390,7 @@ CONFIG_SCSI_DPT_I2O=m
CONFIG_SCSI_ADVANSYS=m
CONFIG_SCSI_IN2000=m
CONFIG_SCSI_ARCMSR=m
+# CONFIG_SCSI_ARCMSR_AER is not set
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
@@ -1287,7 +1398,7 @@ CONFIG_MEGARAID_LEGACY=m
CONFIG_MEGARAID_SAS=m
CONFIG_SCSI_HPTIOP=m
CONFIG_SCSI_BUSLOGIC=m
-# CONFIG_SCSI_OMIT_FLASHPOINT is not set
+# CONFIG_SCSI_FLASHPOINT is not set
CONFIG_SCSI_DMX3191D=m
CONFIG_SCSI_DTC3280=m
CONFIG_SCSI_EATA=m
@@ -1310,6 +1421,7 @@ CONFIG_SCSI_PPA=m
CONFIG_SCSI_IMM=m
# CONFIG_SCSI_IZIP_EPP16 is not set
# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_MVSAS=m
CONFIG_SCSI_NCR53C406A=m
CONFIG_SCSI_NCR_D700=m
CONFIG_SCSI_STEX=m
@@ -1325,15 +1437,12 @@ CONFIG_SCSI_NCR_Q720=m
CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32
CONFIG_SCSI_NCR53C8XX_SYNC=20
-CONFIG_SCSI_MCA_53C9X=m
CONFIG_SCSI_PAS16=m
-CONFIG_SCSI_PSI240I=m
CONFIG_SCSI_QLOGIC_FAS=m
CONFIG_SCSI_QLOGIC_1280=m
CONFIG_SCSI_QLA_FC=m
CONFIG_SCSI_QLA_ISCSI=m
CONFIG_SCSI_LPFC=m
-CONFIG_SCSI_SEAGATE=m
CONFIG_SCSI_SIM710=m
CONFIG_SCSI_SYM53C416=m
# CONFIG_SCSI_DC395x is not set
@@ -1347,19 +1456,24 @@ CONFIG_SCSI_ULTRASTOR=m
CONFIG_SCSI_NSP32=m
CONFIG_SCSI_DEBUG=m
CONFIG_SCSI_SRP=m
-
-#
-# PCMCIA SCSI adapter support
-#
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
CONFIG_PCMCIA_AHA152X=m
CONFIG_PCMCIA_FDOMAIN=m
CONFIG_PCMCIA_NINJA_SCSI=m
CONFIG_PCMCIA_QLOGIC=m
CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+# CONFIG_SCSI_DH_ALUA is not set
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 is not set
@@ -1369,28 +1483,30 @@ CONFIG_SATA_QSTOR=y
CONFIG_SATA_PROMISE=y
CONFIG_SATA_SX4=y
CONFIG_SATA_SIL=y
-CONFIG_SATA_SIL24=y
CONFIG_SATA_SIS=y
CONFIG_SATA_ULI=y
CONFIG_SATA_VIA=y
CONFIG_SATA_VITESSE=y
-# CONFIG_SATA_INIC162X is not set
+CONFIG_SATA_INIC162X=y
+CONFIG_PATA_ACPI=y
# CONFIG_PATA_ALI is not set
CONFIG_PATA_AMD=y
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
+CONFIG_PATA_ARTOP=y
+CONFIG_PATA_ATIIXP=y
# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_CMD64X is not set
+CONFIG_PATA_CMD64X=y
CONFIG_PATA_CS5520=y
# CONFIG_PATA_CS5530 is not set
# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CS5536 is not set
# CONFIG_PATA_CYPRESS is not set
CONFIG_PATA_EFAR=y
CONFIG_ATA_GENERIC=y
-# CONFIG_PATA_HPT366 is not set
+CONFIG_PATA_HPT366=y
# CONFIG_PATA_HPT37X is not set
# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
+CONFIG_PATA_HPT3X3=y
+# CONFIG_PATA_HPT3X3_DMA is not set
# CONFIG_PATA_ISAPNP is not set
CONFIG_PATA_IT821X=y
# CONFIG_PATA_IT8213 is not set
@@ -1401,7 +1517,9 @@ CONFIG_PATA_MARVELL=m
CONFIG_PATA_MPIIX=y
CONFIG_PATA_OLDPIIX=m
CONFIG_PATA_NETCELL=y
+# CONFIG_PATA_NINJA32 is not set
# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
# CONFIG_PATA_OPTI is not set
# CONFIG_PATA_OPTIDMA is not set
CONFIG_PATA_PCMCIA=m
@@ -1417,25 +1535,7 @@ CONFIG_PATA_SIS=y
CONFIG_PATA_VIA=y
CONFIG_PATA_WINBOND=y
# CONFIG_PATA_WINBOND_VLB is not set
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-CONFIG_CD_NO_IDESCSI=y
-CONFIG_AZTCD=m
-CONFIG_GSCD=m
-CONFIG_SBPCD=m
-CONFIG_MCDX=m
-CONFIG_OPTCD=m
-CONFIG_CM206=m
-CONFIG_SJCD=m
-CONFIG_ISP16_CDI=m
-CONFIG_CDU31A=m
-CONFIG_CDU535=m
-
-#
-# Multi-device support (RAID and LVM)
-#
+CONFIG_PATA_SCH=y
CONFIG_MD=y
CONFIG_BLK_DEV_MD=y
CONFIG_MD_LINEAR=m
@@ -1449,15 +1549,12 @@ CONFIG_MD_MULTIPATH=m
CONFIG_BLK_DEV_DM=y
# CONFIG_DM_DEBUG is not set
CONFIG_DM_CRYPT=m
-# CONFIG_DM_SNAPSHOT is not set
-# CONFIG_DM_MIRROR is not set
-# CONFIG_DM_ZERO is not set
-# CONFIG_DM_MULTIPATH is not set
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
# CONFIG_DM_DELAY is not set
-
-#
-# Fusion MPT device support
-#
+# CONFIG_DM_UEVENT is not set
CONFIG_FUSION=y
CONFIG_FUSION_SPI=y
CONFIG_FUSION_FC=y
@@ -1465,38 +1562,27 @@ CONFIG_FUSION_SAS=y
CONFIG_FUSION_MAX_SGE=128
CONFIG_FUSION_CTL=y
CONFIG_FUSION_LAN=y
+# CONFIG_FUSION_LOGGING is not set

#
# IEEE 1394 (FireWire) support
#
-# CONFIG_FIREWIRE is not set
-CONFIG_IEEE1394=y

#
-# Subsystem Options
-#
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-
+# Enable only one of the two stacks, unless you know what you are doing
#
-# Controllers
-#
-# CONFIG_IEEE1394_PCILYNX is not set
+# CONFIG_FIREWIRE is not set
+CONFIG_IEEE1394=y
CONFIG_IEEE1394_OHCI1394=y
-
-#
-# Protocols
-#
-CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_PCILYNX=m
CONFIG_IEEE1394_SBP2=y
# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
CONFIG_IEEE1394_ETH1394=m
-# CONFIG_IEEE1394_DV1394 is not set
CONFIG_IEEE1394_RAWIO=m
-
-#
-# I2O device support
-#
+CONFIG_IEEE1394_VIDEO1394=m
+# CONFIG_IEEE1394_DV1394 is not set
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
CONFIG_I2O=m
CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
CONFIG_I2O_EXT_ADAPTEC=y
@@ -1508,16 +1594,14 @@ CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
CONFIG_MACINTOSH_DRIVERS=y
CONFIG_MAC_EMUMOUSEBTN=y
-
-#
-# Network device support
-#
CONFIG_NETDEVICES=y
CONFIG_IFB=m
CONFIG_DUMMY=m
CONFIG_BONDING=m
+# CONFIG_MACVLAN is not set
CONFIG_EQUALIZER=m
CONFIG_TUN=m
+CONFIG_VETH=m
CONFIG_NET_SB1000=m
CONFIG_ARCNET=m
CONFIG_ARCNET_1201=m
@@ -1543,13 +1627,9 @@ CONFIG_CICADA_PHY=m
CONFIG_VITESSE_PHY=m
CONFIG_SMSC_PHY=m
CONFIG_BROADCOM_PHY=m
-CONFIG_FIXED_PHY=m
-CONFIG_FIXED_MII_10_FDX=y
-CONFIG_FIXED_MII_100_FDX=y
-
-#
-# Ethernet (10 or 100Mbit)
-#
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_MDIO_BITBANG=m
CONFIG_NET_ETHERNET=y
CONFIG_MII=y
CONFIG_HAPPYMEAL=m
@@ -1559,11 +1639,11 @@ CONFIG_NET_VENDOR_3COM=y
CONFIG_EL1=m
CONFIG_EL2=m
CONFIG_ELPLUS=m
-CONFIG_EL16=m
+# CONFIG_EL16 is not set
CONFIG_EL3=m
CONFIG_3C515=m
CONFIG_ELMC=m
-CONFIG_ELMC_II=m
+# CONFIG_ELMC_II is not set
CONFIG_VORTEX=m
CONFIG_TYPHOON=m
CONFIG_LANCE=m
@@ -1573,14 +1653,12 @@ CONFIG_ULTRAMCA=m
CONFIG_ULTRA=m
CONFIG_ULTRA32=m
CONFIG_SMC9194=m
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
CONFIG_NET_VENDOR_RACAL=y
# CONFIG_NI5010 is not set
CONFIG_NI52=m
CONFIG_NI65=m
-
-#
-# Tulip family network device support
-#
CONFIG_NET_TULIP=y
CONFIG_DE2104X=m
CONFIG_TULIP=m
@@ -1592,8 +1670,7 @@ CONFIG_WINBOND_840=m
CONFIG_DM9102=m
CONFIG_ULI526X=m
CONFIG_PCMCIA_XIRCOM=m
-CONFIG_PCMCIA_XIRTULIP=m
-CONFIG_AT1700=m
+# CONFIG_AT1700 is not set
CONFIG_DEPCA=m
CONFIG_HP100=m
CONFIG_NET_ISA=y
@@ -1606,38 +1683,42 @@ CONFIG_HPLAN=m
CONFIG_LP486E=m
CONFIG_ETH16I=m
CONFIG_NE2000=m
-CONFIG_ZNET=m
-CONFIG_SEEQ8005=m
+# CONFIG_ZNET is not set
+# CONFIG_SEEQ8005 is not set
CONFIG_NE2_MCA=m
CONFIG_IBMLANA=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_AC3200=m
+# CONFIG_AC3200 is not set
CONFIG_APRICOT=m
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_CS89x0=m
-CONFIG_DGRS=m
CONFIG_EEPRO100=m
CONFIG_E100=m
-CONFIG_LNE390=m
+# CONFIG_LNE390 is not set
CONFIG_FEALNX=m
CONFIG_NATSEMI=m
CONFIG_NE2K_PCI=m
-CONFIG_NE3210=m
-CONFIG_ES3210=m
-CONFIG_8139CP=m
+# CONFIG_NE3210 is not set
+# CONFIG_ES3210 is not set
+# CONFIG_8139CP is not set
CONFIG_8139TOO=m
CONFIG_8139TOO_PIO=y
CONFIG_8139TOO_TUNE_TWISTER=y
CONFIG_8139TOO_8129=y
# CONFIG_8139_OLD_RX_RESET is not set
+# CONFIG_R6040 is not set
CONFIG_SIS900=m
CONFIG_EPIC100=m
CONFIG_SUNDANCE=m
@@ -1645,8 +1726,7 @@ CONFIG_SUNDANCE=m
CONFIG_TLAN=m
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
-# CONFIG_VIA_RHINE_NAPI is not set
-CONFIG_SC92031=m
+# CONFIG_SC92031 is not set
CONFIG_NET_POCKET=y
CONFIG_ATP=m
CONFIG_DE600=m
@@ -1656,36 +1736,42 @@ CONFIG_ACENIC=m
# CONFIG_ACENIC_OMIT_TIGON_I is not set
CONFIG_DL2K=m
CONFIG_E1000=m
-# CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+CONFIG_E1000E=m
+CONFIG_IP1000=m
+CONFIG_IGB=m
+# CONFIG_IGB_LRO is not set
CONFIG_NS83820=m
CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
+# CONFIG_YELLOWFIN is not set
CONFIG_R8169=m
-# CONFIG_R8169_NAPI is not set
CONFIG_R8169_VLAN=y
CONFIG_SIS190=m
CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
CONFIG_SKY2=m
-CONFIG_SK98LIN=m
+# CONFIG_SKY2_DEBUG is not set
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
CONFIG_BNX2=m
CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1E is not set
CONFIG_NETDEV_10000=y
CONFIG_CHELSIO_T1=m
CONFIG_CHELSIO_T1_1G=y
-# CONFIG_CHELSIO_T1_NAPI is not set
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=m
CONFIG_MLX4_DEBUG=y
+CONFIG_TEHUTI=m
+CONFIG_BNX2X=m
+CONFIG_SFC=m
CONFIG_TR=y
CONFIG_IBMTR=m
CONFIG_IBMOL=m
@@ -1719,6 +1805,8 @@ CONFIG_IPW2200_QOS=y
# 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
@@ -1726,30 +1814,88 @@ CONFIG_PLX_HERMES=m
CONFIG_TMD_HERMES=m
CONFIG_NORTEL_HERMES=m
CONFIG_PCI_HERMES=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
CONFIG_PCMCIA_HERMES=m
CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_AIRO_CS=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
CONFIG_PCMCIA_ATMEL=m
+CONFIG_AIRO_CS=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_MAC80211_HWSIM=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+CONFIG_ATH9K=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLCORE=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLWIFI_RFKILL=y
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLAGN=m
+CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y
+CONFIG_IWLAGN_LEDS=y
+CONFIG_IWL4965=y
+CONFIG_IWL5000=y
+CONFIG_IWL3945=m
+CONFIG_IWL3945_RFKILL=y
+CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
+CONFIG_IWL3945_LEDS=y
+# CONFIG_IWL3945_DEBUG is not set
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
# CONFIG_HOSTAP_FIRMWARE_NVRAM 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
@@ -1758,7 +1904,6 @@ CONFIG_USB_CATC=m
CONFIG_USB_KAWETH=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET_MII=m
CONFIG_USB_USBNET=m
CONFIG_USB_NET_AX8817X=m
CONFIG_USB_NET_CDCETHER=m
@@ -1776,6 +1921,7 @@ CONFIG_USB_ARMLINUX=y
CONFIG_USB_EPSON2888=y
CONFIG_USB_KC2190=y
CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_HSO=m
CONFIG_NET_PCMCIA=y
CONFIG_PCMCIA_3C589=m
CONFIG_PCMCIA_3C574=m
@@ -1828,13 +1974,40 @@ CONFIG_CYCLADES_SYNC=m
CONFIG_CYCLOMX_X25=y
CONFIG_SBNI=m
CONFIG_SBNI_MULTILINE=y
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
CONFIG_FDDI=y
CONFIG_DEFXX=m
# CONFIG_DEFXX_MMIO is not set
CONFIG_SKFP=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+# CONFIG_HIPPI is not set
CONFIG_PLIP=m
CONFIG_PPP=m
# CONFIG_PPP_MULTILINK is not set
@@ -1843,30 +2016,33 @@ CONFIG_PPP_ASYNC=m
CONFIG_PPP_SYNC_TTY=m
CONFIG_PPP_DEFLATE=m
CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
+# CONFIG_PPP_MPPE is not set
+# CONFIG_PPPOE is not set
+CONFIG_PPPOATM=m
+# CONFIG_PPPOL2TP is not set
CONFIG_SLIP=m
CONFIG_SLIP_COMPRESSED=y
CONFIG_SLHC=m
CONFIG_SLIP_SMART=y
CONFIG_SLIP_MODE_SLIP6=y
CONFIG_NET_FC=y
-# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_VIRTIO_NET is not set
+CONFIG_ISDN=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m

#
-# ISDN subsystem
-#
-CONFIG_ISDN=m
-
-#
-# Old ISDN4Linux
+# mISDN hardware drivers
#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
CONFIG_ISDN_I4L=m
CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
+# CONFIG_ISDN_PPP_VJ is not set
CONFIG_ISDN_MPP=y
CONFIG_IPPP_FILTER=y
CONFIG_ISDN_PPP_BSDCOMP=m
@@ -1892,7 +2068,7 @@ CONFIG_ISDN_DRV_HISAX=m
# D-channel protocol features
#
CONFIG_HISAX_EURO=y
-# CONFIG_DE_AOC is not set
+CONFIG_DE_AOC=y
# CONFIG_HISAX_NO_SENDCOMPLETE is not set
# CONFIG_HISAX_NO_LLC is not set
# CONFIG_HISAX_NO_KEYPAD is not set
@@ -1958,34 +2134,22 @@ CONFIG_ISDN_DRV_SC=m
CONFIG_ISDN_DRV_ACT2000=m
CONFIG_HYSDN=m
CONFIG_HYSDN_CAPI=y
-
-#
-# Siemens Gigaset
-#
CONFIG_ISDN_DRV_GIGASET=m
CONFIG_GIGASET_BASE=m
CONFIG_GIGASET_M105=m
CONFIG_GIGASET_M101=m
# CONFIG_GIGASET_DEBUG is not set
# CONFIG_GIGASET_UNDOCREQ is not set
-
-#
-# CAPI subsystem
-#
CONFIG_ISDN_CAPI=m
CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
CONFIG_CAPI_TRACE=y
# CONFIG_ISDN_CAPI_MIDDLEWARE is not set
CONFIG_ISDN_CAPI_CAPI20=m
-# CONFIG_ISDN_CAPI_CAPIDRV is not set
+CONFIG_ISDN_CAPI_CAPIDRV=m

#
# CAPI hardware drivers
#
-
-#
-# Active AVM cards
-#
CONFIG_CAPI_AVM=y
CONFIG_ISDN_DRV_AVMB1_B1ISA=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m
@@ -1995,10 +2159,6 @@ CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_T1PCI=m
CONFIG_ISDN_DRV_AVMB1_C4=m
-
-#
-# Active Eicon DIVA Server cards
-#
CONFIG_CAPI_EICON=y
CONFIG_ISDN_DIVAS=m
CONFIG_ISDN_DIVAS_BRIPCI=y
@@ -2006,10 +2166,6 @@ CONFIG_ISDN_DIVAS_PRIPCI=y
CONFIG_ISDN_DIVAS_DIVACAPI=m
CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVAS_MAINT=m
-
-#
-# Telephony Support
-#
CONFIG_PHONE=m
CONFIG_PHONE_IXJ=m
CONFIG_PHONE_IXJ_PCMCIA=m
@@ -2029,9 +2185,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
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=m
# CONFIG_INPUT_EVBUG is not set

@@ -2045,6 +2198,7 @@ CONFIG_KEYBOARD_LKKBD=y
CONFIG_KEYBOARD_XTKBD=y
CONFIG_KEYBOARD_NEWTON=y
CONFIG_KEYBOARD_STOWAWAY=y
+# CONFIG_KEYBOARD_GPIO is not set
CONFIG_INPUT_MOUSE=y
CONFIG_MOUSE_PS2=m
CONFIG_MOUSE_PS2_ALPS=y
@@ -2055,11 +2209,13 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
CONFIG_MOUSE_PS2_TOUCHKIT=y
CONFIG_MOUSE_SERIAL=m
CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
CONFIG_MOUSE_INPORT=m
CONFIG_MOUSE_ATIXL=y
CONFIG_MOUSE_LOGIBM=m
CONFIG_MOUSE_PC110PAD=m
CONFIG_MOUSE_VSXXXAA=m
+# CONFIG_MOUSE_GPIO is not set
CONFIG_INPUT_JOYSTICK=y
CONFIG_JOYSTICK_ANALOG=m
CONFIG_JOYSTICK_A3D=m
@@ -2081,11 +2237,14 @@ CONFIG_JOYSTICK_SPACEORB=m
CONFIG_JOYSTICK_SPACEBALL=m
CONFIG_JOYSTICK_STINGER=m
CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
CONFIG_JOYSTICK_DB9=m
CONFIG_JOYSTICK_GAMECON=m
CONFIG_JOYSTICK_TURBOGRAFX=m
CONFIG_JOYSTICK_JOYDUMP=m
CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
CONFIG_INPUT_TABLET=y
CONFIG_TABLET_USB_ACECAD=m
CONFIG_TABLET_USB_AIPTEK=m
@@ -2093,15 +2252,22 @@ CONFIG_TABLET_USB_GTCO=m
CONFIG_TABLET_USB_KBTAB=m
CONFIG_TABLET_USB_WACOM=m
CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
CONFIG_TOUCHSCREEN_GUNZE=m
CONFIG_TOUCHSCREEN_ELO=m
CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_HTCPEN=m
CONFIG_TOUCHSCREEN_PENMOUNT=m
CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
CONFIG_TOUCHSCREEN_USB_EGALAX=y
CONFIG_TOUCHSCREEN_USB_PANJIT=y
@@ -2110,8 +2276,14 @@ CONFIG_TOUCHSCREEN_USB_ITM=y
CONFIG_TOUCHSCREEN_USB_ETURBO=y
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_TOUCHSCREEN_TOUCHIT213=m
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
@@ -2142,9 +2314,11 @@ CONFIG_GAMEPORT_FM801=m
# Character devices
#
CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVKMEM=y
CONFIG_SERIAL_NONSTANDARD=y
CONFIG_COMPUTONE=m
CONFIG_ROCKETPORT=m
@@ -2154,7 +2328,6 @@ CONFIG_DIGIEPCA=m
CONFIG_ESPSERIAL=m
CONFIG_MOXA_INTELLIO=m
CONFIG_MOXA_SMARTIO=m
-CONFIG_MOXA_SMARTIO_NEW=m
# CONFIG_ISI is not set
CONFIG_SYNCLINK=m
CONFIG_SYNCLINKMP=m
@@ -2162,25 +2335,35 @@ CONFIG_SYNCLINK_GT=m
CONFIG_N_HDLC=m
CONFIG_RISCOM8=m
CONFIG_SPECIALIX=m
-# CONFIG_SPECIALIX_RTSCTS is not set
CONFIG_SX=m
CONFIG_RIO=m
CONFIG_RIO_OLDPCI=y
CONFIG_STALDRV=y
CONFIG_STALLION=m
CONFIG_ISTALLION=m
+CONFIG_NOZOMI=m

#
# Serial drivers
#
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PNP=y
CONFIG_SERIAL_8250_CS=m
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_FOURPORT=m
+CONFIG_SERIAL_8250_ACCENT=m
+CONFIG_SERIAL_8250_BOCA=m
+CONFIG_SERIAL_8250_EXAR_ST16C554=m
+CONFIG_SERIAL_8250_HUB6=m
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
CONFIG_SERIAL_8250_MCA=m

#
@@ -2195,94 +2378,25 @@ CONFIG_LEGACY_PTY_COUNT=256
CONFIG_PRINTER=m
CONFIG_LP_CONSOLE=y
CONFIG_PPDEV=m
-CONFIG_TIPAR=m
-
-#
-# IPMI
-#
+CONFIG_HVC_DRIVER=y
+CONFIG_VIRTIO_CONSOLE=y
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=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_SC1200_WDT=m
-CONFIG_SCx200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83697HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-
-#
-# ISA-based Watchdog Cards
-#
-CONFIG_PCWATCHDOG=m
-CONFIG_MIXCOMWD=m
-CONFIG_WDT=m
-CONFIG_WDT_501=y
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-CONFIG_WDT_501_PCI=y
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
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_HW_RANDOM_VIRTIO is not set
CONFIG_NVRAM=m
-CONFIG_RTC=m
-CONFIG_GEN_RTC=m
-# CONFIG_GEN_RTC_X is not set
CONFIG_DTLK=m
CONFIG_R3964=m
CONFIG_APPLICOM=m
# CONFIG_SONYPI is not set
-CONFIG_AGP=m
-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 is not set

#
# PCMCIA character devices
@@ -2290,6 +2404,7 @@ CONFIG_AGP_EFFICEON=m
CONFIG_SYNCLINK_CS=m
CONFIG_CARDMAN_4000=m
CONFIG_CARDMAN_4040=m
+CONFIG_IPWIRELESS=m
CONFIG_MWAVE=m
CONFIG_SCx200_GPIO=m
CONFIG_PC8736x_GPIO=m
@@ -2298,13 +2413,8 @@ CONFIG_CS5535_GPIO=m
CONFIG_RAW_DRIVER=m
CONFIG_MAX_RAW_DEVS=256
CONFIG_HPET=y
-# CONFIG_HPET_RTC_IRQ is not set
# CONFIG_HPET_MMAP is not set
CONFIG_HANGCHECK_TIMER=m
-
-#
-# TPM devices
-#
CONFIG_TCG_TPM=m
CONFIG_TCG_TIS=m
CONFIG_TCG_NSC=m
@@ -2315,10 +2425,7 @@ 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
@@ -2326,56 +2433,74 @@ CONFIG_I2C_ALGOPCA=m
#
# I2C Hardware Bus support
#
+
+#
+# PC SMBus host controller drivers
+#
CONFIG_I2C_ALI1535=m
CONFIG_I2C_ALI1563=m
CONFIG_I2C_ALI15X3=m
CONFIG_I2C_AMD756=m
CONFIG_I2C_AMD756_S4882=m
CONFIG_I2C_AMD8111=m
-CONFIG_I2C_ELEKTOR=m
CONFIG_I2C_I801=m
-CONFIG_I2C_I810=m
+CONFIG_I2C_ISCH=m
CONFIG_I2C_PIIX4=m
-CONFIG_I2C_ISA=m
CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PROSAVAGE=m
-CONFIG_I2C_SAVAGE4=m
-CONFIG_I2C_SIMTEC=m
-# CONFIG_SCx200_I2C is not set
-CONFIG_SCx200_ACB=m
+CONFIG_I2C_NFORCE2_S4985=m
CONFIG_I2C_SIS5595=m
CONFIG_I2C_SIS630=m
CONFIG_I2C_SIS96X=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_TINY_USB=m
CONFIG_I2C_VIA=m
CONFIG_I2C_VIAPRO=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_SIMTEC=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+
+#
+# Graphics adapter I2C/DDC channel drivers
+#
CONFIG_I2C_VOODOO3=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_ELEKTOR=m
CONFIG_I2C_PCA_ISA=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_STUB=m
+CONFIG_SCx200_I2C=m
+CONFIG_SCx200_I2C_SCL=12
+CONFIG_SCx200_I2C_SDA=13
+CONFIG_SCx200_ACB=m

#
# Miscellaneous I2C Chip support
#
-CONFIG_SENSORS_DS1337=m
-CONFIG_SENSORS_DS1374=m
+CONFIG_DS1682=m
+CONFIG_AT24=m
CONFIG_SENSORS_EEPROM=m
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCA9539=m
CONFIG_SENSORS_PCF8591=m
+# CONFIG_TPS65010 is not set
CONFIG_SENSORS_MAX6875=m
+CONFIG_SENSORS_TSL2550=m
# CONFIG_I2C_DEBUG_CORE is not set
# 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=y
-# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_MASTER=y

#
@@ -2383,16 +2508,34 @@ CONFIG_SPI_MASTER=y
#
CONFIG_SPI_BITBANG=m
# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_LM70_LLP is not set

#
# SPI Protocol Masters
#
CONFIG_SPI_AT25=m
CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_TLE62X0=m
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_SYSFS=y

#
-# Dallas's 1-wire bus
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+
#
+# PCI GPIO expanders:
+#
+
+#
+# SPI GPIO expanders:
+#
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_MCP23S08=m
CONFIG_W1=m
CONFIG_W1_CON=y

@@ -2402,6 +2545,7 @@ CONFIG_W1_CON=y
CONFIG_W1_MASTER_MATROX=m
CONFIG_W1_MASTER_DS2490=m
CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_GPIO=m

#
# 1-wire Slaves
@@ -2410,26 +2554,43 @@ CONFIG_W1_SLAVE_THERM=m
CONFIG_W1_SLAVE_SMEM=m
CONFIG_W1_SLAVE_DS2433=m
CONFIG_W1_SLAVE_DS2433_CRC=y
+CONFIG_W1_SLAVE_DS2760=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_OLPC=m
CONFIG_HWMON=m
CONFIG_HWMON_VID=m
CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7414=m
CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADCXX=m
CONFIG_SENSORS_ADM1021=m
CONFIG_SENSORS_ADM1025=m
CONFIG_SENSORS_ADM1026=m
CONFIG_SENSORS_ADM1029=m
CONFIG_SENSORS_ADM1031=m
CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7473=m
CONFIG_SENSORS_K8TEMP=m
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=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_LM63=m
CONFIG_SENSORS_LM70=m
@@ -2442,14 +2603,18 @@ CONFIG_SENSORS_LM85=m
CONFIG_SENSORS_LM87=m
CONFIG_SENSORS_LM90=m
CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
CONFIG_SENSORS_MAX1619=m
CONFIG_SENSORS_MAX6650=m
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_DME1737=m
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
CONFIG_SENSORS_VT8231=m
@@ -2458,83 +2623,257 @@ CONFIG_SENSORS_W83791D=m
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=m
+CONFIG_THERMAL_HWMON=y
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_SC520_WDT=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_SC1200_WDT=m
+CONFIG_SCx200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_SBC7240_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+
+#
+# ISA-based Watchdog Cards
+#
+CONFIG_PCWATCHDOG=m
+CONFIG_MIXCOMWD=m
+CONFIG_WDT=m
+CONFIG_WDT_501=y
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+CONFIG_WDT_501_PCI=y
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+
+#
+# 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_CORE is not set
CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
+CONFIG_HTC_PASIC3=m
+# CONFIG_MFD_TMIO 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=y
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_CUSTOMIZE=y
+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_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L1=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DMA_CONTIG=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEO_BTCX=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
+CONFIG_VIDEO_IR_I2C=m
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TDA9875=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=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_OV7670=m
+CONFIG_VIDEO_SAA7110=m
+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
CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
CONFIG_VIDEO_VIVI=m
-# CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_PMS is not set
-# CONFIG_VIDEO_BWQCAM is not set
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_SAA6588=m
+CONFIG_VIDEO_PMS=m
+CONFIG_VIDEO_BWQCAM=m
# CONFIG_VIDEO_CQCAM is not set
-# CONFIG_VIDEO_W9966 is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_CPIA2 is not set
+CONFIG_VIDEO_W9966=m
+CONFIG_VIDEO_CPIA=m
+CONFIG_VIDEO_CPIA_PP=m
+CONFIG_VIDEO_CPIA_USB=m
+CONFIG_VIDEO_CPIA2=m
CONFIG_VIDEO_SAA5246A=m
CONFIG_VIDEO_SAA5249=m
-# CONFIG_TUNER_3036 is not set
+CONFIG_TUNER_3036=m
# CONFIG_VIDEO_STRADIS is not set
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIDEO_MEYE is not set
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+# CONFIG_VIDEO_ZORAN_AVS6EYES is not set
+CONFIG_VIDEO_MEYE=m
CONFIG_VIDEO_SAA7134=m
-# CONFIG_VIDEO_SAA7134_ALSA is not set
-# CONFIG_VIDEO_SAA7134_OSS is not set
+CONFIG_VIDEO_SAA7134_ALSA=m
CONFIG_VIDEO_SAA7134_DVB=m
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_DPC is not set
+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=m
CONFIG_VIDEO_CX88_VP3054=m
-# CONFIG_VIDEO_IVTV is not set
+CONFIG_VIDEO_CX23885=m
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_CX18=m
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_V4L_USB_DRIVERS=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_29XXX=y
-CONFIG_VIDEO_PVRUSB2_24XXX=y
# CONFIG_VIDEO_PVRUSB2_SYSFS is not set
-# CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_PVRUSB2_DVB is not set
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_USBVIDEO=m
# CONFIG_USB_VICAM is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_KONICAWC is not set
-# CONFIG_USB_QUICKCAM_MESSENGER is not set
-# CONFIG_USB_ET61X251 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_SE401 is not set
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_KONICAWC=m
+CONFIG_USB_QUICKCAM_MESSENGER=m
+CONFIG_USB_ET61X251=m
+CONFIG_VIDEO_OVCAMCHIP=m
+CONFIG_USB_W9968CF=m
+CONFIG_USB_OV511=m
+CONFIG_USB_SE401=m
CONFIG_USB_SN9C102=m
-# CONFIG_USB_STV680 is not set
-# CONFIG_USB_ZC0301 is not set
-# CONFIG_USB_PWC is not set
+CONFIG_USB_STV680=m
+CONFIG_USB_ZC0301=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_MT9M001=m
+# CONFIG_MT9M001_PCA9536_SWITCH is not set
+CONFIG_SOC_CAMERA_MT9V022=m
+# CONFIG_MT9V022_PCA9536_SWITCH is not set
+CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_VIDEO_SH_MOBILE_CEU=m
CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_CADET=m
CONFIG_RADIO_RTRACK=m
@@ -2551,18 +2890,21 @@ CONFIG_RADIO_TRUST=m
CONFIG_RADIO_TYPHOON=m
CONFIG_RADIO_TYPHOON_PROC_FS=y
CONFIG_RADIO_ZOLTRIX=m
-# CONFIG_USB_DSBR is not set
-CONFIG_DVB_CORE=m
-CONFIG_DVB_CORE_ATTACH=y
+CONFIG_USB_DSBR=m
+CONFIG_USB_SI470X=m
CONFIG_DVB_CAPTURE_DRIVERS=y

#
# Supported SAA7146 based PCI Adapters
#
-# CONFIG_DVB_AV7110 is not set
-# CONFIG_DVB_BUDGET is not set
-# CONFIG_DVB_BUDGET_CI is not set
-# CONFIG_DVB_BUDGET_AV is not set
+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
+CONFIG_DVB_BUDGET_PATCH=m

#
# Supported USB Adapters
@@ -2587,10 +2929,16 @@ CONFIG_DVB_USB_NOVA_T_USB2=m
CONFIG_DVB_USB_TTUSB2=m
CONFIG_DVB_USB_DTT200U=m
CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_ANYSEE=m
CONFIG_DVB_TTUSB_BUDGET=m
CONFIG_DVB_TTUSB_DEC=m
CONFIG_DVB_CINERGYT2=m
# CONFIG_DVB_CINERGYT2_TUNING is not set
+CONFIG_DVB_SIANO_SMS1XXX=m
+CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS=y

#
# Supported FlexCopII (B2C2) Adapters
@@ -2603,6 +2951,7 @@ CONFIG_DVB_B2C2_FLEXCOP_USB=m
#
# Supported BT878 Adapters
#
+CONFIG_DVB_BT8XX=m

#
# Supported Pluto2 Adapters
@@ -2616,28 +2965,32 @@ CONFIG_DVB_PLUTO2=m
#
# Customise DVB Frontends
#
-# CONFIG_DVB_FE_CUSTOMISE is not set
+CONFIG_DVB_FE_CUSTOMISE=y

#
# DVB-S (satellite) frontends
#
-CONFIG_DVB_STV0299=m
-# CONFIG_DVB_CX24110 is not set
+CONFIG_DVB_CX24110=m
CONFIG_DVB_CX24123=m
-CONFIG_DVB_TDA8083=m
CONFIG_DVB_MT312=m
-# CONFIG_DVB_VES1X93 is not set
-# CONFIG_DVB_S5H1420 is not set
+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
#
-# CONFIG_DVB_SP8870 is not set
-# CONFIG_DVB_SP887X is not set
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
CONFIG_DVB_CX22700=m
CONFIG_DVB_CX22702=m
-# CONFIG_DVB_L64781 is not set
+CONFIG_DVB_DRX397XD=m
+CONFIG_DVB_L64781=m
CONFIG_DVB_TDA1004X=m
CONFIG_DVB_NXT6000=m
CONFIG_DVB_MT352=m
@@ -2646,79 +2999,74 @@ CONFIG_DVB_DIB3000MB=m
CONFIG_DVB_DIB3000MC=m
CONFIG_DVB_DIB7000M=m
CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m

#
# DVB-C (cable) frontends
#
CONFIG_DVB_VES1820=m
-# CONFIG_DVB_TDA10021 is not set
-# CONFIG_DVB_TDA10023 is not set
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
CONFIG_DVB_STV0297=m

#
# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
#
CONFIG_DVB_NXT200X=m
-# CONFIG_DVB_OR51211 is not set
+CONFIG_DVB_OR51211=m
CONFIG_DVB_OR51132=m
CONFIG_DVB_BCM3510=m
CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+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=m
CONFIG_DVB_ISL6421=m
-# CONFIG_DVB_TUA6100 is not set
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_BUF=m
-CONFIG_VIDEO_BUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR=m
-CONFIG_VIDEO_TVEEPROM=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m

#
# Graphics support
#
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_PROGEAR=m
-CONFIG_BACKLIGHT_CARILLO_RANCH=m
-
-#
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=y
-
-#
-# Display hardware drivers
-#
+CONFIG_AGP=m
+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 is not set
CONFIG_VGASTATE=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
CONFIG_FB=m
CONFIG_FIRMWARE_EDID=y
CONFIG_FB_DDC=m
CONFIG_FB_CFB_FILLRECT=m
CONFIG_FB_CFB_COPYAREA=m
CONFIG_FB_CFB_IMAGEBLIT=m
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
CONFIG_FB_SYS_FILLRECT=m
CONFIG_FB_SYS_COPYAREA=m
CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
CONFIG_FB_SYS_FOPS=m
CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
CONFIG_FB_SVGALIB=m
# CONFIG_FB_MACMODES is not set
CONFIG_FB_BACKLIGHT=y
@@ -2734,7 +3082,8 @@ CONFIG_FB_PM2_FIFO_DISCONNECT=y
CONFIG_FB_CYBER2000=m
CONFIG_FB_ARC=m
CONFIG_FB_VGA16=m
-CONFIG_FB_HECUBA=m
+CONFIG_FB_UVESA=m
+CONFIG_FB_N411=m
CONFIG_FB_HGA=m
# CONFIG_FB_HGA_ACCEL is not set
CONFIG_FB_S1D13XXX=m
@@ -2751,9 +3100,7 @@ CONFIG_FB_I810_GTF=y
CONFIG_FB_I810_I2C=y
CONFIG_FB_LE80578=m
CONFIG_FB_CARILLO_RANCH=m
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
+# CONFIG_FB_INTEL is not set
CONFIG_FB_MATROX=m
CONFIG_FB_MATROX_MILLENIUM=y
CONFIG_FB_MATROX_MYSTIQUE=y
@@ -2790,9 +3137,32 @@ CONFIG_FB_TRIDENT=m
# CONFIG_FB_TRIDENT_ACCEL is not set
CONFIG_FB_ARK=m
# CONFIG_FB_PM3 is not set
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
# CONFIG_FB_GEODE is not set
CONFIG_FB_SM501=m
# CONFIG_FB_VIRTUAL is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_ILI9320=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CORGI=m
+CONFIG_BACKLIGHT_PROGEAR=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_MBP_NVIDIA=m
+
+#
+# Display device support
+#
+CONFIG_DISPLAY_SUPPORT=y
+
+#
+# Display hardware drivers
+#

#
# Console display driver support
@@ -2804,20 +3174,13 @@ CONFIG_VIDEO_SELECT=y
# CONFIG_MDA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=m
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
# CONFIG_FONTS is not set
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
# CONFIG_LOGO is not set
-
-#
-# Sound
-#
CONFIG_SOUND=m
-
-#
-# Advanced Linux Sound Architecture
-#
CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
@@ -2830,22 +3193,19 @@ CONFIG_SND_MIXER_OSS=m
CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_RTCTIMER=m
-CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
# CONFIG_SND_DYNAMIC_MINORS is not set
# CONFIG_SND_SUPPORT_OLD_API is not set
# CONFIG_SND_VERBOSE_PROCFS is not set
# CONFIG_SND_VERBOSE_PRINTK is not set
# CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
+CONFIG_SND_VMASTER=y
CONFIG_SND_MPU401_UART=m
CONFIG_SND_OPL3_LIB=m
CONFIG_SND_OPL4_LIB=m
CONFIG_SND_VX_LIB=m
CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
CONFIG_SND_DUMMY=m
CONFIG_SND_VIRMIDI=m
CONFIG_SND_MTPAV=m
@@ -2853,12 +3213,14 @@ CONFIG_SND_MTS64=m
CONFIG_SND_SERIAL_U16550=m
CONFIG_SND_MPU401=m
CONFIG_SND_PORTMAN2X4=m
-
-#
-# ISA devices
-#
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
CONFIG_SND_AD1848_LIB=m
CONFIG_SND_CS4231_LIB=m
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB8_DSP=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_ISA=y
CONFIG_SND_ADLIB=m
CONFIG_SND_AD1816A=m
CONFIG_SND_AD1848=m
@@ -2872,7 +3234,7 @@ CONFIG_SND_DT019X=m
CONFIG_SND_ES968=m
CONFIG_SND_ES1688=m
CONFIG_SND_ES18XX=m
-CONFIG_SND_GUS_SYNTH=m
+CONFIG_SND_SC6000=m
CONFIG_SND_GUSCLASSIC=m
CONFIG_SND_GUSEXTREME=m
CONFIG_SND_GUSMAX=m
@@ -2887,15 +3249,11 @@ CONFIG_SND_SB8=m
CONFIG_SND_SB16=m
CONFIG_SND_SBAWE=m
CONFIG_SND_SB16_CSP=y
-CONFIG_SND_SB16_CSP_FIRMWARE_IN_KERNEL=y
CONFIG_SND_SGALAXY=m
CONFIG_SND_SSCAPE=m
CONFIG_SND_WAVEFRONT=m
CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL=y
-
-#
-# PCI devices
-#
+CONFIG_SND_PCI=y
CONFIG_SND_AD1889=m
CONFIG_SND_ALS300=m
CONFIG_SND_ALS4000=m
@@ -2905,14 +3263,18 @@ CONFIG_SND_ATIIXP_MODEM=m
CONFIG_SND_AU8810=m
CONFIG_SND_AU8820=m
CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
# CONFIG_SND_AZT3328 is not set
CONFIG_SND_BT87X=m
CONFIG_SND_BT87X_OVERCLOCK=y
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=y
+CONFIG_SND_CS5530=m
CONFIG_SND_CS5535AUDIO=m
CONFIG_SND_DARLA20=m
CONFIG_SND_GINA20=m
@@ -2936,16 +3298,26 @@ CONFIG_SND_FM801=m
CONFIG_SND_FM801_TEA575X_BOOL=y
CONFIG_SND_FM801_TEA575X=m
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 is not set
CONFIG_SND_HDSP=m
CONFIG_SND_HDSPM=m
+CONFIG_SND_HIFIER=m
CONFIG_SND_ICE1712=m
CONFIG_SND_ICE1724=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
CONFIG_SND_KORG1212=m
-CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL=y
CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL=y
CONFIG_SND_MIXART=m
CONFIG_SND_NM256=m
CONFIG_SND_PCXHR=m
@@ -2953,50 +3325,58 @@ CONFIG_SND_RIPTIDE=m
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
-
-#
-# USB devices
-#
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
CONFIG_SND_USB_AUDIO=m
CONFIG_SND_USB_USX2Y=m
CONFIG_SND_USB_CAIAQ=m
CONFIG_SND_USB_CAIAQ_INPUT=y
-
-#
-# PCMCIA devices
-#
+CONFIG_SND_PCMCIA=y
CONFIG_SND_VXPOCKET=m
CONFIG_SND_PDAUDIOCF=m
-
-#
-# System on Chip audio support
-#
CONFIG_SND_SOC=m
-
-#
-# Open Sound System
-#
CONFIG_SOUND_PRIME=m
-# CONFIG_OSS_OBSOLETE is not set
-# CONFIG_SOUND_TRIDENT is not set
-# CONFIG_SOUND_MSNDCLAS is not set
-# CONFIG_SOUND_MSNDPIN is not set
-# CONFIG_SOUND_OSS is not set
+CONFIG_SOUND_MSNDCLAS=m
+CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin"
+CONFIG_MSNDCLAS_PERM_FILE="/etc/sound/msndperm.bin"
+CONFIG_SOUND_MSNDPIN=m
+CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
+CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
+CONFIG_SOUND_OSS=m
+# CONFIG_SOUND_TRACEINIT is not set
+# CONFIG_SOUND_DMAP is not set
+CONFIG_SOUND_SSCAPE=m
+CONFIG_SOUND_VMIDI=m
+CONFIG_SOUND_TRIX=m
+CONFIG_SOUND_MSS=m
+CONFIG_SOUND_MPU401=m
+CONFIG_SOUND_PAS=m
+CONFIG_SOUND_PSS=m
+# CONFIG_PSS_MIXER is not set
+CONFIG_SOUND_SB=m
+CONFIG_SOUND_YM3812=m
+CONFIG_SOUND_UART6850=m
+CONFIG_SOUND_AEDSP16=m
+CONFIG_SC6600=y
+CONFIG_SC6600_JOY=y
+CONFIG_SC6600_CDROM=4
+CONFIG_SC6600_CDROMBASE=0
+# CONFIG_AEDSP16_MSS is not set
+# CONFIG_AEDSP16_SBPRO is not set
+CONFIG_SOUND_KAHLUA=m
CONFIG_AC97_BUS=m
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
CONFIG_HID=m
# CONFIG_HID_DEBUG is not set
+CONFIG_HIDRAW=y

#
# USB Input Devices
@@ -3011,15 +3391,13 @@ CONFIG_USB_HIDDEV=y
#
# CONFIG_USB_KBD is not set
# CONFIG_USB_MOUSE is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB=y
# CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

#
# Miscellaneous USB options
@@ -3027,32 +3405,36 @@ CONFIG_USB=y
CONFIG_USB_DEVICEFS=y
# CONFIG_USB_DEVICE_CLASS is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_SUSPEND is not set
+CONFIG_USB_SUSPEND=y
# CONFIG_USB_OTG is not set
+CONFIG_USB_MON=y

#
# USB Host Controller Drivers
#
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_EHCI_SPLIT_ISO is not set
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+CONFIG_USB_C67X00_HCD=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_ISP116X_HCD=y
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_UHCI_HCD=y
CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_HCD=y
CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=y
+# CONFIG_USB_GADGET_MUSB_HDRC is not set

#
# USB Device Class drivers
#
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m

#
# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -3063,53 +3445,52 @@ CONFIG_USB_PRINTER=m
#
CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_DATAFAB 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 is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
+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_ONETOUCH=y
CONFIG_USB_STORAGE_KARMA=y
+CONFIG_USB_STORAGE_CYPRESS_ATACB=y
CONFIG_USB_LIBUSUAL=y

#
# USB Imaging devices
#
-# CONFIG_USB_MDC800 is not set
+CONFIG_USB_MDC800=m
CONFIG_USB_MICROTEK=m
-CONFIG_USB_MON=y

#
# USB port drivers
#
CONFIG_USB_USS720=m
-
-#
-# USB Serial Converter support
-#
CONFIG_USB_SERIAL=m
+CONFIG_USB_EZUSB=y
CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_AIRCABLE is not set
-CONFIG_USB_SERIAL_AIRPRIME=m
-# CONFIG_USB_SERIAL_ARK3116 is not set
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
CONFIG_USB_SERIAL_WHITEHEAT=m
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
CONFIG_USB_SERIAL_CP2101=m
CONFIG_USB_SERIAL_CYPRESS_M8=m
CONFIG_USB_SERIAL_EMPEG=m
-# CONFIG_USB_SERIAL_FTDI_SIO is not set
+CONFIG_USB_SERIAL_FTDI_SIO=m
CONFIG_USB_SERIAL_FUNSOFT=m
CONFIG_USB_SERIAL_VISOR=m
CONFIG_USB_SERIAL_IPAQ=m
-# CONFIG_USB_SERIAL_IR is not set
+CONFIG_USB_SERIAL_IR=m
CONFIG_USB_SERIAL_EDGEPORT=m
CONFIG_USB_SERIAL_EDGEPORT_TI=m
CONFIG_USB_SERIAL_GARMIN=m
-# CONFIG_USB_SERIAL_IPW is not set
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
CONFIG_USB_SERIAL_KEYSPAN_PDA=m
CONFIG_USB_SERIAL_KEYSPAN=m
CONFIG_USB_SERIAL_KEYSPAN_MPR=y
@@ -3124,31 +3505,33 @@ CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-# CONFIG_USB_SERIAL_KLSI is not set
+CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MOTOROLA=m
CONFIG_USB_SERIAL_NAVMAN=m
CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_SPCP8X5=m
CONFIG_USB_SERIAL_HP4X=m
-# CONFIG_USB_SERIAL_SAFE is not set
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
CONFIG_USB_SERIAL_SIERRAWIRELESS=m
CONFIG_USB_SERIAL_TI=m
-# CONFIG_USB_SERIAL_CYBERJACK is not set
+CONFIG_USB_SERIAL_CYBERJACK=m
CONFIG_USB_SERIAL_XIRCOM=m
CONFIG_USB_SERIAL_OPTION=m
-# CONFIG_USB_SERIAL_OMNINET is not set
+CONFIG_USB_SERIAL_OMNINET=m
# CONFIG_USB_SERIAL_DEBUG is not set
-CONFIG_USB_EZUSB=y

#
# USB Miscellaneous drivers
#
CONFIG_USB_EMI62=m
CONFIG_USB_EMI26=m
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_AUERSWALD is not set
+CONFIG_USB_ADUTUX=m
# CONFIG_USB_RIO500 is not set
# CONFIG_USB_LEGOTOWER is not set
CONFIG_USB_LCD=m
@@ -3169,35 +3552,41 @@ CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
# CONFIG_USB_TEST is not set
-
-#
-# USB DSL modem support
-#
-
-#
-# USB Gadget Support
-#
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
CONFIG_USB_GADGET=m
# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS 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_PXA25X 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
+# CONFIG_USB_GADGET_S3C2410 is not set
# CONFIG_USB_GADGET_AT91 is not set
# CONFIG_USB_GADGET_DUMMY_HCD is not set
CONFIG_USB_GADGET_DUALSPEED=y
# CONFIG_USB_ZERO is not set
CONFIG_USB_ETH=m
-# CONFIG_USB_ETH_RNDIS is not set
+CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_GADGETFS is not set
CONFIG_USB_FILE_STORAGE=m
# CONFIG_USB_FILE_STORAGE_TEST is not set
CONFIG_USB_G_SERIAL=m
# CONFIG_USB_MIDI_GADGET is not set
+CONFIG_USB_G_PRINTER=m
+CONFIG_USB_CDC_COMPOSITE=m
CONFIG_MMC=m
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
@@ -3206,17 +3595,20 @@ CONFIG_MMC=m
# MMC/SD Card Drivers
#
CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+CONFIG_MMC_TEST=m

#
# MMC/SD Host Controller Drivers
#
-# CONFIG_MMC_SDHCI is not set
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+# CONFIG_MMC_RICOH_MMC is not set
CONFIG_MMC_WBSD=m
# CONFIG_MMC_TIFM_SD is not set
-
-#
-# LED devices
-#
+# CONFIG_MMC_SDRICOH_CS is not set
+# CONFIG_MEMSTICK is not set
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=m

@@ -3225,6 +3617,10 @@ CONFIG_LEDS_CLASS=m
#
CONFIG_LEDS_NET48XX=m
CONFIG_LEDS_WRAP=m
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_GPIO is not set
+# CONFIG_LEDS_CLEVO_MAIL is not set
+# CONFIG_LEDS_PCA955X is not set

#
# LED Triggers
@@ -3233,10 +3629,9 @@ CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=m
CONFIG_LEDS_TRIGGER_IDE_DISK=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-
-#
-# InfiniBand support
-#
+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
CONFIG_INFINIBAND=m
CONFIG_INFINIBAND_USER_MAD=m
CONFIG_INFINIBAND_USER_ACCESS=m
@@ -3246,23 +3641,18 @@ CONFIG_INFINIBAND_MTHCA=m
CONFIG_INFINIBAND_MTHCA_DEBUG=y
CONFIG_INFINIBAND_AMSO1100=m
# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
-# CONFIG_INFINIBAND_CXGB3 is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
CONFIG_MLX4_INFINIBAND=m
+CONFIG_INFINIBAND_NES=m
+# CONFIG_INFINIBAND_NES_DEBUG is not set
CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
+CONFIG_INFINIBAND_IPOIB_CM=y
CONFIG_INFINIBAND_IPOIB_DEBUG=y
# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
CONFIG_INFINIBAND_SRP=m
CONFIG_INFINIBAND_ISER=m
-
-#
-# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
-#
# CONFIG_EDAC is not set
-
-#
-# Real Time Clock
-#
CONFIG_RTC_LIB=m
CONFIG_RTC_CLASS=m

@@ -3279,6 +3669,7 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y
# I2C RTC drivers
#
CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
CONFIG_RTC_DRV_DS1672=m
CONFIG_RTC_DRV_MAX6900=m
CONFIG_RTC_DRV_RS5C372=m
@@ -3286,56 +3677,72 @@ CONFIG_RTC_DRV_ISL1208=m
CONFIG_RTC_DRV_X1205=m
CONFIG_RTC_DRV_PCF8563=m
CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m

#
# SPI RTC drivers
#
-CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1305=m
CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RS5C348=m

#
# Platform RTC drivers
#
CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1511=m
CONFIG_RTC_DRV_DS1553=m
CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T59=m
CONFIG_RTC_DRV_V3020=m

#
# 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
-
-#
-# Auxiliary Display support
-#
+# CONFIG_DMATEST is not set
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
CONFIG_KS0108=m
CONFIG_KS0108_PORT=0x378
CONFIG_KS0108_DELAY=2
CONFIG_CFAG12864B=m
CONFIG_CFAG12864B_RATE=20
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_SMX=m

#
-# Virtualization
+# Firmware Drivers
#
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
+# CONFIG_EDD is not set
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_EFI_VARS=m
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m

#
# File systems
@@ -3373,23 +3780,26 @@ CONFIG_JFS_STATISTICS=y
CONFIG_FS_POSIX_ACL=y
CONFIG_XFS_FS=y
CONFIG_XFS_QUOTA=y
-CONFIG_XFS_SECURITY=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_RT=y
+# CONFIG_XFS_DEBUG is not set
CONFIG_GFS2_FS=y
-CONFIG_GFS2_FS_LOCKING_NOLOCK=y
CONFIG_GFS2_FS_LOCKING_DLM=y
CONFIG_OCFS2_FS=y
+CONFIG_OCFS2_FS_O2CB=y
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=y
+CONFIG_OCFS2_FS_STATS=y
CONFIG_OCFS2_DEBUG_MASKLOG=y
-CONFIG_MINIX_FS=y
-CONFIG_ROMFS_FS=y
+# CONFIG_OCFS2_DEBUG_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=m
CONFIG_QFMT_V2=m
CONFIG_QUOTACTL=y
-CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=m
@@ -3427,7 +3837,6 @@ CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_HUGETLBFS=y
CONFIG_HUGETLB_PAGE=y
-CONFIG_RAMFS=y
CONFIG_CONFIGFS_FS=y

#
@@ -3444,42 +3853,52 @@ CONFIG_HFSPLUS_FS=m
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 is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_RUBIN=y
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
CONFIG_CRAMFS=m
CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+# CONFIG_OMFS_FS is not set
CONFIG_HPFS_FS=m
CONFIG_QNX4FS_FS=m
+CONFIG_ROMFS_FS=y
CONFIG_SYSV_FS=m
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=m
CONFIG_NFS_V3=y
CONFIG_NFS_V3_ACL=y
# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
CONFIG_NFSD=m
CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
# CONFIG_NFSD_V4 is not set
-CONFIG_NFSD_TCP=y
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
CONFIG_NFS_ACL_SUPPORT=m
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=m
-# CONFIG_SUNRPC_BIND34 is not set
+CONFIG_SUNRPC_XPRT_RDMA=m
# CONFIG_RPCSEC_GSS_KRB5 is not set
# CONFIG_RPCSEC_GSS_SPKM3 is not set
CONFIG_SMB_FS=m
@@ -3489,33 +3908,45 @@ CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_UPCALL is not set
CONFIG_CIFS_XATTR=y
-# CONFIG_CIFS_POSIX is not set
+CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
# CONFIG_CIFS_EXPERIMENTAL is not set
CONFIG_NCP_FS=m
CONFIG_NCPFS_PACKET_SIGNING=y
# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
+CONFIG_NCPFS_STRONG=y
CONFIG_NCPFS_NFS_NS=y
CONFIG_NCPFS_OS2_NS=y
CONFIG_NCPFS_SMALLDOS=y
CONFIG_NCPFS_NLS=y
CONFIG_NCPFS_EXTRAS=y
CONFIG_CODA_FS=m
-# CONFIG_CODA_FS_OLD_API is not set
# CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set

#
# Partition Types
#
-# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="iso8859-1"
CONFIG_NLS_CODEPAGE_437=y
@@ -3556,65 +3987,52 @@ CONFIG_NLS_ISO8859_15=y
CONFIG_NLS_KOI8_R=m
CONFIG_NLS_KOI8_U=m
CONFIG_NLS_UTF8=y
-
-#
-# Distributed Lock Manager
-#
CONFIG_DLM=y
# CONFIG_DLM_DEBUG is not set

#
-# Instrumentation Support
-#
-# CONFIG_PROFILING is not set
-# 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=0
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
CONFIG_DEBUG_FS=y
CONFIG_HEADERS_CHECK=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-CONFIG_DETECT_SOFTLOCKUP=y
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_DEBUG_KERNEL is not set
CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_FRAME_POINTER is not set
-# CONFIG_FORCED_INLINING is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_FAULT_INJECTION is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_LATENCYTOP is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_HAVE_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+# CONFIG_FTRACE is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SYSPROF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_BUILD_DOCSRC is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_STRICT_DEVMEM is not set
+CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_EARLY_PRINTK=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACK_USAGE is not set
-
-#
-# Page alloc debug is incompatible with Software Suspend on i386
-#
-# CONFIG_DEBUG_RODATA 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_OPTIMIZE_INLINING is not set

#
# Security options
@@ -3624,8 +4042,9 @@ CONFIG_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
-CONFIG_SECURITY_CAPABILITIES=m
-CONFIG_SECURITY_ROOTPLUG=m
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_SECURITY_ROOTPLUG is not set
+CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
@@ -3635,73 +4054,133 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y
# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
+CONFIG_SECURITY_SMACK=y
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_CRYPTO=y

#
-# Cryptographic options
+# Crypto core or helper
#
-CONFIG_CRYPTO=y
CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ABLKCIPHER=m
+CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_BLKCIPHER=m
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=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+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=y
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256=m
CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_TGR192=m
-# CONFIG_CRYPTO_GF128MUL is not set
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
-# CONFIG_CRYPTO_LRW is not set
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_586=m
-CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_WP512=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_TEA=m
-CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CAMELLIA=m
-# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SALSA20_586 is not set
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_TWOFISH_586=m

#
-# Hardware crypto devices
+# Compression
#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_LZO=m
+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=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_HAVE_KVM=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+# CONFIG_LGUEST is not set
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_RING=y
+# 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
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=y
CONFIG_CRC32=y
+CONFIG_CRC7=m
CONFIG_LIBCRC32C=y
CONFIG_AUDIT_GENERIC=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=m
+CONFIG_GENERIC_ALLOCATOR=y
CONFIG_REED_SOLOMON=m
CONFIG_REED_SOLOMON_DEC16=y
CONFIG_TEXTSEARCH=y
@@ -3712,7 +4191,4 @@ CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_X86_BIOS_REBOOT=y
-CONFIG_KTIME_SCALAR=y
+CONFIG_CHECK_SIGNATURE=y
diff --git a/doc/release.recipe b/doc/release.recipe
index 956aead..8dc1223 100644
--- a/doc/release.recipe
+++ b/doc/release.recipe
@@ -1,6 +1,4 @@
-12 (Easy) Steps to Generate an ISO
-
-Hi. My name is Hank, and I'm an addict. :-P
+10 (Easy) Steps to Generate an ISO

The following are the general steps that need to be taken in order to create
an
ISO from scratch. These are not necessarily the steps that have to be
followed,
@@ -11,80 +9,77 @@ yourself a cauldron to brew in (and check out the test
branch):


git clone git://scm.sourcemage.org/smgl/cauldron.git
-
cd cauldron
-
git checkout -b test origin/test

All cauldron ISO scripts (for the test ISOs) are located in the
cauldron/scripts dir.

-1. Get a fresh basesystem tarball, unpack it into a directory, and rename
that
- directory "build".
-
-2. Build a linux kernel and modules, however you choose to do so (manually
or
- by casting the linux spell). We have a kernel config that you can use in
- our git repo. (cauldron/data/config-2.6)
-
-3. Cast all the spells that will go on the ISO (required and optional) via
- cauldron/scripts/spellcaster.sh build x86. The list of standard x86
spells
- to cast for the official x86 isos can be found in the repo in
- cauldron/data/rspells.x86 (required), cauldron/data/ispells.x86 (iso),
and
- cauldron/data/ospells.x86 (optional). Note: the terms "required" and
- "optional" here refer to what is required vs. optional for the user to
- install onto the target system. All spells are required to be on official
- ISOs. Also, only the required spells should be in the final
system.tar.bz2,
- and optional spells should only be present on the ISO itself.
-
-4. Check the iso and sys trees for sanity. Especially make sure that all
- the requisite directories are present (smgl-fhs) and there is nothing
- astray in their etc/ directories. Some of this will be taken care of in
- steps #5 and #7 via the use of the cauldron/scripts/add-sauce.sh script.
-
-5. Make any necessary adjustments to the system tree (/tmp/cauldron/sys).
This
- includes running cauldron/scripts/ add-sauce.sh -s /tmp/cauldron/sys and
- cleaning up var/cache/sorcery and var/spool/sorcery (e.g. via cleanse),
- removing linux source trees in /usr/src, and creating a symlink to the
- latest linux source under /var/spool/sorcery e.g., ln -sf /
- var/spool/sorcery/linux-VERSION.tar.bz2 /usr/src/ for easy access.
-
-6. Prune the iso tree (/tmp/cauldron/iso). The iso does not need a build
- environment, so (most of) the build tools can be completely wiped from
the
- ISO. This can be done by running cauldron/scripts/cleaniso.sh -a
- /path/to/iso/tree.
-
-7. Make adjustments to the iso tree (/tmp/cauldron/iso) by running
- cauldron/scripts/add-sauce.sh -i /tmp/cauldron/iso.
-
-8. Make a compressed tarball of the system tree, and copy it to
- /tmp/cauldron/iso/system.tar.bz2. Creation of the tarball can be done
- easily by running cauldron/scripts/mksystem.sh /tmp/cauldron/sys
- /tmp/cauldron/iso/system.tar.bz2. Don't forget to copy the tarball to the
- iso tree after creating it if you save it to a path other than the root
of
- the iso tree!
-
-9. Make an initrd, and copy it to cauldron/iso/boot/initrd.gz. This can be
- done via cauldron/scripts/mkinitrd.sh /path/to/iso/tree
iso_kernel_version
- (where iso_kernel_version is, for example, 2.6.22; just make sure it
- matches the /path/to/iso/tree/lib/modules/iso_kernel_version name).
-
-10. Generate the iso (i.e. mkisofs) and compress. If you are making a custom
- ISO, then you may find cauldron/scripts/mkiso.sh useful. However, for
- official releases, you can do cauldron/scripts/mkrelease.sh
- /path/to/iso/tree VERSION (e.g., cauldron/scripts/mkrelease.sh iso
- 0.10.0-test5). This will give you both a compressed and uncompressed
- finished product. You can use the uncompressed ISO for immediate testing,
- and if it works, you can go ahead and ship the compressed version.
-
-11. TEST the ISO (minimally in a VM). Go through a full install, following
all
- of the steps, and try to catch anything out of the ordinary. Make sure
the
- directions for the steps make sense and produce something that works, to
- the best of your ability.
-
-12. Assuming everything worked, it's time for a release. Go through and make
- sure (again) that all the files are as they should be (especially in /etc
- and /var). You can run cauldron/scripts/add-sauce.sh again (it will ask
- before overwriting any files, for all files that already exist which it
- wants to write). There will eventually be another script that will go
- through and sanity-check an iso (i.e. the script is in progress). If
- everything is as it should be and the iso worked as expected during
- testing, release it. Congratulations.
+1. Get a fresh basesystem tarball, unpack it into a directory, and rename
that
+directory "build".
+
+2. Build a linux kernel and modules, however you choose to do so (manually or
+by casting the linux spell). We have a kernel config that you can use in our
+git repo (cauldron/data/config-2.6). The kernel config in the cauldron repo
is
+for 2.6.27.10.
+
+3. Cast all the spells that will go on the ISO (required and optional) via
+cauldron/scripts/spellcaster.sh build x86. This will default to creating
+/tmp/cauldron/iso and /tmp/cauldron/sys to put the respective iso and sys
+content into (i.e., the iso and system dirs referred to later). You can
change
+what directories it uses with the -i and -s option flags. The list of
standard
+x86 spells to cast for the official x86 isos can be found in the repo in
+cauldron/data/rspells.x86 (for sys), cauldron/data/ispells.x86 (iso), and
+cauldron/data/ospells.x86 (optional). Note: the terms "required" and
"optional"
+here refer to what is required vs. optional for the user to install onto the
+target system. All of these spells (or their caches) are required to be
present
+on official ISOs. Also, only the required spells should be in the final
+system.tar.bz2, and optional spells should only be present on the ISO itself.
+
+4. Make any necessary adjustments to the system tree (/tmp/cauldron/sys).
This
+includes running cauldron/scripts/add-sauce.sh -o -s /tmp/cauldron/sys,
copying
+linux source tarball used to build the ISO (the one from step 2) to
+/tmp/cauldron/sys/var/spool/sorcery, and creating a symlink from the tarball
in
+the spool dir to usr/src/linux e.g., ln -sf
+/var/spool/sorcery/linux-VERSION.tar.bz2 /tmp/cauldron/sys/usr/src/ for easy
+access. Remember that all paths just mentioned are relative to the sys dir
+(except for the first argument to ln, which is not a typo).
+
+5. Prune the iso tree (/tmp/cauldron/iso). This can be done by running
+cauldron/scripts/cleaniso.sh. This uses /tmp/cauldron/iso by default. This
will
+remove unnecessary things like sorcery tablet files and logs, and unnecessary
+documentation in usr/share/doc for example.
+
+6. Make adjustments to the iso tree (/tmp/cauldron/iso) by running
+cauldron/scripts/add-sauce.sh -o -i /tmp/cauldron/iso.
+
+7. Make a compressed tarball of the system tree, and copy it to
+/tmp/cauldron/iso/system.tar.bz2. Creation of the tarball can be done easily
by
+running cauldron/scripts/mksystem.sh, which will use /tmp/cauldron/sys and
+/tmp/cauldron/iso by default, and will also by default drop the finished
+tarball into the iso dir. Don't forget to copy the tarball to the iso tree
+after creating it if you save it to a path other than the root of the iso
tree!
+
+8. Make an initrd, and copy it to /tmp/cauldron/iso/boot/initrd.gz. This can
be
+done via cauldron/scripts/mkinitrd.sh. This uses /tmp/cauldron/iso by default
+for the iso dir, and if you don't specify the kernel version as the optional
+first argument, it will try to get it automatically from the iso dir's
+lib/modules/VERSION directory (assuming it exists, and that there is only
one).
+It will also by default drop the finished initrd into boot/initrd.gz in the
iso
+dir (however that's defined: the default, or something you specify).
+
+9. Generate the iso (i.e. mkisofs) and compress. If you are making a custom
+ISO, then you may find cauldron/scripts/mkiso.sh useful. However, for
official
+releases, you can do cauldron/scripts/mkrelease.sh VERSION (e.g.,
+cauldron/scripts/mkrelease.sh 0.10.0-test5). This uses /tmp/cauldron/iso by
+default. This will give you both a compressed and uncompressed finished
product
+in the current working directory. You can use the uncompressed ISO for
+immediate testing, and if it works, you can go ahead and ship the compressed
+version.
+
+10. TEST the ISO (minimally in a VM). Go through a full install, following
all
+of the steps, and try to catch anything out of the ordinary. Make sure the
+directions for the steps make sense and produce something that works, to the
+best of your ability. Assuming everything worked, it's time for a release. Go
+through and make sure (again) that all the files are as they should be
+(especially in /etc and /var). If everything is as it should be and the iso
+worked as expected during testing, release it. Congratulations.
diff --git a/iso/usr/bin/539 b/iso/usr/bin/539
index ff30ed4..3774734 120000
--- a/iso/usr/bin/539
+++ b/iso/usr/bin/539
@@ -1 +1 @@
-../share/smgl.install/keymap
\ No newline at end of file
+/usr/share/smgl.install/smgl-keymap
\ No newline at end of file
diff --git a/iso/usr/share/doc/smgl.install/steps/grub
b/iso/usr/share/doc/smgl.install/steps/grub
index 2c32a30..7877ecd 100644
--- a/iso/usr/share/doc/smgl.install/steps/grub
+++ b/iso/usr/share/doc/smgl.install/steps/grub
@@ -15,7 +15,7 @@ for your disk layout):
> quit

Update menu.lst for your kernel:
-$EDITOR /boot/menu.list
+$EDITOR /boot/menu.lst

Exit the chroot:
 exit
diff --git a/iso/usr/share/smgl.install/smgl-alchemy
b/iso/usr/share/smgl.install/smgl-alchemy
new file mode 100755
index 0000000..6a06d9f
--- /dev/null
+++ b/iso/usr/share/smgl.install/smgl-alchemy
@@ -0,0 +1,196 @@
+#!/bin/bash
+#---------------------------------------------------------------------
+##
+##=head1 SYNOPSIS
+##
+## Alchemy is a an optional spell management utility
+##
+##=head1 DESCRIPTION
+##
+## ...
+##
+##=head1 COPYRIGHT
+##
+## Sourced from sorcery Copyright 2001 by Kyle Sallee
+## Original version Copyright 2008 Q. Rameau
+## Additions/corrections Copyright 2008 by the Source Mage Team
+##
+##=head1 FUNCTIONS
+##
+##=over 4
+##
+#---------------------------------------------------------------------
+
+help() {
+
+ cat << EOF
+
+Smgl-alchemy is the menu interface for installing optional spells, on your
+new system.
+
+Example: smgl-alchemy
+Usage: smgl-alchemy [parameters]
+
+Optional Parameters:
+
+-h | --help Display this help screen
+
+-v | --version Print the smgl-alchemy version
+
+EOF
+
+ exit 1
+#' <-- fix for syntax highlighting in nedit
+}
+
+function process_selection() {
+
+ if [ -n "$1" ]; then
+
+ echo "$1" | tr " " "\n" > $ALCHEMY_SPELL_LIST
+
+ fi
+
+}
+
+function make_checklist() {
+
+ if [ ! -s "$ALCHEMY_CACHE_LIST" ]; then
+
+ echo $(ls $ALCHEMY_CACHE_DIR | sed "s/-${ARCH}.*$//") >
$ALCHEMY_CACHE_LIST
+
+ fi
+
+ local SPELL_LIST=$(cat $ALCHEMY_CACHE_LIST)
+
+ local SELECTED_SPELLS=$ALCHEMY_SPELL_LIST
+
+ for SPELL in $SPELL_LIST; do
+
+ local STATUS="off"
+
+ if [ -s $SELECTED_SPELLS ] && $(grep -e "^${SPELL}$"
$SELECTED_SPELLS &> /dev/null); then
+
+ STATUS="on"
+
+ fi
+
+ echo -en '"'${SPELL:="Unknown"}'"'
+ echo -en '\t""'
+ echo -en '\t"'${STATUS:="off"}'"'
+ echo -e '\t""'
+
+ done
+
+}
+
+function select_pkgs() {
+
+ local SELECT_TITLE="Toggle optional spells to cast from ISO cache"
+ local SELECT_HELP="[*]=install"
+
+ CHECKLIST=$(make_checklist)
+
+ CHECKLIST_SIZE=$(($(dialog --stdout --print-maxsize | cut -d',' -f1 |
cut -d' ' -f2) - 15))
+
+ OUTLIST=$(eval $DIALOG ' --title "$SELECT_TITLE" \
+ --ok-label "Commit" \
+ --item-help \
+ --separate-output \
+ --checklist \
+ "$SELECT_HELP" \
+ 0 0 '$CHECKLIST_SIZE' \
+ '$CHECKLIST)
+
+ process_selection "$OUTLIST"
+
+}
+
+function main() {
+
+ if [ -z $1 ]; then
+
+ select_pkgs
+
+ else
+
+ case $1 in
+
+ -h|--help) help ;;
+ -v|--version) echo $ALCHEMY_VERSION ;;
+ *) help ;;
+ esac
+
+ fi
+
+}
+
+function priv_check() {
+
+ local SELF="$0"
+
+ if [[ $UID -ne 0 ]]
+ then
+ if [[ -x $(which sudo > /dev/null 2>&1) ]]
+ then
+ exec sudo "$SELF $*"
+ else
+ echo "Please enter the root password."
+ exec su -c "$SELF $*" root
+ fi
+ fi
+}
+
+if [ "$UID" == 0 ]; then
+
+ ARCH="i486"
+ DIALOG='dialog --backtitle "Cauldron Optional Spell Management
Utility" --stdout'
+ ALCHEMY_VERSION="0.2"
+ ALCHEMY_CACHE_DIR="/var/cache/sorcery"
+ ALCHEMY_SPELL_LIST="/tmp/optional_spells"
+ ALCHEMY_CACHE_LIST="/tmp/spells_cache"
+
+ main "$@"
+
+ rc=$?
+ exit $rc
+
+else
+
+ if [[ $1 == -h ]] || [[ $1 == --help ]]; then
+
+ help
+
+ elif [[ $1 == -v ]] || [[ $1 == --version ]]; then
+
+ echo $ALCHEMY_VERSION
+
+ else
+
+ priv_check
+
+ fi
+fi
+
+
+
+#---------------------------------------------------------------------
+##=back
+##
+##=head1 LICENSE
+##
+## This software is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This software is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this software; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+#---------------------------------------------------------------------
diff --git a/iso/usr/share/smgl.install/smgl-kernel
b/iso/usr/share/smgl.install/smgl-kernel
index e71b0b2..d163fb6 100755
--- a/iso/usr/share/smgl.install/smgl-kernel
+++ b/iso/usr/share/smgl.install/smgl-kernel
@@ -38,7 +38,7 @@ do
read -n1 input
echo ""
case $input in
- "y" ) ln -sf "$TARGET"/boot/vmlinuz-$(uname -r) "$TARGET"/boot/vmlinuz
+ "y" ) ln -sf /boot/vmlinuz-$(uname -r) "$TARGET"/boot/vmlinuz
break
;;
"n" ) break
diff --git a/iso/usr/share/smgl.install/smgl-spells
b/iso/usr/share/smgl.install/smgl-spells
index a9b1b18..33a72a0 100755
--- a/iso/usr/share/smgl.install/smgl-spells
+++ b/iso/usr/share/smgl.install/smgl-spells
@@ -55,7 +55,7 @@ function toggle_choice {
choice=$((choice-1))
# if the choice was not previously selected, select it, otherwise
# deselect it (toggle)
- if [[ SELECTED[choice] == '*' ]]
+ if [[ ${SELECTED[choice]} == '*' ]]
then
SELECTED[choice]=
else
diff --git a/scripts/add-sauce.sh b/scripts/add-sauce.sh
index 7c47be4..d069012 100755
--- a/scripts/add-sauce.sh
+++ b/scripts/add-sauce.sh
@@ -97,7 +97,11 @@ function blacklist_modules {
if [[ $TYPE == "iso" ]] ;then
# ensure kernel presence/sanity
KVER=${KVER:-$(find "$CHROOTDIR"/lib/modules -mindepth 1 -maxdepth 1
-print | head -n1 | sed 's#.*/##')}
- [[ -z $KVER ]] && exit 3
+ if [[ -z $KVER || ! -d "$CHROOTDIR"/lib/modules/$KVER ]]
+ then
+ echo "Kernel version not fount in chroot dir!"
+ exit 3
+ fi
fi

# make sure we start with a clean TEMPDIR each run
@@ -107,16 +111,22 @@ fi
# add the contents of base, which are files that
# should go onto both iso and system chroots
# this is mostly /etc content
+ echo "Copying base files to staging area"
cp -a "$MYDIR"/base/* "$TEMPDIR"/

# ISO Sauce
if [[ $TYPE == "iso" ]] ;then
# add the relevant modules to the blacklist
+ echo "Blacklisting kernel modules in staging area"
blacklist_modules "$CHROOTDIR/lib/modules/$KVER/kernel/drivers/video"
"$TEMPDIR"

# copy everything from the cauldron repo iso dir
# into the TEMPDIR staging area
+ echo "Copying ISO files to staging area"
cp -a "$MYDIR"/iso/* "$TEMPDIR"/
+
+ # strip boot/grub from the staging area, since the ISO doesn't need this
file
+ rm -fr "$TEMPDIR"/boot/grub
fi

# System Sauce
@@ -129,12 +139,14 @@ then
fi

# ==== FIXUP starts here ====
+ echo "Setting permissions on staged files"
chown -R 0:0 "$TEMPDIR"/
chmod -R u=rwX,go=u-w "$TEMPDIR"/
chmod 0600 "$TEMPDIR"/etc/shadow
# ==== end fixup ====

# Get a list of all files we want to install
+echo "Installing staged files to $CHROOTDIR"
for i in $(find "$TEMPDIR" -mindepth 1 -print)
do
FILE="${i#$TEMPDIR/}"
@@ -170,7 +182,9 @@ do
done

# ensure that ld has an up-to-date cache
-"${0%/*}"/cauldronchr.sh -d "$CHROOTDIR" /sbin/ldconfig
+echo "Running ldconfig in $CHROOTDIR"
+"${0%/*}"/cauldronchr.sh -d "$CHROOTDIR" /sbin/ldconfig ||
+echo "error: ldconfig failed in $CHROOTDIR"

# clean up
rm -rf "$TEMPDIR"
diff --git a/scripts/cleaniso.sh b/scripts/cleaniso.sh
index 0ec4b53..71dc6b3 100755
--- a/scripts/cleaniso.sh
+++ b/scripts/cleaniso.sh
@@ -1,33 +1,21 @@
#/bin/bash

-# CLEANFILEs are located in cauldron/data/cleaners
-
-CLEANALL=false
-CLEANERS="$(dirname $0)/../data/cleaners"
-
function usage() {
cat <<EndUsage
-Usage: $(basename $0) [-a] iso_chroot cleaner(s)
+Usage: $(basename $0) iso_chroot

-For each cleaner specified as an argument, cleans the files and
-directories listed therein from iso_chroot. A cleaner is the ouput of
-'gaze install \$SPELL' minus whatever you don't want removed. This
-script requires superuser privileges.
+Cleans unwanted files and directories from iso_chroot. This script requires
+superuser privileges.

Options:
- -a Run on all cleaner files in the cauldron cleaner
- directory. If this option is specified, any arguments
- provided beyond iso_chroot are ignored.
-
-h Shows this help information
EndUsage
exit 1
} >&2

-while getopts ":ah" Option
+while getopts ":h" Option
do
case $Option in
- a ) CLEANALL=true ;;
h ) usage ;;
* ) echo "Unrecognized option." >&2 && usage ;;
esac
@@ -49,13 +37,7 @@ fi

# Check to make sure we have the right number of arguments
# taking the option flag into account
-if [[ $# -eq 1 ]]
-then
- if ! $CLEANALL
- then
- usage
- fi
-elif [[ $# -lt 2 ]]
+if [[ $# -ne 1 ]]
then
usage
fi
@@ -71,54 +53,18 @@ then
echo "Error: /bin/rm not found in $ISOCHROOT" >&2
exit 2
fi
-if ! [[ -e "$ISOCHROOT/bin/rmdir" ]]
-then
- echo "Error: /bin/rmdir not found in $ISOCHROOT" >&2
- exit 2
-fi

-if $CLEANALL
-then
- LIST=( $(ls $CLEANERS/*) )
-else
- LIST=( $@ )
-fi
-
-for CLEANER in "${LIST[@]}"
-do
- # Reverse sort ensures that the gaze install output we have lists
files
- # before directories, so that directories can be cleaned using rmdir
- # after the files are cleaned first. This is safer, since it avoids
the
- # mighty 'rm -fr' oopses.
- for DIRT in $(sort -r "$CLEANER")
- do
- if [[ -e $ISOCHROOT/$DIRT ]]
- then
- # test if current listing is a dir, should only be
true after
- # the files under the dir are already cleaned
- if [[ -d "$DIRT" ]]
- then
- # chroot and clean a directory using rmdir
- echo "Attempting to remove directory
$ISOCHROOT/$DIRT"
- chroot "$ISOCHROOT" /bin/rmdir
--ignore-fail-on-non-empty "$DIRT"
- else
- # chroot and clean an individual file
- echo "Attempting to delete $ISOCHROOT/$DIRT"
- chroot "$ISOCHROOT" /bin/rm -f "$DIRT"
- fi
- fi
- done
-done
+echo "Removing $ISOCHROOT/boot/grub"
+chroot "$ISOCHROOT" /bin/rm -fr /boot/grub

echo "Removing $ISOCHROOT/usr/include"
-chroot /bin/rm -fr "$ISOCHROOT/usr/include"
+chroot "$ISOCHROOT" /bin/rm -fr /usr/include

echo "Removing $ISOCHROOT/usr/share/doc"
-chroot /bin/rm -fr "$ISOCHROOT/usr/share/doc"
+chroot $ISOCHROOT /bin/rm -fr /usr/share/doc

echo "Removing $ISOCHROOT/var/log/sorcery"
-chroot /bin/rm -fr "$ISOCHROOT/var/log/sorcery"
+chroot $ISOCHROOT /bin/rm -fr /var/log/sorcery

echo "Removing $ISOCHROOT/var/state/sorcery"
-chroot /bin/rm -fr "$ISOCHROOT/var/state/sorcery"
-
+chroot $ISOCHROOT /bin/rm -fr /var/state/sorcery
diff --git a/scripts/fhs-hack.sh b/scripts/fhs-hack.sh
new file mode 100755
index 0000000..ccab408
--- /dev/null
+++ b/scripts/fhs-hack.sh
@@ -0,0 +1,187 @@
+#!/bin/bash
+#
+# WARNING: THIS FILE IS A HACKED VERSION OF THE smgl-fhs INSTALL SCRIPT!
+# this file should not be used once smgl-fhs can properly install all the
+# necessary directories via sorcery
+#
+
+INSTALL_ROOT="${INSTALL_ROOT:-$1}"
+INSTALL_ROOT="${INSTALL_ROOT%/}"
+
+if [[ -z $INSTALL_ROOT ]]
+then
+ echo "No INSTALL_ROOT defined! You must pass an argument!"
+ exit 2
+fi
+
+root="0"
+games="60"
+mail="8"
+utmp="43"
+
+function fhs_mkdir()
+{
+ install -d -o ${3:-root} -g ${4:-root} -m ${2:-0755}
"$INSTALL_ROOT"/$1
+}
+
+#
+# http://www.pathname.com/fhs/2.2/fhs-3.html
+#
+for root_directory in bin etc boot dev home lib mnt opt sbin \
+ usr var
+do
+ fhs_mkdir $root_directory
+done &&
+
+fhs_mkdir tmp 1777 &&
+
+#
+# http://www.pathname.com/fhs/2.2/fhs-6.1.html
+# in the linux specific section, /proc is indeed mentioned
+#
+fhs_mkdir proc &&
+
+#
+# http://www.pathname.com/fhs/2.2/fhs-3.7.html
+#
+for etc_directory in opt X11 sgml
+do
+ fhs_mkdir etc/$etc_directory
+done &&
+
+#
+# http://www.pathname.com/fhs/2.2/fhs-3.9.html
+#
+for lib_directory in modules
+do
+ fhs_mkdir lib/$lib_directory
+done &&
+
+#
+# http://www.pathname.com/fhs/2.2/fhs-4.html
+#
+for usr_directory in X11R6 bin include lib local sbin share src
+do
+ fhs_mkdir usr/$usr_directory
+done &&
+
+#
+# For games
+#
+#create_group games &&
+fhs_mkdir usr/games 0750 $root $games &&
+
+#
+# http://www.pathname.com/fhs/2.2/fhs-4.6.html
+#
+for include_directory in bsd
+do
+ fhs_mkdir usr/include/$include_directory
+done &&
+
+#
+# http://www.pathname.com/fhs/2.2/fhs-4.9.html
+#
+for local_directory in bin games include lib man sbin share src
+do
+ fhs_mkdir usr/local/$local_directory
+done &&
+
+#
+# http://www.pathname.com/fhs/2.2/fhs-4.11.html
+#
+for share_directory in dict doc games info locale man misc nls \
+ sgml terminfo tmac zoneinfo
+do
+ fhs_mkdir usr/share/$share_directory
+done &&
+
+#
+# http://www.pathname.com/fhs/2.2/fhs-4.11.html (4.11.5.2)
+#
+for man_directory in 1 2 3 4 5 6 7 8
+do
+ fhs_mkdir usr/share/man/man$man_directory
+done &&
+
+#
+# http://www.pathname.com/fhs/2.2/fhs-4.4.html
+#
+for X11_subdir in lib include
+do
+ fhs_mkdir usr/X11R6/$X11_subdir
+done &&
+
+for X11_directory in bin lib/X11 include/X11
+do
+ fhs_mkdir usr/$X11_directory &&
+ ln -sf /usr/$X11_directory \
+ "$INSTALL_ROOT"/usr/X11R6/$X11_directory
+done &&
+
+#
+# http://www.pathname.com/fhs/2.2/fhs-5.html
+#
+for var_directory in account cache crash games lib lock log \
+ opt run spool yp
+do
+ fhs_mkdir var/$var_directory
+done &&
+
+#
+# This is the permission set I have on mine
+#
+fhs_mkdir var/tmp 1777 &&
+
+#
+# http://www.pathname.com/fhs/2.2/fhs-5.5.html
+#
+for cache_directory in fonts man www
+do
+ fhs_mkdir var/cache/$cache_directory
+done &&
+
+#
+# http://www.pathname.com/fhs/2.2/fhs-5.14.html
+#
+for spool_directory in lpd mqueue news rwho uucp
+do
+ fhs_mkdir var/spool/$spool_directory
+done &&
+
+#create_group mail &&
+fhs_mkdir var/spool/mail 3775 $root $mail &&
+
+#
+# http://www.pathname.com/fhs/2.2/fhs-5.11.html
+#
+if [ ! -e "$INSTALL_ROOT"/var/mail ]
+then
+ ln -sf spool/mail \
+ "$INSTALL_ROOT"/var/mail
+fi &&
+
+#
+# http://www.pathname.com/fhs/2.2/fhs-5.8.html
+#
+for varlib_directory in hwclock misc xdm
+do
+ fhs_mkdir var/lib/$varlib_directory
+done &&
+
+#
+# http://www.pathname.com/fhs/2.2/fhs-3.13.html
+#
+# Doesn't mention permissions, but usually you don't want other users
+# able to access a different users folders, so why would root be different?
+#
+fhs_mkdir root 0750
+
+for file in "$INSTALL_ROOT"/var/run/utmp "$INSTALL_ROOT"/var/log/wtmp
+do
+ if test ! -e $file; then
+ touch $file
+ fi &&
+ chmod 664 $file &&
+ chgrp $utmp $file
+done
diff --git a/scripts/mkinitrd.sh b/scripts/mkinitrd.sh
index efed2e7..b3412c6 100755
--- a/scripts/mkinitrd.sh
+++ b/scripts/mkinitrd.sh
@@ -3,17 +3,13 @@

function usage() {
cat << EndUsage
-Usage: $(basename $0) [-o OUTPUT_FILE] /path/to/target ISO_KERNEL_VERSION
+Usage: $(basename $0) [-o OUTPUT_FILE] [-i ISO] [ISO_KERNEL_VERSION]

Generates an initrd using /path/to/target. The output file is named initrd.gz
and is placed in the current working directory by default, but can be
overridden by the -o option. This script requires superuser privileges.

Required:
- /path/to/target
- The target directory you would like to chroot to. Defaults to
- current working directory.
-
ISO_KERNEL_VERSION
A string that specifies the version of the kernel to use.
Typically
you will only have one kernel version in your iso build directory,
@@ -21,18 +17,21 @@ Required:
so you need to specify the version the initrd will be built
against.
Options:
+ -i Path to iso build directory (ISO). Defaults to /tmp/cauldron/iso.
+
-o FILENAME
Specify the output file as FILENAME (can include a path prefix).
- Defaults to "initrd.gz" in the current working directory.
+ Defaults to ISO/boot/initrd.gz.

-h Shows this help information.
EndUsage
exit 1
} >&2

-while getopts ":o:h" Options
+while getopts ":i:o:h" Options
do
case $Options in
+ i ) ISODIR="$OPTARG" ;;
o ) OUTPUT="$OPTARG" ;;
h ) usage ;;
* ) echo "Unrecognized option" >&2 && usage ;;
@@ -53,26 +52,47 @@ then
fi
fi

-[[ $# -ne 2 ]] && usage
-ISO_DIR=$1
-KERNEL_VERSION=$2
+ISODIR="${ISODIR:-/tmp/cauldron/iso}"

# ensure full pathnames
-if [[ $(dirname "$ISO_DIR") == "." ]]
+if [[ $(dirname "$ISODIR") != /* ]]
+then
+ ISODIR="$(pwd)/$ISODIR"
+fi
+
+# make sure that ISODIR is a directory
+if [[ -d $ISODIR ]]
then
- ISO_DIR="$(pwd)/$ISO_DIR"
+ echo "Chroot dir: $ISODIR"
+else
+ echo "error: $ISODIR is not a directory"
+ exit 2
fi
-echo "Chroot dir: $ISO_DIR"

-OUTPUT="${OUTPUT:-./initrd.gz}"
+OUTPUT="${OUTPUT:-$ISODIR/boot/initrd.gz}"
+
+KERNEL_VERSION="$1"
+# try to get the kernel version if not specified
+if [[ -z $KERNEL_VERSION ]]
+then
+ modules="$ISODIR/lib/modules"
+ if [[ $(find $modules -mindepth 1 -maxdepth 1 -type d | wc -l) -eq 1 ]]
+ then
+ KERNEL_VERSION="$(find $modules -mindepth 1 -maxdepth 1 -type d)"
+ KERNEL_VERSION="${KERNEL_VERSION##*/}"
+ else
+ echo "Kernel version could not be determined, bailing out!"
+ exit 3
+ fi
+fi

-if ! [[ -d "$ISO_DIR"/lib/modules/$KERNEL_VERSION/kernel ]] ;then
+if ! [[ -d "$ISODIR"/lib/modules/$KERNEL_VERSION/kernel ]] ;then
echo "Chroot failed sanity check:"
- echo "Unable to find $ISO_DIR/lib/modules/$KERNEL_VERSION/kernel"
+ echo "Unable to find $ISODIR/lib/modules/$KERNEL_VERSION/kernel"
exit 2
fi >&2

-if ! [[ -f "$ISO_DIR"/isolinux/isolinux.cfg ]]
+if ! [[ -f "$ISODIR"/isolinux/isolinux.cfg ]]
then
echo "Chroot failed sanity check:"
echo "Chroot is missing isolinux.cfg!"
@@ -92,7 +112,7 @@ EXECDIRS=(bin sbin usr/bin usr/sbin)
#---------------------------------------------------------------------
# Used to implicitly install linked-against-libs to the initrd with a binary
function libscan() {
- chroot $ISO_DIR /usr/bin/ldd "$1" |
+ chroot $ISODIR /usr/bin/ldd "$1" |
grep '/' |
cut -f 2 |
sed -e 's/.*=> //' |
@@ -104,7 +124,7 @@ function libscan() {
# by running libscan (ldd returns symlinks if that's what the binary
# links to). The leading '/' is removed for convenience.
function reallib() {
- chroot $ISO_DIR readlink -f $1 |
+ chroot $ISODIR readlink -f $1 |
sed -e 's/^[/]//'
}

@@ -130,7 +150,7 @@ function install_prog() {
for prog in $* ;do
# find executable
progpath=$(my_which $prog) &&
- # install executable (path will be relative to $ISO_DIR)
+ # install executable (path will be relative to $ISODIR)
cp --parents -f $progpath $INITRDROOT &&
# install needed libs
for i in $(libscan $progpath) ; do
@@ -175,9 +195,9 @@ function mk_initrd_file() {

rm -rf $tmp_file $tmp_mountdir
echo "initrd is at $2, compressed $(du -ks $2 | cut -d$'\t' -f1)K,
uncompressed ${initrd_size}K."
- if grep -q '@INITRD_SIZE@' "$ISO_DIR"/isolinux/isolinux.cfg
+ if grep -q '@INITRD_SIZE@' "$ISODIR"/isolinux/isolinux.cfg
then
- sed -i "s/@INITRD_SIZE@/$initrd_size/" "$ISO_DIR"/isolinux/isolinux.cfg
+ sed -i "s/@INITRD_SIZE@/$initrd_size/" "$ISODIR"/isolinux/isolinux.cfg
else
echo "Don't forget to adjust isolinux.cfg for the new size."
fi
@@ -197,7 +217,7 @@ rm -rf $INITRDROOT
mkdir -p $INITRDROOT

# Unless otherwise noted, this is our working directory.
-pushd $ISO_DIR >/dev/null
+pushd $ISODIR >/dev/null

# Create all dirs we need on the initrd
echo "Creating dirs..."
@@ -234,7 +254,7 @@ touch $INITRDROOT/var/log/dmesg
# Add kernel modules that are supposed to be on the iso
echo "adding kernel modules"
mkdir -p ${INITRDROOT}/lib/modules/${KERNEL_VERSION}/kernel
-pushd $ISO_DIR/lib/modules/${KERNEL_VERSION}/kernel >/dev/null
+pushd $ISODIR/lib/modules/${KERNEL_VERSION}/kernel >/dev/null
while read line ; do
cp -pr --parents ./${line}
${INITRDROOT}/lib/modules/${KERNEL_VERSION}/kernel
done <$MYDIR/data/initrd.kernel
diff --git a/scripts/mkiso.sh b/scripts/mkiso.sh
index c4e7147..6625741 100755
--- a/scripts/mkiso.sh
+++ b/scripts/mkiso.sh
@@ -6,18 +6,14 @@ KEEP=

function usage() {
cat << EndUsage
-Usage: $(basename $0) [-hu] /path/to/target ISO_VERSION
+Usage: $(basename $0) [-hu] [-i ISO] ISO_VERSION

-Generates a bootable iso9660 iso file using /path/to/target. The output file
is
-named ISO_VERSION. Also creates metadata information appropriate to the iso
+Generates a bootable iso9660 iso file. The output file is named ISO_VERSION
in
+the current directory. Also creates metadata information appropriate to the
iso
(publisher, preparer, volume_id, etc.). Uses ISO_VERSION for the volume_id
field. This script requires superuser privileges.

Required:
- /path/to/target
- The target directory you would like to chroot to. Defaults to
- current working directory.
-
ISO_VERSION
A string that specifies the filename of the iso output file.
You must specify an absolute path or the command will not likely
be
@@ -25,6 +21,8 @@ Required:
the command to execute, or to set the command to be /bin/bash -l
some_command_without_abs_path). Defaults to "/bin/bash -l".
Options:
+ -i Path to iso build directory (ISO). Defaults to /tmp/cauldron/iso.
+
-u Change ownership of output files to $UID:$GID. You must specify
the
$UID:$GID pair as a string such as root:root or 0:0 or the script
will fail.
@@ -39,9 +37,10 @@ EndUsage
exit 1
} >&2

-while getopts ":ku:zh" Options
+while getopts ":i:ku:zh" Options
do
case $Options in
+ i ) ISODIR="$OPTARG" ;;
k ) KEEP="-k" ;;
u ) ISOCHOWN=true
CHOWNSTR="$OPTARG"
@@ -65,10 +64,13 @@ then
exec su -c "$SELF $*" root
fi
fi
-ISO_CHROOT=$1
-ISO_VERSION=$2

-mkisofs -R -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot
-boot-load-size 4 -boot-info-table -V ${ISO_VERSION} -publisher "Source Mage
GNU/Linux" -p "Cauldron" -o "${ISO_VERSION}.iso" "$ISO_CHROOT"
+ISODIR="${ISODIR:-/tmp/cauldron/iso}"
+
+[[ $# -ne 1 ]] && usage
+ISO_VERSION=$1
+
+mkisofs -R -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot
-boot-load-size 4 -boot-info-table -V ${ISO_VERSION} -publisher "Source Mage
GNU/Linux" -p "Cauldron" -o "${ISO_VERSION}.iso" "$ISODIR"

if $COMPRESS || [[ -n $KEEP ]]
then
diff --git a/scripts/mkrelease.sh b/scripts/mkrelease.sh
index 7f38c66..b7f9b75 100755
--- a/scripts/mkrelease.sh
+++ b/scripts/mkrelease.sh
@@ -2,24 +2,16 @@

MYDIR="$(dirname $0)"

-TARGET=$1
-VERSION=$2
-
ISOCHOWN=""

function usage() {
cat << EndUsage
-Usage: $(basename $0) [-h] /path/to/target VERSION
+Usage: $(basename $0) [-h] [-i ISO] VERSION

-Creates an official release ISO from /path/to/target for the ISO
-version specified as VERSION. This script requires superuser
-privileges.
+Creates an official release ISO for the ISO version specified as VERSION.
This
+script requires superuser privileges.

Required:
- /path/to/target
- The target directory you would like to make a releasable
- ISO from.
-
VERSION
A string which describes the version of the ISO to
release. Since this script is for making official
@@ -27,6 +19,8 @@ Required:
resulting in smgl-VERSION.iso for the final ISO output.

Options:
+ -i Path to iso build directory (ISO). Defaults to /tmp/cauldron/iso.
+
-u Change ownership of output files to $UID:$GID. You must specify
the
$UID:$GID pair as a string such as root:root or 0:0 or the script
will fail.
@@ -36,9 +30,10 @@ EndUsage
exit 1
} >&2

-while getopts ":u:h" Option
+while getopts ":i:u:h" Option
do
case $Option in
+ i ) TARGET="$OPTARG" ;;
u ) ISOCHOWN="-u"
CHOWNSTR="$OPTARG"
;;
@@ -61,7 +56,10 @@ then
fi
fi

-[[ $# -lt 2 ]] && usage
+TARGET="${TARGET:-/tmp/cauldron/iso}"
+
+[[ $# -ne 1 ]] && usage
+VERSION=$1

# Get the grimoire version used to generate all the spells in the ISO.
GRIMOIRE_VER=$(head -n1 "$TARGET"/etc/grimoire_version)
diff --git a/scripts/mksystem.sh b/scripts/mksystem.sh
index 9058875..caabbd6 100755
--- a/scripts/mksystem.sh
+++ b/scripts/mksystem.sh
@@ -2,18 +2,16 @@

function usage() {
cat << EndUsage
-Usage: $(basename $0) /path/to/target /path/to/output
+Usage: $(basename $0) [-hv] [-i ISO] [-s SYS]
Generates a compressed tarball of the "system" directory specified in
/path/to/target. This script requires superuser privileges.

-Required:
- /path/to/target
- The path to the "system" directory.
+Options:
+ -i Path to iso build directory (ISO). Defaults to /tmp/cauldron/iso.

- /path/to/output
- The path to the desired output file.
+ -s Path to system build directory (SYS). Defaults to
+ /tmp/cauldron/system.

-Options:
-v if specified, tar progress is output to STDOUT

-h Shows this help information
@@ -21,9 +19,11 @@ EndUsage
exit 1
} >&2

-while getopts ":vh" Option
+while getopts ":i:s:vh" Option
do
case $Option in
+ i ) ISODIR="$OPTARG" ;;
+ s ) SYSDIR="$OPTARG" ;;
v ) VERBOSE="-v" ;;
h ) usage ;;
* ) echo "Unrecognized option." >&2 && usage ;;
@@ -44,16 +44,22 @@ then
fi
fi

-SYSDIR=${1:-system}
-SYSTAR="${2:-$(basename $SYSDIR).tar.bz2}"
+SYSDIR="${SYSDIR:-/tmp/cauldron/sys}"
+ISODIR="${ISODIR:-/tmp/cauldron/iso}"
+
+[[ -z $SYSDIR || ! -d $SYSDIR ]] && usage
+[[ -z $ISODIR || ! -d $ISODIR ]] && usage
+
+SYSTAR="$ISODIR/system.tar.bz2"

-[[ -z $SYSDIR ]] && usage
+[[ $(dirname $SYSDIR) != /* ]] && SYSDIR="$PWD/$SYSDIR"
+[[ $(dirname $SYSTAR) != /* ]] && SYSTAR="$PWD/$SYSTAR"

-[[ $(dirname $SYSDIR) == '.' ]] && SYSDIR="$PWD/$SYSDIR"
-[[ $(dirname $SYSTAR) == '.' ]] && SYSTAR="$PWD/$SYSTAR"
+echo "Entering $SYSDIR"
+cd $SYSDIR &&

-cd $SYSDIR
- tar $VERBOSE -jcf "$SYSTAR" *
+echo "Creating $SYSTAR, please be patient"
+tar $VERBOSE -jcf "$SYSTAR" *
echo "Output written to: $SYSTAR"

exit
diff --git a/scripts/spellcaster.sh b/scripts/spellcaster.sh
index 092552b..ae4d498 100755
--- a/scripts/spellcaster.sh
+++ b/scripts/spellcaster.sh
@@ -9,7 +9,7 @@ CAULDRONDIR="$MYDIR"/../data

function usage() {
cat << EndUsage
-Usage: $(basename $0) [-h] [-i ISO] [-s SYS] /path/to/target ARCHITECTURE
+Usage: $(basename $0) [-hnq] [-i ISO] [-s SYS] /path/to/target ARCHITECTURE

Casts the required and optional spells onto the ISO.
This script requires superuser privileges.
@@ -32,16 +32,25 @@ Options:

-s Path to system build directory (SYS). Defaults to
/tmp/cauldron/system.
+
+ -n Don't process the build tree. Instead, generate ISO and SYS using
+ an already existing build tree. This is useful if you already have
+ all the caches, but you need to regenerate your ISO and SYS trees
+ if something went wrong during later processing.
+
+ -q Suppress output messages. Defaults to off (output shown on
STDERR).
EndUsage
exit 1
} >&2

function parse_options() {
- while getopts ":i:s:h" Option
+ while getopts ":i:s:nqh" Option
do
case $Option in
i ) ISODIR="${OPTARG%/}" ;;
s ) SYSDIR="${OPTARG%/}" ;;
+ n ) NOBUILD="yes" ;;
+ q ) QUIET="yes" ;;
h ) usage ;;
* ) echo "Unrecognized option." >&2 && usage ;;
esac
@@ -64,6 +73,13 @@ function priv_check() {
fi
}

+function msg() {
+ if [[ -z $QUIET ]]
+ then
+ echo $1 >&2
+ fi
+}
+
function directory_check() {
if [[ ! -d $1 ]]
then
@@ -116,10 +132,30 @@ function sanity_check() {
. "$TARGET/var/lib/sorcery/modules/libstate"
modify_config $config ARCHIVE on
else
+ echo "Archiving required, bailing out!"
exit 2
fi
fi
fi
+
+ # make sure that either the linux spell is being used or that the
+ # kernel sources are available for building
+ if ! grep -q '^linux$' "$CAULDRONDIR/rspells.$TYPE"
+ then
+ if [[ -d "$TARGET"/usr/src/linux ]]
+ then
+ if [[ ! -s "$TARGET"/usr/src/linux ]]
+ then
+ echo "Couldn't find "$TARGET" kernel config!"
+ exit 2
+ fi
+ else
+ echo "Cannot find the $TARGET kernel!"
+ echo "Either place the kernel sources and kernel
config in $TARGET"
+ echo "or add the linux spell to the list of rspells."
+ exit 2
+ fi
+ fi
}

function prepare_target() {
@@ -220,7 +256,11 @@ function install_kernel() {
kconfig="$SRC/boot/config"
fi
fi
- [[ -z $kconfig ]] && exit 13
+ if [[ -z $kconfig ]]
+ then
+ echo "Could not find $SRC kernel config!"
+ exit 13
+ fi

# Try to autodetect the linux kernel version using kernel directory or
# kernel config
@@ -245,7 +285,11 @@ function install_kernel() {
version="${version##*version: }"
fi
fi
- [[ -z $version ]] && exit 14
+ if [[ -z $version ]]
+ then
+ echo "Could not determine $SRC kernel version!"
+ exit 14
+ fi

# Try to guess the location of the kernel itself
if [[ -z $kernel ]]
@@ -258,7 +302,11 @@ function install_kernel() {
kernel="$SRC/usr/src/linux/arch/i386/boot/bzImage"
fi
fi
- [[ -z $kernel ]] && exit 15
+ if [[ -z $kernel ]]
+ then
+ echo "Could not find $SRC kernel image!"
+ exit 15
+ fi

# Copy the kernel config and symlink
cp -f "$kconfig" "$DST"/boot/config-$version
@@ -283,16 +331,22 @@ function setup_sys() {
local grimoire='GRIMOIRE_DIR[0]=/var/lib/sorcery/codex/stable'
local index="$SYSDIR/etc/sorcery/local/grimoire"

- local tablet="$SYSDIR/var/state/sorcery/tablet"
- local packages="$SYSDIR/var/state/sorcery/packages"
- local depends="$SYSDIR/var/state/sorcery/depends"
-
# unpack the sys caches into SYSDIR
+ msg "Installing caches into SYSDIR"
for cache in $(<"$TARGET"/sys-list)
do
+ msg "Unpacking $cache"
tar xjf "$TARGET"/var/cache/sorcery/$cache*.tar.bz2 -C
"$SYSDIR"/
done

+ # perform smgl-fhs hack on SYSDIR
+ msg "Performing smgl-fhs hack on SYSDIR"
+ "$MYDIR"/fhs-hack.sh "$SYSDIR"
+
+ # add the necessary and basic files to SYSDIR
+ msg "Running add-sauce.sh on SYSDIR"
+ "$MYDIR"/add-sauce.sh -o -s "$SYSDIR"
+
# download sorcery source
(
cd "$SPOOL"
@@ -300,6 +354,7 @@ function setup_sys() {
)

# unpack and install sorcery into SYSDIR
+ msg "Installing sorcery in SYSDIR"
tar jxf "$SPOOL"/$SORCERY -C "$TARGET/usr/src"
pushd "$SORCERYDIR" &> /dev/null
./install "$SYSDIR"
@@ -310,64 +365,95 @@ function setup_sys() {
cd "$SPOOL"
wget http://download.sourcemage.org/codex/$stable
)
- echo "Installing grimoire ${stable%.tar.bz2} ..."
+ msg "Installing grimoire ${stable%.tar.bz2} into SYSDIR"
[[ -d "$syscodex" ]] || mkdir -p $syscodex &&
tar jxf "$SPOOL"/$stable -C "$syscodex"/ &&
mv "$syscodex"/${stable%.tar.bz2} "$syscodex"/stable
echo "$grimoire" > "$index"
+
+ msg "Reindexing SYSDIR codex"
"$MYDIR"/cauldronchr.sh -d "$SYSDIR" /usr/sbin/scribe reindex

# generate the depends and packages info for sorcery to use
- rm -f "$depends" "$packages"
- . "$SYSDIR"/etc/sorcery/config
- for spell in "$tablet"/*
- do
- for date in "$spell"/*
+ cat > "$SYSDIR"/tablets.sh <<-"TABLETS"
+ #!/bin/bash
+ tablet="/var/state/sorcery/tablet"
+ packages="/var/state/sorcery/packages"
+ depends="/var/state/sorcery/depends"
+
+ rm -f "$depends" "$packages"
+ . /etc/sorcery/config &&
+ for spell in "$tablet"/*
do
- tablet_get_version $date ver
- tablet_get_status $date stat
- tablet_get_depends $date dep
- echo "${spell##*/}:${date##*/}:$stat:$ver" >>
"$packages"
- cat "$dep" >> "$depends"
- done
- sort -u -o "$depends" "$depends"
+ for date in "$spell"/*
+ do
+ tablet_get_version $date ver &&
+ tablet_get_status $date stat &&
+ tablet_get_depends $date dep &&
+ echo "${spell##*/}:${date##*/}:$stat:$ver" >>
"$packages"
+ cat "$dep" >> "$depends"
+ done
+ done &&
+ sort -u -o "$depends" "$depends" &&
sort -u -o "$packages" "$packages"
- done
+ TABLETS
+
+ msg "Generating SYSDIR tablet info"
+ chmod a+x "$SYSDIR"/tablets.sh &&
+ chroot "$SYSDIR" /tablets.sh &&
+ rm -f "$SYSDIR"/tablets.sh

# populate /dev with static device nodes
cat > "$SYSDIR/makedev" <<-"DEV"
#!/bin/bash
cd /dev
/sbin/MAKEDEV generic
-DEV
+ DEV
+
+ msg "Making static device nodes in SYSDIR"
chmod a+x "$SYSDIR/makedev"
chroot "$SYSDIR" /makedev
rm -f "$SYSDIR/makedev"

# ensure the existence of /dev/initctl
+ msg "Ensuring /dev/initctl exists in SYSDIR"
chroot "$SYSDIR" mkfifo -m 0600 /dev/initctl
}

function setup_iso() {
- local GVERS="$TARGET/var/lib/sorcery/stable/VERSION"
+ local GVERS="$TARGET/var/lib/sorcery/codex/stable/VERSION"

# copy the iso caches over and unpack their contents
+ msg "Unpacking ISO caches in ISODIR"
for cache in $(<"$TARGET"/iso-list)
do
+ msg "Unpacking and copying $cache"
tar xjf "$TARGET"/var/cache/sorcery/$cache*.tar.bz2 -C
"$ISODIR"/
cp "$TARGET"/var/cache/sorcery/$cache*.tar.bz2
"$ISODIR"/var/cache/sorcery/
done

# copy (only!) the optional caches over
+ msg "Copying optional caches to ISODIR"
for cache in $(<"$TARGET"/opt-list)
do
+ msg "Copying $cache"
cp "$TARGET"/var/cache/sorcery/$cache*.tar.bz2
"$ISODIR"/var/cache/sorcery/
done

+ # perform smgl-fhs hack on ISODIR
+ msg "Performing smgl-fhs hack on ISODIR"
+ "$MYDIR"/fhs-hack.sh "$ISODIR"
+
# install the kernel into ISODIR
+ msg "Installing kernel into ISODIR"
install_kernel "$TARGET" "$ISODIR"

+ # add the necessary and basic files to ISODIR
+ msg "Running add-sauce.sh on ISODIR"
+ "$MYDIR"/add-sauce.sh -o -i "$ISODIR"
+
# save the grimoire version used for building everything to ISODIR
for reference
+ msg "Saving grimoire version to ISODIR"
cp -f $GVERS "$ISODIR"/etc/grimoire_version

# populate /dev with static device nodes
@@ -375,30 +461,29 @@ function setup_iso() {
#!/bin/bash
cd /dev
/sbin/MAKEDEV generic
-DEV
+ DEV
+
+ msg "Generating static device nodes in ISODIR"
chmod a+x "$ISODIR/makedev"
chroot "$ISODIR" /makedev
rm -f "$ISODIR/makedev"

# ensure the existence of /dev/initctl
+ msg "Ensuring /dev/initctl exists in ISODIR"
chroot "$ISODIR" mkfifo -m 0600 /dev/initctl
}

function clean_target() {
- local config="etc/sorcery/local/kernel.config"
-
# Restore resolv.conf, the first rm is needed in case something
# installs a hardlink (like ppp)
- rm -f "$TARGET/etc/resolv.conf" &&
- cp -f "$TARGET/tmp/resolv.conf" "$TARGET/etc/resolv.conf" &&
- rm -f "$TARGET/tmp/resolv.conf"
+ if [[ -f "$TARGET/tmp/resolv.conf" ]]
+ then
+ cp -f "$TARGET/tmp/resolv.conf" "$TARGET/etc/resolv.conf" &&
+ rm -f "$TARGET/tmp/resolv.conf"
+ fi

# Clean up the target
- rm -f "$TARGET/rspells" \
- "$TARGET/ispells" \
- "$TARGET/ospells" \
- "$TARGET/$config" \
- "$TARGET/build_spell.sh"
+ rm -f "$TARGET/build_spells.sh"
}

# main()
@@ -429,10 +514,10 @@ fi

sanity_check

-prepare_target
+[[ -z $NOBUILD ]] && prepare_target

# chroot and build all of the spells inside the TARGET
-"$MYDIR/cauldronchr.sh" -d "$TARGET" /build_spells.sh
+[[ -z $NOBUILD ]] && "$MYDIR/cauldronchr.sh" -d "$TARGET" /build_spells.sh

# unpack sys caches and set up sorcery into SYSDIR
setup_sys
@@ -445,6 +530,4 @@ touch "$SYSDIR"/etc/ld.so.conf
"$MYDIR/cauldronchr.sh" -d "$ISODIR" /sbin/ldconfig

# Keep a clean kitchen, wipes up the leftovers from the preparation step
-clean_target
-
-exit 0
+[[ -z $NOBUILD ]] && clean_target
diff --git a/scripts/twelve-step-program.sh b/scripts/twelve-step-program.sh
index c723d42..02857e6 100755
--- a/scripts/twelve-step-program.sh
+++ b/scripts/twelve-step-program.sh
@@ -39,7 +39,8 @@ ISOBUILD=/tmp/cauldron/iso
popd &&
ls /lib/modules &&
cp -fav /lib/modules/2.6.24-SMGL-iso "$ROOTBUILD"/lib/modules &&
- cp -fav /usr/src/linux-2.6.24 "$ROOTBUILD"/usr/src ||
+ cp -fav /usr/src/linux-2.6.24 "$ROOTBUILD"/usr/src &&
+ cp -fv /usr/src/linux "$ROOTBUILD"/usr/src ||
echo 'step 2 failed' >> /var/log/sorcery/activity

echo step 3 build spells
@@ -48,51 +49,35 @@ ISOBUILD=/tmp/cauldron/iso

echo step 3.5 copy kernel sources to iso and sys tree
# may be handled by step 3 later on
- cp -fav /lib/modules/2.6.24-SMGL-iso "$ISOBUILD"/lib/modules &&
cp -fav /usr/src/linux-2.6.24 "$ISOBUILD"/usr/src ||
echo 'step 3.5 failed' >> /var/log/sorcery/activity

- echo step 4 sanity fixes
- # TODO check for ppp/resolv.conf borkage
- if test -f "$ROOTBUILD"/etc/udev/rules.d/70-persistent-net.rules; then
- echo "twelve step program failure (udev rules)" >>
/var/log/sorcery/activity &&
- rm "$ROOTBUILD"/etc/udev/rules.d/70-persistent-net.rules
- fi ||
+ echo step 4 adjust system tree
+ bash "$CAULDRON_SRC"/scripts/add-sauce.sh -o -s "$SYSBUILD" &&
+ cp /usr/src/linux-2.6.24.tar.bz2 "$SYSBUILD"/var/spool/sorcery &&
+ ln -sf /var/spool/sorcery/linux-2.6.24.tar.bz2
"$SYSBUILD"/usr/src/linux-2.6.24.tar.bz2 ||
echo 'step 4 failed' >> /var/log/sorcery/activity

- echo step 5 adjust system tree
- yes ""|bash "$CAULDRON_SRC"/scripts/add-sauce.sh -s "$SYSBUILD" &&
- # TODO: cleanse --sweep &&
- rm "$SYSBUILD"/var/spool/sorcery/* &&
- rm "$SYSBUILD"/var/cache/sorcery/* &&
- rm "$SYSBUILD"/usr/src/* &&
- # TODO symlink with /var/spool/sorcery &&
- cp /usr/src/linux-2.6.24.tar.bz2 "$SYSBUILD"/usr/src ||
+ echo step 5 prune iso tree
+ bash "$CAULDRON_SRC"/scripts/cleaniso.sh "$ISOBUILD" ||
echo 'step 5 failed' >> /var/log/sorcery/activity

- echo step 6 prune iso tree
- bash "$CAULDRON_SRC"/scripts/cleaniso.sh -a "$ISOBUILD" ||
+ echo step 6 adjust iso tree
+ bash "$CAULDRON_SRC"/scripts/add-sauce.sh -o -i "$ISOBUILD" ||
echo 'step 6 failed' >> /var/log/sorcery/activity

- echo step 7 adjust iso tree
- yes ""|bash "$CAULDRON_SRC"/scripts/add-sauce.sh -i "$ISOBUILD" ||
+ echo step 7 create system.tar.bz2
+ bash "$CAULDRON_SRC"/scripts/mksystem.sh -s "$SYSBUILD" -i "$ISOBUILD" ||
echo 'step 7 failed' >> /var/log/sorcery/activity

- echo step 8 create system.tar.bz2
- bash "$CAULDRON_SRC"/scripts/mksystem.sh "$SYSBUILD"
"$ISOBUILD"/system.tar.bz2 ||
+ echo step 8 make initrd
+ bash "$CAULDRON_SRC"/scripts/mkinitrd.sh -i "$ISOBUILD" 2.6.24-SMGL-iso ||
echo 'step 8 failed' >> /var/log/sorcery/activity

- echo step 9 make initrd
- bash "$CAULDRON_SRC"/scripts/mkinitrd.sh "$ISOBUILD" 2.6.24-SMGL-iso &&
- cp initrd.gz "$CAULDRON_SRC"/iso/boot/initrd.gz ||
- echo 'step 9 failed' >> /var/log/sorcery/activity
-
- echo step 10 make iso
+ echo step 9 make iso
cast -c cdrtools &&
- bash "$CAULDRON_SRC"/scripts/mkrelease.sh "$ISOBUILD" omfga-test0 ||
- echo 'step 10 failed' >> /var/log/sorcery/activity
+ bash "$CAULDRON_SRC"/scripts/mkrelease.sh -i "$ISOBUILD" omfga-test0 ||
+ echo 'step 9 failed' >> /var/log/sorcery/activity

- # step 11
- # test in VM, cant get there from here
- # step 12
- # final QA, cant get there from here
+ # step 10
+ # test in VM and final QA, cant get there from here



  • [SM-Commit] GIT changes to devel-andrew cauldron by Justin Boffemmyer (9cd102c14cb889cf1d8c59a3769bbca4104ee7ff), Justin Boffemmyer, 01/08/2009

Archive powered by MHonArc 2.6.24.

Top of Page