[or-cvs] r19605: {torvm} Pile of updates for newer openwrt rev, 2.6.28 kernel, and ex (in torvm/trunk: . build/kamikaze build/kamikaze/ipv6-advnet-patches build/kamikaze/patches build/win32/patches build/win32/src/torvm-w32)
coderman at seul.org
coderman at seul.org
Sun May 31 23:12:43 UTC 2009
Author: coderman
Date: 2009-05-31 19:12:42 -0400 (Sun, 31 May 2009)
New Revision: 19605
Added:
torvm/trunk/build/kamikaze/ipv6-advnet-patches/
torvm/trunk/build/kamikaze/ipv6-advnet-patches/003-kamikaze-kernel-config.patch
torvm/trunk/build/kamikaze/ipv6-advnet-patches/005-kamikaze-build-config.patch
Modified:
torvm/trunk/Makefile
torvm/trunk/TODO
torvm/trunk/build/kamikaze/patches/000-kamikaze-mod-openssl-386.patch
torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch
torvm/trunk/build/kamikaze/patches/002-kamikaze-mod-basefiles.patch
torvm/trunk/build/kamikaze/patches/003-kamikaze-kernel-config.patch
torvm/trunk/build/kamikaze/patches/004-kamikaze-libevent-package.patch
torvm/trunk/build/kamikaze/patches/005-kamikaze-build-config.patch
torvm/trunk/build/kamikaze/patches/006-kamikaze-upnptools.patch
torvm/trunk/build/win32/patches/python3-mingw.patch
torvm/trunk/build/win32/src/torvm-w32/torvm.c
Log:
Pile of updates for newer openwrt rev, 2.6.28 kernel, and experimental ipv6 and advanced routing alternative build. Switch to eglibc instead of uClibc.
Modified: torvm/trunk/Makefile
===================================================================
--- torvm/trunk/Makefile 2009-05-31 21:30:32 UTC (rev 19604)
+++ torvm/trunk/Makefile 2009-05-31 23:12:42 UTC (rev 19605)
@@ -30,12 +30,16 @@
ifeq (,$(SDLDIR))
SDLDIR=./build/repos
endif
+ifeq (,$(SRCDLDIR))
+ SRCDLDIR=./build/sources
+endif
override DLDIR:=$(realpath $(DLDIR))
override WDLDIR:=$(realpath $(WDLDIR))
override SDLDIR:=$(realpath $(SDLDIR))
+override SRCDLDIR:=$(realpath $(SRCDLDIR))
# OpenWRT version for build
-override CVER:=14298
+override CWRTVER:=16018
export BUSER
export BGROUP
@@ -43,6 +47,7 @@
export DLDIR
export WDLDIR
export SDLDIR
+export SRCDLDIR
default all: prereq import buildtree buildkern buildlicense buildw32
@@ -115,7 +120,7 @@
@if [ ! -d build/kamikaze/$(TGTNAME) ]; then \
echo "Creating Tor VM build tree ..."; \
cd build/kamikaze; \
- svn export -r$(CVER) $(SDLDIR)/kamikaze $(TGTNAME); \
+ svn export -r$(CWRTVER) $(SDLDIR)/kamikaze $(TGTNAME); \
if (( $$? != 0 )); then \
echo "ERROR: Unable to export working copy of local OpenWRT tree." >&2; \
rm -rf $(TGTNAME); \
Modified: torvm/trunk/TODO
===================================================================
--- torvm/trunk/TODO 2009-05-31 21:30:32 UTC (rev 19604)
+++ torvm/trunk/TODO 2009-05-31 23:12:42 UTC (rev 19605)
@@ -10,9 +10,6 @@
* Top priority
_______________________________________________________________________
- * Update end user documentation
- . Expand trouble shooting and bug reporting instructions.
-
* Update documentation
. Update Kyle's build documents at janusvm with new bundle details
and commit to Tor VM svn.
@@ -41,9 +38,6 @@
? Keep as few Thandy package files on disk as possible after an
upgrade. Ideally no more than two packages of the same product
would be kept.
- ? Improve package removal to support real clean uninstall.
- (removing all installed directories and data, including cached
- package files and program data)
? Improve package removal to iterate through products and remove
by name rather than MSI file or product GUID; include rollback
capability for situations where upgraded packages fail.
@@ -101,6 +95,5 @@
? PortableFirefox in bundle.
? Multiple VM networking.
? Authenticated VM images.
- ? SCTP over UDP (with DTLS) in VM. kernel 2.6.26+
? STUN (rfc5389) nat busting in VM.
Added: torvm/trunk/build/kamikaze/ipv6-advnet-patches/003-kamikaze-kernel-config.patch
===================================================================
--- torvm/trunk/build/kamikaze/ipv6-advnet-patches/003-kamikaze-kernel-config.patch (rev 0)
+++ torvm/trunk/build/kamikaze/ipv6-advnet-patches/003-kamikaze-kernel-config.patch 2009-05-31 23:12:42 UTC (rev 19605)
@@ -0,0 +1,682 @@
+diff -Naur a/target/linux/x86/config-2.6.28 b/target/linux/x86/config-2.6.28
+--- a/target/linux/x86/config-2.6.28 2009-05-15 10:40:04.149461000 +0000
++++ b/target/linux/x86/config-2.6.28 2009-05-28 03:31:46.750498360 +0000
+@@ -2,7 +2,6 @@
+ CONFIG_4KSTACKS=y
+ # CONFIG_60XX_WDT is not set
+ # CONFIG_64BIT is not set
+-# CONFIG_8139TOO is not set
+ # CONFIG_AC3200 is not set
+ # CONFIG_ACQUIRE_WDT is not set
+ # CONFIG_ADVANTECH_WDT is not set
+@@ -14,25 +13,28 @@
+ CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
+ CONFIG_ARCH_HAS_CPU_RELAX=y
+ CONFIG_ARCH_HAS_DEFAULT_IDLE=y
+-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
++# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set
++# CONFIG_ARCH_MAY_HAVE_PC_FDC is not set
+ # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+ CONFIG_ARCH_POPULATES_NODE_MAP=y
+ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+ CONFIG_ARCH_SPARSEMEM_ENABLE=y
++CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+ CONFIG_ARCH_SUPPORTS_MSI=y
+ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+-CONFIG_ARCH_SUSPEND_POSSIBLE=y
++# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
++CONFIG_ARCH_WANT_FRAME_POINTERS=y
+ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+ # CONFIG_AT1700 is not set
+ # CONFIG_AUDIT_ARCH is not set
+ CONFIG_BASE_SMALL=0
+-# CONFIG_BINFMT_AOUT is not set
++# CONFIG_BINARY_PRINTF is not set
+ CONFIG_BINFMT_MISC=y
+ CONFIG_BITREVERSE=y
+ # CONFIG_BLK_DEV_4DRIVES is not set
+ # CONFIG_BLK_DEV_ALI14XX is not set
+ CONFIG_BLK_DEV_AMD74XX=y
++# CONFIG_BLK_DEV_CS5536 is not set
+ # CONFIG_BLK_DEV_DTC2278 is not set
+ CONFIG_BLK_DEV_GENERIC=y
+ # CONFIG_BLK_DEV_HT6560B is not set
+@@ -40,6 +42,7 @@
+ CONFIG_BLK_DEV_IDEDMA_PCI=y
+ CONFIG_BLK_DEV_IDEDMA_SFF=y
+ CONFIG_BLK_DEV_IDEPCI=y
++# CONFIG_BLK_DEV_IT8172 is not set
+ CONFIG_BLK_DEV_PIIX=y
+ # CONFIG_BLK_DEV_QD65XX is not set
+ CONFIG_BLK_DEV_SC1200=y
+@@ -47,11 +50,11 @@
+ CONFIG_BLK_DEV_VIA82CXXX=y
+ # CONFIG_BLK_DEV_XD is not set
+ CONFIG_BOUNCE=y
+-CONFIG_CLASSIC_RCU=y
++# CONFIG_CC_STACKPROTECTOR is not set
+ CONFIG_CLOCKSOURCE_WATCHDOG=y
+ # CONFIG_CMDLINE_BOOL is not set
+ CONFIG_COMPAT_VDSO=y
+-CONFIG_CONSOLE_TRANSLATIONS=y
++# CONFIG_CONSOLE_TRANSLATIONS is not set
+ # CONFIG_CPU5_WDT is not set
+ CONFIG_CPU_FREQ=y
+ # CONFIG_CPU_FREQ_DEBUG is not set
+@@ -69,7 +72,7 @@
+ CONFIG_CPU_FREQ_STAT_DETAILS=y
+ CONFIG_CPU_FREQ_TABLE=y
+ CONFIG_CPU_SUP_AMD=y
+-CONFIG_CPU_SUP_CENTAUR_32=y
++CONFIG_CPU_SUP_CENTAUR=y
+ CONFIG_CPU_SUP_CYRIX_32=y
+ CONFIG_CPU_SUP_INTEL=y
+ CONFIG_CPU_SUP_TRANSMETA_32=y
+@@ -77,12 +80,16 @@
+ # CONFIG_CS5535_GPIO is not set
+ # CONFIG_CS89x0 is not set
+ # CONFIG_DCDBAS is not set
+-CONFIG_DEBUG_BUGVERBOSE=y
+-CONFIG_DEBUG_MEMORY_INIT=y
++# CONFIG_DEBUG_BUGVERBOSE is not set
++# CONFIG_DEBUG_MEMORY_INIT is not set
++CONFIG_DECOMPRESS_BZIP2=y
++CONFIG_DECOMPRESS_GZIP=y
++CONFIG_DECOMPRESS_LZMA=y
+ CONFIG_DEFAULT_IO_DELAY_TYPE=0
+ # CONFIG_DELL_RBU is not set
+ # CONFIG_DEPCA is not set
+ CONFIG_DEVPORT=y
++# CONFIG_DMA_API_DEBUG is not set
+ CONFIG_DMI=y
+ # CONFIG_DMIID is not set
+ CONFIG_DNOTIFY=y
+@@ -106,6 +113,8 @@
+ CONFIG_FIRMWARE_IN_KERNEL=y
+ CONFIG_FIRMWARE_MEMMAP=y
+ CONFIG_FIX_EARLYCON_MEM=y
++# CONFIG_FRAME_POINTER is not set
++# CONFIG_FTRACE_SYSCALLS is not set
+ CONFIG_GENERIC_BUG=y
+ CONFIG_GENERIC_CLOCKEVENTS=y
+ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+@@ -113,7 +122,9 @@
+ CONFIG_GENERIC_CMOS_UPDATE=y
+ # CONFIG_GENERIC_CPU is not set
+ CONFIG_GENERIC_FIND_FIRST_BIT=y
++CONFIG_GENERIC_FIND_LAST_BIT=y
+ CONFIG_GENERIC_FIND_NEXT_BIT=y
++CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+ CONFIG_GENERIC_IOMAP=y
+ CONFIG_GENERIC_ISA_DMA=y
+ # CONFIG_GENERIC_TIME_VSYSCALL is not set
+@@ -126,27 +137,37 @@
+ CONFIG_HAVE_ARCH_TRACEHOOK=y
+ CONFIG_HAVE_ATOMIC_IOMAP=y
+ # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
++CONFIG_HAVE_DMA_API_DEBUG=y
+ CONFIG_HAVE_DYNAMIC_FTRACE=y
++CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y
+ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
++CONFIG_HAVE_FTRACE_SYSCALLS=y
++CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+ CONFIG_HAVE_FUNCTION_TRACER=y
++CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+ CONFIG_HAVE_IDE=y
+ CONFIG_HAVE_IOREMAP_PROT=y
+-CONFIG_HAVE_KPROBES=y
+-CONFIG_HAVE_KRETPROBES=y
+-CONFIG_HAVE_KVM=y
+-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+-CONFIG_HAVE_OPROFILE=y
+-# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
++CONFIG_HAVE_KERNEL_BZIP2=y
++CONFIG_HAVE_KERNEL_GZIP=y
++CONFIG_HAVE_KERNEL_LZMA=y
++# CONFIG_HAVE_KPROBES is not set
++# CONFIG_HAVE_KRETPROBES is not set
++# CONFIG_HAVE_KVM is not set
++# CONFIG_HAVE_KVM_IRQCHIP is not set
++# CONFIG_HAVE_LATENCYTOP_SUPPORT is not set
++CONFIG_HAVE_MLOCK=y
++# CONFIG_HAVE_MMIOTRACE_SUPPORT is not set
++# CONFIG_HAVE_OPROFILE is not set
++CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+ CONFIG_HID=y
+-CONFIG_HID_COMPAT=y
+ CONFIG_HID_SUPPORT=y
+ # CONFIG_HIGHMEM4G is not set
+ # CONFIG_HIGHMEM64G is not set
+-# CONFIG_HIGH_RES_TIMERS is not set
+-# CONFIG_HPET_TIMER is not set
++CONFIG_HIGH_RES_TIMERS=y
++CONFIG_HPET_TIMER=y
+ # CONFIG_HP_WATCHDOG is not set
+ CONFIG_HT_IRQ=y
+ # CONFIG_HUGETLBFS is not set
+@@ -170,6 +191,7 @@
+ CONFIG_IDE_GENERIC=y
+ # CONFIG_IDE_PROC_FS is not set
+ CONFIG_IDE_TIMINGS=y
++CONFIG_IDE_XFER_MODE=y
+ CONFIG_INITRAMFS_SOURCE=""
+ CONFIG_INPUT=y
+ CONFIG_INPUT_KEYBOARD=y
+@@ -178,6 +200,8 @@
+ CONFIG_INPUT_MOUSEDEV_PSAUX=y
+ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
++# CONFIG_INPUT_YEALINK is not set
++# CONFIG_IOMMU_API is not set
+ # CONFIG_IOMMU_HELPER is not set
+ CONFIG_IO_DELAY_0X80=y
+ # CONFIG_IO_DELAY_0XED is not set
+@@ -195,6 +219,9 @@
+ # CONFIG_IT87_WDT is not set
+ # CONFIG_ITCO_WDT is not set
+ CONFIG_KALLSYMS=y
++# CONFIG_KERNEL_BZIP2 is not set
++CONFIG_KERNEL_GZIP=y
++# CONFIG_KERNEL_LZMA is not set
+ CONFIG_KEXEC=y
+ CONFIG_KEYBOARD_ATKBD=y
+ # CONFIG_KEYBOARD_LKKBD is not set
+@@ -204,13 +231,15 @@
+ # CONFIG_KEYBOARD_XTKBD is not set
+ CONFIG_KTIME_SCALAR=y
+ # CONFIG_LANCE is not set
++# CONFIG_LEDS_ALIX2 is not set
+ # CONFIG_LEDS_CLEVO_MAIL is not set
+-CONFIG_M386=y
++# CONFIG_LIB80211 is not set
++# CONFIG_M386 is not set
+ # CONFIG_M486 is not set
+ # CONFIG_M586 is not set
+ # CONFIG_M586MMX is not set
+ # CONFIG_M586TSC is not set
+-# CONFIG_M686 is not set
++CONFIG_M686=y
+ # CONFIG_MACHZ_WDT is not set
+ # CONFIG_MACINTOSH_DRIVERS is not set
+ CONFIG_MATH_EMULATION=y
+@@ -231,6 +260,7 @@
+ # CONFIG_MK6 is not set
+ # CONFIG_MK7 is not set
+ # CONFIG_MK8 is not set
++# CONFIG_MMIOTRACE is not set
+ # CONFIG_MOUSE_BCM5974 is not set
+ CONFIG_MOUSE_PS2=y
+ CONFIG_MOUSE_PS2_ALPS=y
+@@ -259,10 +289,13 @@
+ # CONFIG_MWINCHIPC6 is not set
+ CONFIG_NAMESPACES=y
+ # CONFIG_NATSEMI is not set
++# CONFIG_NET_NS is not set
+ CONFIG_NET_VENDOR_3COM=y
+ # CONFIG_NET_VENDOR_RACAL is not set
+ # CONFIG_NET_VENDOR_SMC is not set
++CONFIG_NLATTR=y
+ CONFIG_NOHIGHMEM=y
++CONFIG_NR_CPUS=1
+ # CONFIG_NSC_GPIO is not set
+ CONFIG_NVRAM=y
+ # CONFIG_OLPC is not set
+@@ -282,26 +315,30 @@
+ # CONFIG_PCI_GODIRECT is not set
+ # CONFIG_PCI_GOMMCONFIG is not set
+ # CONFIG_PCI_GOOLPC is not set
+-CONFIG_PCSPKR_PLATFORM=y
++# CONFIG_PCI_STUB is not set
++# CONFIG_PCSPKR_PLATFORM is not set
+ # CONFIG_PCWATCHDOG is not set
+ CONFIG_PHYSICAL_ALIGN=0x100000
+ CONFIG_PHYSICAL_START=0x100000
+ CONFIG_PNP=y
+ # CONFIG_PNPACPI is not set
+ # CONFIG_PNPBIOS is not set
+-CONFIG_PNP_DEBUG_MESSAGES=y
+-CONFIG_PROC_PAGE_MONITOR=y
++# CONFIG_PNP_DEBUG_MESSAGES is not set
++# CONFIG_POWER_TRACER is not set
++# CONFIG_PROC_PAGE_MONITOR is not set
+ # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+-# CONFIG_R6040 is not set
++CONFIG_RD_BZIP2=y
++CONFIG_RD_GZIP=y
+ # CONFIG_RELOCATABLE is not set
+ CONFIG_RTC=y
++# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+ # CONFIG_SBC7240_WDT is not set
+ # CONFIG_SBC8360_WDT is not set
+ # CONFIG_SBC_EPX_C3_WATCHDOG is not set
+ # CONFIG_SC1200_WDT is not set
+ # CONFIG_SC520_WDT is not set
+ # CONFIG_SCHED_HRTICK is not set
+-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
++CONFIG_SCHED_OMIT_FRAME_POINTER=y
+ # CONFIG_SCSI_DMA is not set
+ CONFIG_SCx200=y
+ CONFIG_SCx200HR_TIMER=y
+@@ -318,26 +355,29 @@
+ # CONFIG_SERIO_RAW is not set
+ CONFIG_SERIO_SERPORT=y
+ # CONFIG_SLAB is not set
++# CONFIG_SLOW_WORK is not set
+ CONFIG_SLUB=y
+ CONFIG_SLUB_DEBUG=y
+ # CONFIG_SLUB_DEBUG_ON is not set
+ # CONFIG_SLUB_STATS is not set
+ # CONFIG_SMP is not set
+ # CONFIG_SMSC37B787_WDT is not set
++# CONFIG_SMSC_SCH311X_WDT is not set
+ # CONFIG_SONYPI is not set
+ CONFIG_SPARSEMEM_STATIC=y
++# CONFIG_SPARSE_IRQ is not set
+ CONFIG_STRICT_DEVMEM=y
+ # CONFIG_SYSPROF_TRACER is not set
+ # CONFIG_TELCLOCK is not set
+ # CONFIG_TOSHIBA is not set
++# CONFIG_TRACING_SUPPORT is not set
+ # CONFIG_TYPHOON is not set
+ CONFIG_UID16=y
+-CONFIG_USB_SUPPORT=y
++# CONFIG_USB_SUPPORT is not set
+ # CONFIG_USER_NS is not set
++CONFIG_USER_STACKTRACE_SUPPORT=y
+ # CONFIG_VGACON_SOFT_SCROLLBACK is not set
+-# CONFIG_VGASTATE is not set
+ CONFIG_VGA_CONSOLE=y
+-# CONFIG_VIA_RHINE is not set
+ CONFIG_VM86=y
+ CONFIG_VM_EVENT_COUNTERS=y
+ # CONFIG_VORTEX is not set
+@@ -349,23 +389,25 @@
+ # CONFIG_WDT is not set
+ CONFIG_X86=y
+ CONFIG_X86_32=y
++CONFIG_X86_32_LAZY_GS=y
+ # CONFIG_X86_64 is not set
+-CONFIG_X86_BIOS_REBOOT=y
+ # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+ # CONFIG_X86_CMPXCHG is not set
+ CONFIG_X86_CPU=y
+ # CONFIG_X86_CPUFREQ_NFORCE2 is not set
+ # CONFIG_X86_CPUID is not set
++# CONFIG_X86_CPU_DEBUG is not set
+ # CONFIG_X86_ELAN is not set
++CONFIG_X86_EXTENDED_PLATFORM=y
+ # CONFIG_X86_E_POWERSAVER is not set
+ CONFIG_X86_F00F_BUG=y
+-CONFIG_X86_FIND_SMP_CONFIG=y
+ CONFIG_X86_GENERIC=y
+-# CONFIG_X86_GENERICARCH is not set
+ # CONFIG_X86_GX_SUSPMOD is not set
+ CONFIG_X86_INTEL_USERCOPY=y
++CONFIG_X86_INTERNODE_CACHE_BYTES=64
+ CONFIG_X86_IO_APIC=y
+-CONFIG_X86_L1_CACHE_SHIFT=7
++CONFIG_X86_L1_CACHE_BYTES=64
++CONFIG_X86_L1_CACHE_SHIFT=4
+ CONFIG_X86_LOCAL_APIC=y
+ # CONFIG_X86_LONGRUN is not set
+ CONFIG_X86_MCE=y
+@@ -377,13 +419,13 @@
+ # CONFIG_X86_P4_CLOCKMOD is not set
+ # CONFIG_X86_PAE is not set
+ CONFIG_X86_PAT=y
+-CONFIG_X86_PC=y
++CONFIG_X86_PLATFORM_DEVICES=y
+ # CONFIG_X86_POWERNOW_K6 is not set
+ # CONFIG_X86_POWERNOW_K7 is not set
+-# CONFIG_X86_POWERNOW_K8 is not set
+ CONFIG_X86_PPRO_FENCE=y
+ # CONFIG_X86_RDC321X is not set
+ # CONFIG_X86_REBOOTFIXUPS is not set
++CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+ CONFIG_X86_RESERVE_LOW_64K=y
+ # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+ # CONFIG_X86_SPEEDSTEP_ICH is not set
+@@ -392,6 +434,337 @@
+ CONFIG_X86_UP_APIC=y
+ CONFIG_X86_UP_IOAPIC=y
+ CONFIG_X86_VERBOSE_BOOTUP=y
+-# CONFIG_X86_VOYAGER is not set
+-# CONFIG_X86_VSMP is not set
+ # CONFIG_ZONE_DMA32 is not set
++CONFIG_X86_PC=y
++# CONFIG_X86_ELAN is not set
++# CONFIG_X86_VOYAGER is not set
++# CONFIG_X86_GENERICARCH is not set
++CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
++# CONFIG_X86_POWERNOW_K8 is not set
++CONFIG_BINFMT_AOUT=y
++CONFIG_LOCALVERSION="torvm"
++CONFIG_LOG_BUF_SHIFT=17
++# CONFIG_MODULES is not set
++CONFIG_LBD=y
++CONFIG_NO_HZ=y
++# CONFIG_X86_RESERVE_LOW_64K is not set
++# CONFIG_KEXEC is not set
++# CONFIG_HT_IRQ is not set
++# CONFIG_SCx200 is not set
++CONFIG_XFRM_USER=y
++CONFIG_XFRM_IPCOMP=y
++CONFIG_NET_KEY=y
++# CONFIG_IP_MULTICAST is not set
++# CONFIG_IP_ROUTE_VERBOSE is not set
++CONFIG_NET_IPIP=y
++CONFIG_INET_AH=y
++CONFIG_INET_ESP=y
++CONFIG_INET_IPCOMP=y
++CONFIG_INET_XFRM_TUNNEL=y
++CONFIG_INET_TUNNEL=y
++CONFIG_INET_XFRM_MODE_TRANSPORT=y
++# CONFIG_INET_XFRM_MODE_TUNNEL is not set
++# CONFIG_INET_XFRM_MODE_BEET is not set
++CONFIG_INET_DIAG=y
++CONFIG_INET_TCP_DIAG=y
++CONFIG_IPV6=y
++CONFIG_INET6_AH=y
++CONFIG_INET6_ESP=y
++CONFIG_INET6_IPCOMP=y
++CONFIG_INET6_XFRM_TUNNEL=y
++CONFIG_INET6_TUNNEL=y
++CONFIG_INET6_XFRM_MODE_TRANSPORT=y
++# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
++# CONFIG_INET6_XFRM_MODE_BEET is not set
++CONFIG_BRIDGE_NETFILTER=y
++CONFIG_NETFILTER_NETLINK=y
++CONFIG_NETFILTER_NETLINK_QUEUE=y
++CONFIG_NETFILTER_NETLINK_LOG=y
++CONFIG_NF_CONNTRACK=y
++# CONFIG_NF_CONNTRACK_FTP is not set
++# CONFIG_NF_CONNTRACK_IRC is not set
++# CONFIG_NF_CONNTRACK_TFTP is not set
++CONFIG_NF_CT_NETLINK=y
++CONFIG_NETFILTER_TPROXY=y
++CONFIG_NETFILTER_XTABLES=y
++CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
++CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
++CONFIG_NETFILTER_XT_TARGET_DSCP=y
++CONFIG_NETFILTER_XT_TARGET_IMQ=y
++CONFIG_NETFILTER_XT_TARGET_MARK=y
++CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
++CONFIG_NETFILTER_XT_TARGET_NOTRACK=y
++CONFIG_NETFILTER_XT_TARGET_RATEEST=y
++CONFIG_NETFILTER_XT_TARGET_TPROXY=y
++CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
++CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=y
++CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
++CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
++CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
++CONFIG_NETFILTER_XT_MATCH_DSCP=y
++CONFIG_NETFILTER_XT_MATCH_ESP=y
++CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
++CONFIG_NETFILTER_XT_MATCH_HELPER=y
++CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
++CONFIG_NETFILTER_XT_MATCH_LENGTH=y
++CONFIG_NETFILTER_XT_MATCH_LIMIT=y
++CONFIG_NETFILTER_XT_MATCH_MAC=y
++CONFIG_NETFILTER_XT_MATCH_MARK=y
++CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
++CONFIG_NETFILTER_XT_MATCH_OWNER=y
++CONFIG_NETFILTER_XT_MATCH_POLICY=y
++CONFIG_NETFILTER_XT_MATCH_PHYSDEV=y
++CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
++CONFIG_NETFILTER_XT_MATCH_QUOTA=y
++CONFIG_NETFILTER_XT_MATCH_RATEEST=y
++CONFIG_NETFILTER_XT_MATCH_RECENT=y
++CONFIG_NETFILTER_XT_MATCH_SCTP=y
++CONFIG_NETFILTER_XT_MATCH_SOCKET=y
++CONFIG_NETFILTER_XT_MATCH_STATE=y
++CONFIG_NETFILTER_XT_MATCH_LAYER7=y
++CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
++CONFIG_NETFILTER_XT_MATCH_STRING=y
++CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
++CONFIG_NETFILTER_XT_MATCH_TIME=y
++CONFIG_NETFILTER_XT_MATCH_U32=y
++CONFIG_NF_DEFRAG_IPV4=y
++CONFIG_NF_CONNTRACK_IPV4=y
++CONFIG_IP_NF_QUEUE=y
++CONFIG_IP_NF_IPTABLES=y
++CONFIG_IP_NF_MATCH_ADDRTYPE=y
++CONFIG_IP_NF_MATCH_AH=y
++CONFIG_IP_NF_MATCH_ECN=y
++CONFIG_IP_NF_MATCH_TTL=y
++CONFIG_IP_NF_FILTER=y
++CONFIG_IP_NF_TARGET_REJECT=y
++CONFIG_IP_NF_TARGET_LOG=y
++CONFIG_NF_NAT=y
++CONFIG_IP_NF_TARGET_MASQUERADE=y
++CONFIG_IP_NF_TARGET_NETMAP=y
++CONFIG_IP_NF_TARGET_REDIRECT=y
++# CONFIG_NF_NAT_FTP is not set
++# CONFIG_NF_NAT_IRC is not set
++# CONFIG_NF_NAT_TFTP is not set
++CONFIG_IP_NF_MANGLE=y
++CONFIG_IP_NF_TARGET_ECN=y
++CONFIG_IP_NF_TARGET_TTL=y
++CONFIG_IP_NF_RAW=y
++CONFIG_IP_NF_ARPTABLES=y
++CONFIG_IP_NF_ARPFILTER=y
++CONFIG_IP_NF_ARP_MANGLE=y
++CONFIG_IP_NF_SET=y
++CONFIG_IP_NF_SET_IPMAP=y
++CONFIG_IP_NF_SET_MACIPMAP=y
++CONFIG_IP_NF_SET_PORTMAP=y
++CONFIG_IP_NF_SET_IPHASH=y
++CONFIG_IP_NF_SET_NETHASH=y
++CONFIG_IP_NF_SET_IPPORTHASH=y
++CONFIG_IP_NF_SET_IPTREE=y
++CONFIG_IP_NF_SET_IPTREEMAP=y
++CONFIG_IP_NF_MATCH_SET=y
++CONFIG_IP_NF_TARGET_SET=y
++CONFIG_NF_CONNTRACK_IPV6=y
++CONFIG_IP6_NF_IPTABLES=y
++CONFIG_IP6_NF_MATCH_AH=y
++CONFIG_IP6_NF_MATCH_EUI64=y
++CONFIG_IP6_NF_MATCH_FRAG=y
++CONFIG_IP6_NF_MATCH_OPTS=y
++CONFIG_IP6_NF_MATCH_HL=y
++CONFIG_IP6_NF_MATCH_IPV6HEADER=y
++CONFIG_IP6_NF_MATCH_MH=y
++CONFIG_IP6_NF_MATCH_RT=y
++CONFIG_IP6_NF_TARGET_LOG=y
++CONFIG_IP6_NF_FILTER=y
++CONFIG_IP6_NF_TARGET_REJECT=y
++CONFIG_IP6_NF_MANGLE=y
++# CONFIG_IP6_NF_TARGET_HL is not set
++CONFIG_IP6_NF_RAW=y
++CONFIG_BRIDGE_NF_EBTABLES=y
++CONFIG_BRIDGE_EBT_BROUTE=y
++CONFIG_BRIDGE_EBT_T_FILTER=y
++CONFIG_BRIDGE_EBT_T_NAT=y
++CONFIG_BRIDGE_EBT_802_3=y
++CONFIG_BRIDGE_EBT_AMONG=y
++CONFIG_BRIDGE_EBT_ARP=y
++CONFIG_BRIDGE_EBT_IP=y
++CONFIG_BRIDGE_EBT_IP6=y
++CONFIG_BRIDGE_EBT_LIMIT=y
++CONFIG_BRIDGE_EBT_MARK=y
++CONFIG_BRIDGE_EBT_PKTTYPE=y
++CONFIG_BRIDGE_EBT_STP=y
++CONFIG_BRIDGE_EBT_VLAN=y
++CONFIG_BRIDGE_EBT_ARPREPLY=y
++CONFIG_BRIDGE_EBT_DNAT=y
++CONFIG_BRIDGE_EBT_MARK_T=y
++CONFIG_BRIDGE_EBT_REDIRECT=y
++CONFIG_BRIDGE_EBT_SNAT=y
++CONFIG_BRIDGE_EBT_LOG=y
++# CONFIG_BRIDGE_EBT_ULOG is not set
++# CONFIG_BRIDGE_EBT_NFLOG is not set
++CONFIG_IP_SCTP=y
++# CONFIG_SCTP_DBG_MSG is not set
++# CONFIG_SCTP_DBG_OBJCNT is not set
++# CONFIG_SCTP_HMAC_NONE is not set
++CONFIG_SCTP_HMAC_SHA1=y
++# CONFIG_SCTP_HMAC_MD5 is not set
++CONFIG_NET_SCH_CBQ=y
++CONFIG_NET_SCH_HTB=y
++CONFIG_NET_SCH_HFSC=y
++CONFIG_NET_SCH_PRIO=y
++CONFIG_NET_SCH_MULTIQ=y
++CONFIG_NET_SCH_RED=y
++CONFIG_NET_SCH_SFQ=y
++CONFIG_NET_SCH_ESFQ=y
++CONFIG_NET_SCH_TEQL=y
++CONFIG_NET_SCH_TBF=y
++CONFIG_NET_SCH_GRED=y
++CONFIG_NET_SCH_DSMARK=y
++CONFIG_NET_SCH_NETEM=y
++CONFIG_NET_SCH_INGRESS=y
++CONFIG_NET_CLS_BASIC=y
++CONFIG_NET_CLS_TCINDEX=y
++CONFIG_NET_CLS_ROUTE4=y
++CONFIG_NET_CLS_FW=y
++CONFIG_NET_CLS_U32=y
++CONFIG_NET_CLS_FLOW=y
++CONFIG_NET_EMATCH=y
++CONFIG_NET_EMATCH_STACK=32
++CONFIG_NET_EMATCH_CMP=y
++CONFIG_NET_EMATCH_NBYTE=y
++CONFIG_NET_EMATCH_U32=y
++# CONFIG_NET_EMATCH_META is not set
++# CONFIG_NET_EMATCH_TEXT is not set
++CONFIG_NET_ACT_GACT=y
++CONFIG_GACT_PROB=y
++CONFIG_NET_ACT_MIRRED=y
++CONFIG_NET_ACT_IPT=y
++CONFIG_NET_ACT_NAT=y
++CONFIG_NET_ACT_PEDIT=y
++# CONFIG_HAMRADIO is not set
++# CONFIG_WIRELESS is not set
++# CONFIG_MAC80211_RC_DEFAULT_PID is not set
++CONFIG_BLK_DEV_LOOP=y
++CONFIG_BLK_DEV_IDECD=y
++CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
++CONFIG_BLK_DEV_IDEPNP=y
++CONFIG_IMQ=y
++CONFIG_IMQ_NUM_DEVS=16
++CONFIG_TUN=y
++CONFIG_EL3=y
++CONFIG_VORTEX=y
++CONFIG_PCNET32=y
++CONFIG_B44=y
++CONFIG_B44_PCI_AUTOSELECT=y
++CONFIG_B44_PCICORE_AUTOSELECT=y
++CONFIG_B44_PCI=y
++CONFIG_E100=y
++CONFIG_NATSEMI=y
++CONFIG_NE2K_PCI=y
++CONFIG_8139TOO=y
++CONFIG_VIA_RHINE=y
++CONFIG_E1000=y
++CONFIG_R8169=y
++CONFIG_VIA_VELOCITY=y
++CONFIG_BNX2=y
++# CONFIG_ISDN is not set
++# CONFIG_WATCHDOG is not set
++CONFIG_SSB=y
++CONFIG_SSB_SPROM=y
++# CONFIG_SSB_BLOCKIO is not set
++CONFIG_SSB_PCIHOST_POSSIBLE=y
++CONFIG_SSB_PCIHOST=y
++CONFIG_SSB_B43_PCI_BRIDGE=y
++# CONFIG_SSB_DEBUG is not set
++CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
++CONFIG_SSB_DRIVER_PCICORE=y
++# CONFIG_NEW_LEDS is not set
++# CONFIG_ACCESSIBILITY is not set
++# CONFIG_INFINIBAND is not set
++# CONFIG_EDAC is not set
++CONFIG_RTC_LIB=y
++CONFIG_RTC_CLASS=y
++CONFIG_RTC_HCTOSYS=y
++CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
++# CONFIG_RTC_DEBUG is not set
++CONFIG_RTC_INTF_SYSFS=y
++CONFIG_RTC_INTF_PROC=y
++CONFIG_RTC_INTF_DEV=y
++# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
++# CONFIG_RTC_DRV_TEST is not set
++CONFIG_RTC_DRV_CMOS=y
++# CONFIG_RTC_DRV_DS1286 is not set
++# CONFIG_RTC_DRV_DS1511 is not set
++# CONFIG_RTC_DRV_DS1553 is not set
++# CONFIG_RTC_DRV_DS1742 is not set
++# CONFIG_RTC_DRV_STK17TA8 is not set
++# CONFIG_RTC_DRV_M48T86 is not set
++# CONFIG_RTC_DRV_M48T35 is not set
++# CONFIG_RTC_DRV_M48T59 is not set
++# CONFIG_RTC_DRV_BQ4802 is not set
++# CONFIG_RTC_DRV_V3020 is not set
++# CONFIG_RTC_DRV_RTC7301 is not set
++CONFIG_EXT3_FS=y
++CONFIG_JBD=y
++CONFIG_XFS_FS=y
++# CONFIG_DNOTIFY is not set
++CONFIG_INOTIFY=y
++CONFIG_INOTIFY_USER=y
++CONFIG_ISO9660_FS=y
++# CONFIG_VFAT_FS is not set
++# CONFIG_JFFS2_FS is not set
++# CONFIG_JFFS2_CMODE_PRIORITY is not set
++# CONFIG_SQUASHFS is not set
++# CONFIG_MINI_FO is not set
++# CONFIG_NETWORK_FILESYSTEMS is not set
++CONFIG_NLS=y
++CONFIG_NLS_ASCII=y
++CONFIG_NLS_ISO8859_1=y
++CONFIG_NLS_UTF8=y
++# CONFIG_DEBUG_FS is not set
++# CONFIG_SYSCTL_SYSCALL_CHECK is not set
++# CONFIG_X86_VERBOSE_BOOTUP is not set
++# CONFIG_4KSTACKS is not set
++CONFIG_CRYPTO_ALGAPI=y
++CONFIG_CRYPTO_ALGAPI2=y
++CONFIG_CRYPTO_AEAD=y
++CONFIG_CRYPTO_AEAD2=y
++CONFIG_CRYPTO_BLKCIPHER=y
++CONFIG_CRYPTO_BLKCIPHER2=y
++CONFIG_CRYPTO_HASH=y
++CONFIG_CRYPTO_HASH2=y
++CONFIG_CRYPTO_RNG=y
++CONFIG_CRYPTO_RNG2=y
++CONFIG_CRYPTO_MANAGER=y
++CONFIG_CRYPTO_MANAGER2=y
++CONFIG_CRYPTO_GF128MUL=y
++CONFIG_CRYPTO_AUTHENC=y
++CONFIG_CRYPTO_GCM=y
++CONFIG_CRYPTO_SEQIV=y
++CONFIG_CRYPTO_CBC=y
++CONFIG_CRYPTO_CTR=y
++CONFIG_CRYPTO_ECB=y
++CONFIG_CRYPTO_HMAC=y
++CONFIG_CRYPTO_MD5=y
++CONFIG_CRYPTO_SHA1=y
++CONFIG_CRYPTO_SHA256=y
++CONFIG_CRYPTO_AES=y
++CONFIG_CRYPTO_AES_586=y
++CONFIG_CRYPTO_ARC4=y
++CONFIG_CRYPTO_BLOWFISH=y
++CONFIG_CRYPTO_DES=y
++CONFIG_CRYPTO_DEFLATE=y
++CONFIG_CRYPTO_DEV_PADLOCK=y
++CONFIG_CRYPTO_DEV_PADLOCK_AES=y
++CONFIG_CRYPTO_DEV_PADLOCK_SHA=y
++CONFIG_CRYPTO_DEV_GEODE=y
++CONFIG_CRC_CCITT=y
++CONFIG_LIBCRC32C=y
++CONFIG_TEXTSEARCH_KMP=y
++CONFIG_TEXTSEARCH_BM=y
++CONFIG_TEXTSEARCH_FSM=y
++CONFIG_8139TOO_PIO=y
++# CONFIG_8139TOO_TUNE_TWISTER is not set
++# CONFIG_8139TOO_8129 is not set
++# CONFIG_8139_OLD_RX_RESET is not set
++# CONFIG_VIA_RHINE_MMIO is not set
++# CONFIG_R8169_VLAN is not set
Added: torvm/trunk/build/kamikaze/ipv6-advnet-patches/005-kamikaze-build-config.patch
===================================================================
--- torvm/trunk/build/kamikaze/ipv6-advnet-patches/005-kamikaze-build-config.patch (rev 0)
+++ torvm/trunk/build/kamikaze/ipv6-advnet-patches/005-kamikaze-build-config.patch 2009-05-31 23:12:42 UTC (rev 19605)
@@ -0,0 +1,1421 @@
+diff -Naur a/.config b/.config
+--- a/.config 1970-01-01 00:00:00.000000000 +0000
++++ b/.config 2009-05-27 03:40:21.136742611 +0000
+@@ -0,0 +1,1387 @@
++#
++# Automatically generated make config: don't edit
++# OpenWrt version: Kamikaze (unknown)
++# Tue May 26 20:38:56 2009
++#
++CONFIG_HAVE_DOT_CONFIG=y
++# CONFIG_TARGET_ppc40x is not set
++# CONFIG_TARGET_ppc44x is not set
++# CONFIG_TARGET_atheros is not set
++# CONFIG_TARGET_ar71xx is not set
++# CONFIG_TARGET_at91 is not set
++# CONFIG_TARGET_avr32 is not set
++# CONFIG_TARGET_brcm63xx is not set
++# CONFIG_TARGET_brcm_2_4 is not set
++# CONFIG_TARGET_brcm47xx is not set
++# CONFIG_TARGET_sibyte is not set
++# CONFIG_TARGET_cavium_octeon is not set
++# CONFIG_TARGET_cobalt is not set
++# CONFIG_TARGET_gemini is not set
++# CONFIG_TARGET_etrax is not set
++# CONFIG_TARGET_amazon is not set
++# CONFIG_TARGET_ifxmips is not set
++# CONFIG_TARGET_adm5120 is not set
++# CONFIG_TARGET_iop32x is not set
++# CONFIG_TARGET_ixp4xx is not set
++# CONFIG_TARGET_kirkwood is not set
++# CONFIG_TARGET_orion is not set
++# CONFIG_TARGET_pxa is not set
++# CONFIG_TARGET_rb532 is not set
++# CONFIG_TARGET_olpc is not set
++# CONFIG_TARGET_rdc is not set
++# CONFIG_TARGET_au1000 is not set
++# CONFIG_TARGET_s3c24xx is not set
++# CONFIG_TARGET_ps3 is not set
++# CONFIG_TARGET_storm is not set
++# CONFIG_TARGET_ar7 is not set
++# CONFIG_TARGET_uml is not set
++CONFIG_TARGET_x86=y
++# CONFIG_TARGET_orion_generic is not set
++# CONFIG_TARGET_orion_harddisk is not set
++# CONFIG_TARGET_ixp4xx_generic is not set
++# CONFIG_TARGET_ixp4xx_harddisk is not set
++# CONFIG_TARGET_au1000_au1500 is not set
++# CONFIG_TARGET_au1000_au1550 is not set
++# CONFIG_TARGET_adm5120_router_le is not set
++# CONFIG_TARGET_adm5120_router_be is not set
++CONFIG_TARGET_x86_generic=y
++# CONFIG_TARGET_ps3_petitboot is not set
++# CONFIG_TARGET_ppc44x_Default is not set
++# CONFIG_TARGET_etrax_default is not set
++# CONFIG_TARGET_etrax_vhdl_no_fb is not set
++# CONFIG_TARGET_iop32x_Default is not set
++# CONFIG_TARGET_orion_generic_Default is not set
++# CONFIG_TARGET_orion_harddisk_Default is not set
++# CONFIG_TARGET_pxa_Default is not set
++# CONFIG_TARGET_kirkwood_Default is not set
++# CONFIG_TARGET_ar7_Texas is not set
++# CONFIG_TARGET_ar7_None is not set
++# CONFIG_TARGET_rb532_Default is not set
++# CONFIG_TARGET_olpc_Default is not set
++# CONFIG_TARGET_avr32_Default is not set
++# CONFIG_TARGET_ixp4xx_generic_Default is not set
++# CONFIG_TARGET_ixp4xx_generic_Atheros-ath5k is not set
++# CONFIG_TARGET_ixp4xx_generic_NSLU2 is not set
++# CONFIG_TARGET_ixp4xx_generic_NAS100d is not set
++# CONFIG_TARGET_ixp4xx_generic_DSMG600RevA is not set
++# CONFIG_TARGET_ixp4xx_generic_USR8200 is not set
++# CONFIG_TARGET_ixp4xx_harddisk_FSG3 is not set
++# CONFIG_TARGET_cobalt_Default is not set
++# CONFIG_TARGET_au1000_au1500_Atheros is not set
++# CONFIG_TARGET_au1000_au1500_InternetBox is not set
++# CONFIG_TARGET_au1000_au1500_MeshCube is not set
++# CONFIG_TARGET_au1000_au1550_DBAu1550 is not set
++# CONFIG_TARGET_adm5120_router_le_Generic is not set
++# CONFIG_TARGET_adm5120_router_le_CAS630 is not set
++# CONFIG_TARGET_adm5120_router_le_CAS630W is not set
++# CONFIG_TARGET_adm5120_router_le_CAS670 is not set
++# CONFIG_TARGET_adm5120_router_le_CAS670W is not set
++# CONFIG_TARGET_adm5120_router_le_CAS700 is not set
++# CONFIG_TARGET_adm5120_router_le_CAS700W is not set
++# CONFIG_TARGET_adm5120_router_le_CAS771 is not set
++# CONFIG_TARGET_adm5120_router_le_CAS771W is not set
++# CONFIG_TARGET_adm5120_router_le_CAS790 is not set
++# CONFIG_TARGET_adm5120_router_le_CAS861 is not set
++# CONFIG_TARGET_adm5120_router_le_CAS861W is not set
++# CONFIG_TARGET_adm5120_router_le_NFS101U is not set
++# CONFIG_TARGET_adm5120_router_le_NFS101WU is not set
++# CONFIG_TARGET_adm5120_router_le_NP27G is not set
++# CONFIG_TARGET_adm5120_router_le_NP28G is not set
++# CONFIG_TARGET_adm5120_router_le_WP54 is not set
++# CONFIG_TARGET_adm5120_router_le_BR6104K is not set
++# CONFIG_TARGET_adm5120_router_le_BR6104KP is not set
++# CONFIG_TARGET_adm5120_router_le_BR6104WG is not set
++# CONFIG_TARGET_adm5120_router_le_BR6114WG is not set
++# CONFIG_TARGET_adm5120_router_le_EASY5120RT is not set
++# CONFIG_TARGET_adm5120_router_le_EASY5120PATA is not set
++# CONFIG_TARGET_adm5120_router_le_PMUGW is not set
++# CONFIG_TARGET_adm5120_router_le_RouterBoard is not set
++# CONFIG_TARGET_adm5120_router_be_Generic is not set
++# CONFIG_TARGET_adm5120_router_be_P334WT is not set
++# CONFIG_TARGET_adm5120_router_be_P335WT is not set
++# CONFIG_TARGET_cavium_octeon_mototech is not set
++# CONFIG_TARGET_cavium_octeon_simulator is not set
++# CONFIG_TARGET_brcm63xx_Broadcom is not set
++# CONFIG_TARGET_brcm63xx_Atheros is not set
++# CONFIG_TARGET_brcm63xx_Ralink is not set
++# CONFIG_TARGET_brcm47xx_Broadcom-b43 is not set
++# CONFIG_TARGET_brcm47xx_Atheros is not set
++# CONFIG_TARGET_brcm47xx_Atheros-ath5k is not set
++# CONFIG_TARGET_brcm47xx_None is not set
++# CONFIG_TARGET_brcm47xx_WGT634U is not set
++# CONFIG_TARGET_brcm47xx_WL500GPv1 is not set
++# CONFIG_TARGET_brcm47xx_WRTSL54GS is not set
++# CONFIG_TARGET_ifxmips_None is not set
++# CONFIG_TARGET_ifxmips_Atheros is not set
++# CONFIG_TARGET_ifxmips_Ralink is not set
++# CONFIG_TARGET_brcm_2_4_Broadcom is not set
++# CONFIG_TARGET_brcm_2_4_BroadcomMimo is not set
++# CONFIG_TARGET_brcm_2_4_None is not set
++# CONFIG_TARGET_brcm_2_4_USBGeneric is not set
++# CONFIG_TARGET_brcm_2_4_WL500G is not set
++# CONFIG_TARGET_brcm_2_4_WL500GD is not set
++# CONFIG_TARGET_brcm_2_4_WL500GP is not set
++# CONFIG_TARGET_brcm_2_4_WL700GE is not set
++# CONFIG_TARGET_brcm_2_4_WLHDD is not set
++# CONFIG_TARGET_brcm_2_4_WRT54G3G is not set
++CONFIG_TARGET_x86_generic_Generic=y
++# CONFIG_TARGET_x86_generic_Alix is not set
++# CONFIG_TARGET_x86_generic_Pcengines is not set
++# CONFIG_TARGET_x86_generic_Soekris45xx is not set
++# CONFIG_TARGET_x86_generic_Soekris48xx is not set
++# CONFIG_TARGET_amazon_Default is not set
++# CONFIG_TARGET_ar71xx_Default is not set
++# CONFIG_TARGET_ar71xx_Madwifi is not set
++# CONFIG_TARGET_ar71xx_A02RBW300N is not set
++# CONFIG_TARGET_ar71xx_WP543 is not set
++# CONFIG_TARGET_ar71xx_DIR615C1 is not set
++# CONFIG_TARGET_ar71xx_MZKW04NU is not set
++# CONFIG_TARGET_ar71xx_TLWR941NDV2 is not set
++# CONFIG_TARGET_ar71xx_TEW632BRP is not set
++# CONFIG_TARGET_ar71xx_TEW652BRP is not set
++# CONFIG_TARGET_ar71xx_UBNTRS is not set
++# CONFIG_TARGET_uml_Default is not set
++# CONFIG_TARGET_sibyte_Default is not set
++# CONFIG_TARGET_storm_Default is not set
++# CONFIG_TARGET_atheros_Default is not set
++# CONFIG_TARGET_ps3_petitboot_Default is not set
++# CONFIG_TARGET_gemini_Default is not set
++# CONFIG_TARGET_rdc_amit is not set
++# CONFIG_TARGET_rdc_ar525w is not set
++# CONFIG_TARGET_rdc_dir450 is not set
++# CONFIG_TARGET_rdc_g570s is not set
++# CONFIG_TARGET_rdc_r8610 is not set
++# CONFIG_TARGET_rdc_wl153 is not set
++# CONFIG_TARGET_s3c24xx_openmoko-gta02-minimal is not set
++# CONFIG_TARGET_s3c24xx_openmoko-gta02-full is not set
++# CONFIG_TARGET_ppc40x_Default is not set
++# CONFIG_TARGET_at91_Default is not set
++CONFIG_HAS_SUBTARGETS=y
++CONFIG_TARGET_BOARD="x86"
++CONFIG_DEFAULT_TARGET_OPTIMIZATION="-O2 -pipe -march=i486 -funit-at-a-time"
++CONFIG_LINUX_2_6_28=y
++CONFIG_DEFAULT_base-files=y
++CONFIG_DEFAULT_busybox=y
++CONFIG_DEFAULT_dnsmasq=y
++CONFIG_DEFAULT_dropbear=y
++CONFIG_DEFAULT_firewall=y
++CONFIG_DEFAULT_hotplug2=y
++CONFIG_DEFAULT_iptables=y
++CONFIG_DEFAULT_kmod-3c59x=y
++CONFIG_DEFAULT_kmod-8139too=y
++CONFIG_DEFAULT_kmod-e100=y
++CONFIG_DEFAULT_kmod-e1000=y
++CONFIG_DEFAULT_kmod-ipt-nathelper=y
++CONFIG_DEFAULT_kmod-natsemi=y
++CONFIG_DEFAULT_kmod-ne2k-pci=y
++CONFIG_DEFAULT_kmod-pcnet32=y
++CONFIG_DEFAULT_kmod-r8169=y
++CONFIG_DEFAULT_kmod-sis900=y
++CONFIG_DEFAULT_kmod-tg3=y
++CONFIG_DEFAULT_kmod-via-rhine=y
++CONFIG_DEFAULT_kmod-via-velocity=y
++CONFIG_DEFAULT_libc=y
++CONFIG_DEFAULT_libgcc=y
++CONFIG_DEFAULT_mtd=y
++CONFIG_DEFAULT_opkg=y
++CONFIG_DEFAULT_ppp=y
++CONFIG_DEFAULT_ppp-mod-pppoe=y
++CONFIG_DEFAULT_uci=y
++CONFIG_DEFAULT_udevtrigger=y
++CONFIG_LINUX_2_6=y
++CONFIG_DISPLAY_SUPPORT=y
++CONFIG_PCI_SUPPORT=y
++CONFIG_PCMCIA_SUPPORT=y
++CONFIG_USES_SQUASHFS=y
++CONFIG_USES_JFFS2=y
++CONFIG_USES_EXT2=y
++CONFIG_USES_TGZ=y
++CONFIG_i386=y
++CONFIG_ARCH="i386"
++
++#
++# Target Images
++#
++CONFIG_TARGET_ROOTFS_INITRAMFS=y
++# CONFIG_TARGET_ROOTFS_ISO is not set
++
++#
++# Image Options
++#
++CONFIG_OLPC_BOOTSCRIPT_ROOTPART="/dev/sda2"
++CONFIG_X86_GRUB_ROOTPART="/dev/hda2"
++CONFIG_X86_GRUB_BOOTOPTS=""
++
++#
++# Global build settings
++#
++# CONFIG_ALL is not set
++
++#
++# Features
++#
++CONFIG_CLEAN_IPKG=y
++
++#
++# Package build options
++#
++# CONFIG_DEBUG is not set
++# CONFIG_DEBUG_DIR is not set
++CONFIG_NO_STRIP=y
++
++#
++# Kernel build options
++#
++# CONFIG_KERNEL_KALLSYMS is not set
++# CONFIG_KERNEL_PROFILING is not set
++CONFIG_DEVEL=y
++# CONFIG_BROKEN is not set
++CONFIG_DOWNLOAD_FOLDER=""
++CONFIG_LOCALMIRROR=""
++CONFIG_AUTOREBUILD=y
++CONFIG_BUILD_SUFFIX=""
++CONFIG_TARGET_ROOTFS_DIR=""
++CONFIG_CCACHE=y
++CONFIG_EXTERNAL_KERNEL_TREE=""
++CONFIG_KERNEL_GIT_CLONE_URI=""
++CONFIG_KERNEL_GIT_LOCAL_REPOSITORY=""
++# CONFIG_NATIVE_TOOLCHAIN is not set
++CONFIG_TOOLCHAINOPTS=y
++# CONFIG_EXTRA_TARGET_ARCH is not set
++# CONFIG_BINUTILS_VERSION_2_18 is not set
++CONFIG_BINUTILS_VERSION_2_19_1=y
++CONFIG_EXTRA_BINUTILS_CONFIG_OPTIONS=""
++CONFIG_BINUTILS_VERSION="2.19.1"
++# CONFIG_GCC_VERSION_3_4_6 is not set
++# CONFIG_GCC_VERSION_4_1_2 is not set
++# CONFIG_GCC_VERSION_4_2_4 is not set
++# CONFIG_GCC_VERSION_4_3_3 is not set
++CONFIG_GCC_VERSION_4_4_0=y
++CONFIG_EXTRA_GCC_CONFIG_OPTIONS=""
++CONFIG_SSP_SUPPORT=y
++# CONFIG_INSTALL_LIBSTDCPP is not set
++# CONFIG_INSTALL_LIBGCJ is not set
++CONFIG_USE_EGLIBC=y
++# CONFIG_USE_GLIBC is not set
++# CONFIG_USE_UCLIBC is not set
++# CONFIG_EGLIBC_VERSION_2_6_1 is not set
++# CONFIG_EGLIBC_VERSION_2_7 is not set
++# CONFIG_EGLIBC_VERSION_2_8 is not set
++CONFIG_EGLIBC_VERSION_2_9=y
++# CONFIG_EGLIBC_VERSION_TRUNK is not set
++CONFIG_EGLIBC_REVISION="7430"
++
++#
++# eglibc configuration
++#
++CONFIG_EGLIBC_OPTION_EGLIBC_ADVANCED_INET6=y
++# CONFIG_EGLIBC_OPTION_EGLIBC_BACKTRACE is not set
++CONFIG_EGLIBC_OPTION_EGLIBC_BSD=y
++CONFIG_EGLIBC_OPTION_EGLIBC_CXX_TESTS=y
++CONFIG_EGLIBC_OPTION_EGLIBC_CATGETS=y
++CONFIG_EGLIBC_OPTION_EGLIBC_CHARSETS=y
++# CONFIG_EGLIBC_OPTION_EGLIBC_DB_ALIASES is not set
++CONFIG_EGLIBC_OPTION_EGLIBC_ENVZ=y
++CONFIG_EGLIBC_OPTION_EGLIBC_FSTAB=y
++CONFIG_EGLIBC_OPTION_EGLIBC_INET=y
++CONFIG_EGLIBC_OPTION_EGLIBC_LIBM=y
++CONFIG_EGLIBC_OPTION_EGLIBC_LOCALES=y
++CONFIG_EGLIBC_OPTION_EGLIBC_LOCALE_CODE=y
++CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH=y
++# CONFIG_EGLIBC_OPTION_EGLIBC_RCMD is not set
++# CONFIG_EGLIBC_OPTION_EGLIBC_SPAWN is not set
++# CONFIG_EGLIBC_OPTION_EGLIBC_STREAMS is not set
++# CONFIG_EGLIBC_OPTION_EGLIBC_SUNRPC is not set
++# CONFIG_EGLIBC_OPTION_EGLIBC_UTMP is not set
++CONFIG_EGLIBC_OPTION_EGLIBC_WORDEXP=y
++CONFIG_EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR=y
++CONFIG_EGLIBC_OPTION_POSIX_REGEXP=y
++CONFIG_EGLIBC_OPTION_POSIX_WIDE_CHAR_DEVICE_IO=y
++# CONFIG_GDB is not set
++CONFIG_LARGEFILE=y
++# CONFIG_SHADOW_PASSWORDS is not set
++CONFIG_TARGET_OPTIMIZATION="-O2 -pipe -march=i686"
++CONFIG_GCC_VERSION="4.4.0"
++CONFIG_GCC_VERSION_4=y
++CONFIG_GCC_VERSION_4_4=y
++CONFIG_EGLIBC_VERSION="2.9"
++CONFIG_LIBC="eglibc"
++CONFIG_LIBC_VERSION="2.9"
++CONFIG_TARGET_SUFFIX="gnu"
++# CONFIG_SDK is not set
++# CONFIG_UCI_PRECONFIG is not set
++CONFIG_UCI_PRECONFIG_network_lan_dns=""
++CONFIG_UCI_PRECONFIG_network_lan_proto="static"
++CONFIG_UCI_PRECONFIG_network_lan_gateway=""
++CONFIG_UCI_PRECONFIG_network_lan_netmask="255.255.255.0"
++CONFIG_UCI_PRECONFIG_network_lan_ipaddr="192.168.1.1"
++
++#
++# Base system
++#
++CONFIG_PACKAGE_base-files=y
++# CONFIG_PACKAGE_br2684ctl is not set
++# CONFIG_PACKAGE_bridge is not set
++CONFIG_PACKAGE_busybox=y
++
++#
++# Configuration
++#
++# CONFIG_BUSYBOX_CONFIG_FEATURE_DEVFS is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_2_4_MODULES is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_2_6_MODULES=y
++CONFIG_BUSYBOX_CONFIG_HAVE_DOT_CONFIG=y
++
++#
++# Busybox Settings
++#
++
++#
++# General Configuration
++#
++# CONFIG_BUSYBOX_CONFIG_DESKTOP is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_ASSUME_UNICODE is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
++CONFIG_BUSYBOX_CONFIG_SHOW_USAGE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_VERBOSE_USAGE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_COMPRESS_USAGE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_INSTALLER=y
++# CONFIG_BUSYBOX_CONFIG_LOCALE_SUPPORT is not set
++CONFIG_BUSYBOX_CONFIG_GETOPT_LONG=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_DEVPTS=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_CLEAN_UP is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_PIDFILE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_SUID=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_SUID_CONFIG is not set
++# CONFIG_BUSYBOX_CONFIG_SELINUX is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS=y
++CONFIG_BUSYBOX_CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
++CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOG=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_HAVE_RPC is not set
++
++#
++# Build Options
++#
++# CONFIG_BUSYBOX_CONFIG_STATIC is not set
++CONFIG_BUSYBOX_CONFIG_PIE=y
++# CONFIG_BUSYBOX_CONFIG_NOMMU is not set
++CONFIG_BUSYBOX_CONFIG_LFS=y
++CONFIG_BUSYBOX_CONFIG_CROSS_COMPILER_PREFIX=""
++
++#
++# Debugging Options
++#
++# CONFIG_BUSYBOX_CONFIG_DEBUG is not set
++# CONFIG_BUSYBOX_CONFIG_WERROR is not set
++CONFIG_BUSYBOX_CONFIG_NO_DEBUG_LIB=y
++# CONFIG_BUSYBOX_CONFIG_DMALLOC is not set
++# CONFIG_BUSYBOX_CONFIG_EFENCE is not set
++# CONFIG_BUSYBOX_CONFIG_INCLUDE_SUSv2 is not set
++
++#
++# Installation Options
++#
++# CONFIG_BUSYBOX_CONFIG_INSTALL_NO_USR is not set
++CONFIG_BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS=y
++# CONFIG_BUSYBOX_CONFIG_INSTALL_APPLET_HARDLINKS is not set
++# CONFIG_BUSYBOX_CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
++# CONFIG_BUSYBOX_CONFIG_INSTALL_APPLET_DONT is not set
++CONFIG_BUSYBOX_CONFIG_PREFIX="./_install"
++
++#
++# Busybox Library Tuning
++#
++CONFIG_BUSYBOX_CONFIG_PASSWORD_MINLEN=6
++CONFIG_BUSYBOX_CONFIG_MD5_SIZE_VS_SPEED=2
++CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_ETC_NETWORKS=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_MAX_LEN=512
++CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_VI=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_HISTORY=256
++CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_SAVEHISTORY=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_TAB_COMPLETION=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_USERNAME_COMPLETION is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_COPYBUF_KB=16
++CONFIG_BUSYBOX_CONFIG_MONOTONIC_SYSCALL=y
++CONFIG_BUSYBOX_CONFIG_IOCTL_HEX2STR_ERROR=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_HWIB is not set
++
++#
++# Applets
++#
++
++#
++# Archival Utilities
++#
++# CONFIG_BUSYBOX_CONFIG_AR is not set
++CONFIG_BUSYBOX_CONFIG_BUNZIP2=y
++CONFIG_BUSYBOX_CONFIG_BZIP2=y
++# CONFIG_BUSYBOX_CONFIG_CPIO is not set
++# CONFIG_BUSYBOX_CONFIG_DPKG is not set
++# CONFIG_BUSYBOX_CONFIG_DPKG_DEB is not set
++CONFIG_BUSYBOX_CONFIG_GUNZIP=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
++CONFIG_BUSYBOX_CONFIG_GZIP=y
++# CONFIG_BUSYBOX_CONFIG_RPM2CPIO is not set
++# CONFIG_BUSYBOX_CONFIG_RPM is not set
++CONFIG_BUSYBOX_CONFIG_TAR=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_CREATE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_GZIP=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_BZIP2=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_LZMA is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_COMPRESS is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_AUTODETECT is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_FROM=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_LONG_OPTIONS=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_UNAME_GNAME=y
++# CONFIG_BUSYBOX_CONFIG_UNCOMPRESS is not set
++# CONFIG_BUSYBOX_CONFIG_UNLZMA is not set
++CONFIG_BUSYBOX_CONFIG_UNZIP=y
++
++#
++# Common options for cpio and tar
++#
++
++#
++# Coreutils
++#
++CONFIG_BUSYBOX_CONFIG_BASENAME=y
++# CONFIG_BUSYBOX_CONFIG_CAL is not set
++CONFIG_BUSYBOX_CONFIG_CAT=y
++# CONFIG_BUSYBOX_CONFIG_CATV is not set
++CONFIG_BUSYBOX_CONFIG_CHGRP=y
++CONFIG_BUSYBOX_CONFIG_CHMOD=y
++CONFIG_BUSYBOX_CONFIG_CHOWN=y
++CONFIG_BUSYBOX_CONFIG_CHROOT=y
++# CONFIG_BUSYBOX_CONFIG_CKSUM is not set
++# CONFIG_BUSYBOX_CONFIG_COMM is not set
++CONFIG_BUSYBOX_CONFIG_CP=y
++CONFIG_BUSYBOX_CONFIG_CUT=y
++CONFIG_BUSYBOX_CONFIG_DATE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_DATE_ISOFMT=y
++CONFIG_BUSYBOX_CONFIG_DD=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_DD_IBS_OBS is not set
++CONFIG_BUSYBOX_CONFIG_DF=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_DF_INODE is not set
++CONFIG_BUSYBOX_CONFIG_DIRNAME=y
++CONFIG_BUSYBOX_CONFIG_DOS2UNIX=y
++# CONFIG_BUSYBOX_CONFIG_UNIX2DOS is not set
++CONFIG_BUSYBOX_CONFIG_DU=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
++CONFIG_BUSYBOX_CONFIG_ECHO=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_ECHO=y
++CONFIG_BUSYBOX_CONFIG_ENV=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
++# CONFIG_BUSYBOX_CONFIG_EXPAND is not set
++CONFIG_BUSYBOX_CONFIG_EXPR=y
++# CONFIG_BUSYBOX_CONFIG_EXPR_MATH_SUPPORT_64 is not set
++CONFIG_BUSYBOX_CONFIG_FALSE=y
++# CONFIG_BUSYBOX_CONFIG_FOLD is not set
++CONFIG_BUSYBOX_CONFIG_HEAD=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_HEAD=y
++CONFIG_BUSYBOX_CONFIG_HOSTID=y
++CONFIG_BUSYBOX_CONFIG_ID=y
++# CONFIG_BUSYBOX_CONFIG_INSTALL is not set
++CONFIG_BUSYBOX_CONFIG_LENGTH=y
++CONFIG_BUSYBOX_CONFIG_LN=y
++# CONFIG_BUSYBOX_CONFIG_LOGNAME is not set
++CONFIG_BUSYBOX_CONFIG_LS=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_LS_FILETYPES=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_LS_FOLLOWLINKS=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_LS_RECURSIVE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_LS_SORTFILES=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_LS_TIMESTAMPS=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_LS_USERNAME=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_LS_COLOR=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
++# CONFIG_BUSYBOX_CONFIG_MD5SUM is not set
++CONFIG_BUSYBOX_CONFIG_MKDIR=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
++CONFIG_BUSYBOX_CONFIG_MKFIFO=y
++CONFIG_BUSYBOX_CONFIG_MKNOD=y
++CONFIG_BUSYBOX_CONFIG_MV=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_MV_LONG_OPTIONS=y
++CONFIG_BUSYBOX_CONFIG_NICE=y
++CONFIG_BUSYBOX_CONFIG_NOHUP=y
++# CONFIG_BUSYBOX_CONFIG_OD is not set
++# CONFIG_BUSYBOX_CONFIG_PRINTENV is not set
++CONFIG_BUSYBOX_CONFIG_PRINTF=y
++CONFIG_BUSYBOX_CONFIG_PWD=y
++CONFIG_BUSYBOX_CONFIG_READLINK=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_READLINK_FOLLOW is not set
++CONFIG_BUSYBOX_CONFIG_REALPATH=y
++CONFIG_BUSYBOX_CONFIG_RM=y
++CONFIG_BUSYBOX_CONFIG_RMDIR=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
++CONFIG_BUSYBOX_CONFIG_SEQ=y
++CONFIG_BUSYBOX_CONFIG_SHA1SUM=y
++CONFIG_BUSYBOX_CONFIG_SLEEP=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP=y
++CONFIG_BUSYBOX_CONFIG_SORT=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_SORT_BIG is not set
++CONFIG_BUSYBOX_CONFIG_SPLIT=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_SPLIT_FANCY is not set
++# CONFIG_BUSYBOX_CONFIG_STAT is not set
++# CONFIG_BUSYBOX_CONFIG_STTY is not set
++# CONFIG_BUSYBOX_CONFIG_SUM is not set
++CONFIG_BUSYBOX_CONFIG_SYNC=y
++# CONFIG_BUSYBOX_CONFIG_TAC is not set
++CONFIG_BUSYBOX_CONFIG_TAIL=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_TAIL=y
++CONFIG_BUSYBOX_CONFIG_TEE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
++CONFIG_BUSYBOX_CONFIG_TEST=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_TEST_64=y
++CONFIG_BUSYBOX_CONFIG_TOUCH=y
++CONFIG_BUSYBOX_CONFIG_TR=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_TR_CLASSES=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_TR_EQUIV=y
++CONFIG_BUSYBOX_CONFIG_TRUE=y
++# CONFIG_BUSYBOX_CONFIG_TTY is not set
++CONFIG_BUSYBOX_CONFIG_UNAME=y
++# CONFIG_BUSYBOX_CONFIG_UNEXPAND is not set
++CONFIG_BUSYBOX_CONFIG_UNIQ=y
++CONFIG_BUSYBOX_CONFIG_USLEEP=y
++CONFIG_BUSYBOX_CONFIG_UUDECODE=y
++CONFIG_BUSYBOX_CONFIG_UUENCODE=y
++CONFIG_BUSYBOX_CONFIG_WC=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_WC_LARGE is not set
++# CONFIG_BUSYBOX_CONFIG_WHO is not set
++# CONFIG_BUSYBOX_CONFIG_WHOAMI is not set
++CONFIG_BUSYBOX_CONFIG_YES=y
++
++#
++# Common options for cp and mv
++#
++CONFIG_BUSYBOX_CONFIG_FEATURE_PRESERVE_HARDLINKS=y
++
++#
++# Common options for ls, more and telnet
++#
++CONFIG_BUSYBOX_CONFIG_FEATURE_AUTOWIDTH=y
++
++#
++# Common options for df, du, ls
++#
++CONFIG_BUSYBOX_CONFIG_FEATURE_HUMAN_READABLE=y
++
++#
++# Common options for md5sum, sha1sum
++#
++CONFIG_BUSYBOX_CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
++
++#
++# Console Utilities
++#
++CONFIG_BUSYBOX_CONFIG_CHVT=y
++CONFIG_BUSYBOX_CONFIG_CLEAR=y
++# CONFIG_BUSYBOX_CONFIG_DEALLOCVT is not set
++# CONFIG_BUSYBOX_CONFIG_DUMPKMAP is not set
++# CONFIG_BUSYBOX_CONFIG_KBD_MODE is not set
++# CONFIG_BUSYBOX_CONFIG_LOADFONT is not set
++# CONFIG_BUSYBOX_CONFIG_LOADKMAP is not set
++# CONFIG_BUSYBOX_CONFIG_OPENVT is not set
++CONFIG_BUSYBOX_CONFIG_RESET=y
++# CONFIG_BUSYBOX_CONFIG_RESIZE is not set
++# CONFIG_BUSYBOX_CONFIG_SETCONSOLE is not set
++# CONFIG_BUSYBOX_CONFIG_SETKEYCODES is not set
++# CONFIG_BUSYBOX_CONFIG_SETLOGCONS is not set
++
++#
++# Debian Utilities
++#
++CONFIG_BUSYBOX_CONFIG_MKTEMP=y
++# CONFIG_BUSYBOX_CONFIG_PIPE_PROGRESS is not set
++# CONFIG_BUSYBOX_CONFIG_RUN_PARTS is not set
++# CONFIG_BUSYBOX_CONFIG_START_STOP_DAEMON is not set
++CONFIG_BUSYBOX_CONFIG_WHICH=y
++
++#
++# Editors
++#
++CONFIG_BUSYBOX_CONFIG_AWK=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_AWK_MATH=y
++# CONFIG_BUSYBOX_CONFIG_CMP is not set
++# CONFIG_BUSYBOX_CONFIG_DIFF is not set
++# CONFIG_BUSYBOX_CONFIG_ED is not set
++# CONFIG_BUSYBOX_CONFIG_PATCH is not set
++CONFIG_BUSYBOX_CONFIG_SED=y
++CONFIG_BUSYBOX_CONFIG_VI=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_MAX_LEN=1024
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VI_8BIT is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_COLON=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_YANKMARK=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_SEARCH=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_USE_SIGNALS=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_DOT_CMD=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_READONLY=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_SETOPTS=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_SET=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_WIN_RESIZE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_ALLOW_EXEC=y
++
++#
++# Finding Utilities
++#
++CONFIG_BUSYBOX_CONFIG_FIND=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PRINT0=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_MTIME=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_MMIN=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PERM=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_TYPE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_XDEV=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_MAXDEPTH=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_NEWER=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_INUM is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_EXEC=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_USER=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_GROUP=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_NOT=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_DEPTH=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PAREN=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_SIZE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PRUNE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_DELETE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PATH=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_REGEX=y
++CONFIG_BUSYBOX_CONFIG_GREP=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_GREP_EGREP_ALIAS=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_GREP_FGREP_ALIAS=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_GREP_CONTEXT=y
++CONFIG_BUSYBOX_CONFIG_XARGS=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
++
++#
++# Init Utilities
++#
++CONFIG_BUSYBOX_CONFIG_INIT=y
++# CONFIG_BUSYBOX_CONFIG_DEBUG_INIT is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_USE_INITTAB=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_KILL_REMOVED is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_KILL_DELAY=0
++# CONFIG_BUSYBOX_CONFIG_FEATURE_INIT_SCTTY is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_INIT_SYSLOG=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_EXTRA_QUIET=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_INIT_COREDUMPS is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_INITRD is not set
++CONFIG_BUSYBOX_CONFIG_HALT=y
++CONFIG_BUSYBOX_CONFIG_MESG=y
++
++#
++# Login/Password Management Utilities
++#
++# CONFIG_BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS is not set
++# CONFIG_BUSYBOX_CONFIG_USE_BB_PWD_GRP is not set
++# CONFIG_BUSYBOX_CONFIG_USE_BB_CRYPT is not set
++# CONFIG_BUSYBOX_CONFIG_ADDGROUP is not set
++# CONFIG_BUSYBOX_CONFIG_DELGROUP is not set
++# CONFIG_BUSYBOX_CONFIG_ADDUSER is not set
++# CONFIG_BUSYBOX_CONFIG_DELUSER is not set
++# CONFIG_BUSYBOX_CONFIG_GETTY is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_UTMP is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_WTMP is not set
++# CONFIG_BUSYBOX_CONFIG_LOGIN is not set
++# CONFIG_BUSYBOX_CONFIG_PASSWD is not set
++# CONFIG_BUSYBOX_CONFIG_CRYPTPW is not set
++# CONFIG_BUSYBOX_CONFIG_CHPASSWD is not set
++CONFIG_BUSYBOX_CONFIG_SU=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_SU_SYSLOG is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_SU_CHECKS_SHELLS=y
++# CONFIG_BUSYBOX_CONFIG_SULOGIN is not set
++# CONFIG_BUSYBOX_CONFIG_VLOCK is not set
++
++#
++# Linux Ext2 FS Progs
++#
++# CONFIG_BUSYBOX_CONFIG_CHATTR is not set
++CONFIG_BUSYBOX_CONFIG_FSCK=y
++# CONFIG_BUSYBOX_CONFIG_LSATTR is not set
++
++#
++# Linux Module Utilities
++#
++# CONFIG_BUSYBOX_CONFIG_DEPMOD is not set
++# CONFIG_BUSYBOX_CONFIG_INSMOD is not set
++# CONFIG_BUSYBOX_CONFIG_RMMOD is not set
++# CONFIG_BUSYBOX_CONFIG_LSMOD is not set
++# CONFIG_BUSYBOX_CONFIG_MODPROBE is not set
++
++#
++# Linux System Utilities
++#
++CONFIG_BUSYBOX_CONFIG_DMESG=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_DMESG_PRETTY=y
++CONFIG_BUSYBOX_CONFIG_FBSET=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_FBSET_FANCY is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_FBSET_READMODE=y
++# CONFIG_BUSYBOX_CONFIG_FDFLUSH is not set
++# CONFIG_BUSYBOX_CONFIG_FDFORMAT is not set
++# CONFIG_BUSYBOX_CONFIG_FDISK is not set
++CONFIG_BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
++# CONFIG_BUSYBOX_CONFIG_FINDFS is not set
++# CONFIG_BUSYBOX_CONFIG_FREERAMDISK is not set
++# CONFIG_BUSYBOX_CONFIG_FSCK_MINIX is not set
++# CONFIG_BUSYBOX_CONFIG_MKFS_MINIX is not set
++CONFIG_BUSYBOX_CONFIG_GETOPT=y
++CONFIG_BUSYBOX_CONFIG_HEXDUMP=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_HEXDUMP_REVERSE is not set
++# CONFIG_BUSYBOX_CONFIG_HD is not set
++CONFIG_BUSYBOX_CONFIG_HWCLOCK=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
++# CONFIG_BUSYBOX_CONFIG_IPCRM is not set
++# CONFIG_BUSYBOX_CONFIG_IPCS is not set
++CONFIG_BUSYBOX_CONFIG_LOSETUP=y
++# CONFIG_BUSYBOX_CONFIG_MDEV is not set
++# CONFIG_BUSYBOX_CONFIG_MKSWAP is not set
++CONFIG_BUSYBOX_CONFIG_MORE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_USE_TERMIOS=y
++CONFIG_BUSYBOX_CONFIG_VOLUMEID=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_EXT=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_REISERFS is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_FAT=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_HFS is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_JFS is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_XFS=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_NTFS is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_ISO9660=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UDF is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_LUKS is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_ROMFS is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SYSV is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
++CONFIG_BUSYBOX_CONFIG_MOUNT=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_FAKE is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_VERBOSE is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_HELPERS=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_LABEL=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_NFS is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_CIFS is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_FLAGS=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_FSTAB=y
++CONFIG_BUSYBOX_CONFIG_PIVOT_ROOT=y
++CONFIG_BUSYBOX_CONFIG_RDATE=y
++# CONFIG_BUSYBOX_CONFIG_READPROFILE is not set
++# CONFIG_BUSYBOX_CONFIG_RTCWAKE is not set
++# CONFIG_BUSYBOX_CONFIG_SCRIPT is not set
++# CONFIG_BUSYBOX_CONFIG_SETARCH is not set
++# CONFIG_BUSYBOX_CONFIG_SWAPONOFF is not set
++CONFIG_BUSYBOX_CONFIG_SWITCH_ROOT=y
++CONFIG_BUSYBOX_CONFIG_UMOUNT=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_UMOUNT_ALL=y
++
++#
++# Common options for mount/umount
++#
++CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_MTAB_SUPPORT is not set
++
++#
++# Miscellaneous Utilities
++#
++# CONFIG_BUSYBOX_CONFIG_ADJTIMEX is not set
++# CONFIG_BUSYBOX_CONFIG_BBCONFIG is not set
++# CONFIG_BUSYBOX_CONFIG_CHAT is not set
++# CONFIG_BUSYBOX_CONFIG_CHRT is not set
++CONFIG_BUSYBOX_CONFIG_CROND=y
++# CONFIG_BUSYBOX_CONFIG_DEBUG_CROND_OPTION is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
++CONFIG_BUSYBOX_CONFIG_CRONTAB=y
++# CONFIG_BUSYBOX_CONFIG_DC is not set
++# CONFIG_BUSYBOX_CONFIG_DEVFSD is not set
++# CONFIG_BUSYBOX_CONFIG_EJECT is not set
++# CONFIG_BUSYBOX_CONFIG_FBSPLASH is not set
++# CONFIG_BUSYBOX_CONFIG_INOTIFYD is not set
++# CONFIG_BUSYBOX_CONFIG_LAST is not set
++CONFIG_BUSYBOX_CONFIG_LESS=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_MAXLINES=9999999
++# CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_BRACKETS is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_FLAGS is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_FLAGCS is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_MARKS is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_LESS_REGEXP is not set
++# CONFIG_BUSYBOX_CONFIG_HDPARM is not set
++CONFIG_BUSYBOX_CONFIG_LOCK=y
++CONFIG_BUSYBOX_CONFIG_MAKEDEVS=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_MAKEDEVS_LEAF is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_MAKEDEVS_TABLE=y
++# CONFIG_BUSYBOX_CONFIG_MAN is not set
++# CONFIG_BUSYBOX_CONFIG_MICROCOM is not set
++# CONFIG_BUSYBOX_CONFIG_MOUNTPOINT is not set
++# CONFIG_BUSYBOX_CONFIG_MT is not set
++# CONFIG_BUSYBOX_CONFIG_RAIDAUTORUN is not set
++# CONFIG_BUSYBOX_CONFIG_READAHEAD is not set
++# CONFIG_BUSYBOX_CONFIG_RUNLEVEL is not set
++# CONFIG_BUSYBOX_CONFIG_RX is not set
++# CONFIG_BUSYBOX_CONFIG_SETSID is not set
++CONFIG_BUSYBOX_CONFIG_STRINGS=y
++# CONFIG_BUSYBOX_CONFIG_TASKSET is not set
++CONFIG_BUSYBOX_CONFIG_TIME=y
++# CONFIG_BUSYBOX_CONFIG_TTYSIZE is not set
++CONFIG_BUSYBOX_CONFIG_WATCHDOG=y
++
++#
++# Networking Utilities
++#
++CONFIG_BUSYBOX_CONFIG_FEATURE_IPV6=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
++CONFIG_BUSYBOX_CONFIG_VERBOSE_RESOLUTION_ERRORS=y
++CONFIG_BUSYBOX_CONFIG_ARP=y
++CONFIG_BUSYBOX_CONFIG_ARPING=y
++CONFIG_BUSYBOX_CONFIG_BRCTL=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_BRCTL_SHOW=y
++# CONFIG_BUSYBOX_CONFIG_DNSD is not set
++# CONFIG_BUSYBOX_CONFIG_ETHER_WAKE is not set
++# CONFIG_BUSYBOX_CONFIG_FAKEIDENTD is not set
++# CONFIG_BUSYBOX_CONFIG_FTPGET is not set
++# CONFIG_BUSYBOX_CONFIG_FTPPUT is not set
++CONFIG_BUSYBOX_CONFIG_HOSTNAME=y
++# CONFIG_BUSYBOX_CONFIG_HTTPD is not set
++CONFIG_BUSYBOX_CONFIG_IFCONFIG=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_IFCONFIG_STATUS=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_IFCONFIG_SLIP is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_IFCONFIG_HW=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
++# CONFIG_BUSYBOX_CONFIG_IFENSLAVE is not set
++# CONFIG_BUSYBOX_CONFIG_IFUPDOWN is not set
++# CONFIG_BUSYBOX_CONFIG_INETD is not set
++# CONFIG_BUSYBOX_CONFIG_IP is not set
++# CONFIG_BUSYBOX_CONFIG_IPCALC is not set
++# CONFIG_BUSYBOX_CONFIG_NAMEIF is not set
++# CONFIG_BUSYBOX_CONFIG_NC is not set
++# CONFIG_BUSYBOX_CONFIG_NETMSG is not set
++CONFIG_BUSYBOX_CONFIG_NETSTAT=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_NETSTAT_WIDE=y
++CONFIG_BUSYBOX_CONFIG_NSLOOKUP=y
++CONFIG_BUSYBOX_CONFIG_PING=y
++CONFIG_BUSYBOX_CONFIG_PING6=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_PING=y
++# CONFIG_BUSYBOX_CONFIG_PSCAN is not set
++CONFIG_BUSYBOX_CONFIG_ROUTE=y
++# CONFIG_BUSYBOX_CONFIG_SENDMAIL is not set
++# CONFIG_BUSYBOX_CONFIG_FETCHMAIL is not set
++# CONFIG_BUSYBOX_CONFIG_SLATTACH is not set
++# CONFIG_BUSYBOX_CONFIG_TELNET is not set
++# CONFIG_BUSYBOX_CONFIG_TELNETD is not set
++# CONFIG_BUSYBOX_CONFIG_TFTP is not set
++# CONFIG_BUSYBOX_CONFIG_TFTPD is not set
++# CONFIG_BUSYBOX_CONFIG_TRACEROUTE is not set
++# CONFIG_BUSYBOX_CONFIG_APP_UDHCPD is not set
++CONFIG_BUSYBOX_CONFIG_APP_UDHCPC=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCPC_ARPING is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_PORT is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_DEBUG is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_RFC3397=y
++CONFIG_BUSYBOX_CONFIG_DHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
++CONFIG_BUSYBOX_CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
++CONFIG_BUSYBOX_CONFIG_VCONFIG=y
++# CONFIG_BUSYBOX_CONFIG_WGET is not set
++# CONFIG_BUSYBOX_CONFIG_ZCIP is not set
++# CONFIG_BUSYBOX_CONFIG_TCPSVD is not set
++# CONFIG_BUSYBOX_CONFIG_UDPSVD is not set
++
++#
++# Process Utilities
++#
++CONFIG_BUSYBOX_CONFIG_FREE=y
++# CONFIG_BUSYBOX_CONFIG_FUSER is not set
++CONFIG_BUSYBOX_CONFIG_KILL=y
++CONFIG_BUSYBOX_CONFIG_KILLALL=y
++CONFIG_BUSYBOX_CONFIG_KILLALL5=y
++# CONFIG_BUSYBOX_CONFIG_NMETER is not set
++CONFIG_BUSYBOX_CONFIG_PGREP=y
++CONFIG_BUSYBOX_CONFIG_PIDOF=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_PIDOF_SINGLE is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_PIDOF_OMIT is not set
++CONFIG_BUSYBOX_CONFIG_PKILL=y
++CONFIG_BUSYBOX_CONFIG_PS=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_PS_WIDE is not set
++# CONFIG_BUSYBOX_CONFIG_RENICE is not set
++CONFIG_BUSYBOX_CONFIG_BB_SYSCTL=y
++CONFIG_BUSYBOX_CONFIG_TOP=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_DECIMALS=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_TOPMEM=y
++CONFIG_BUSYBOX_CONFIG_UPTIME=y
++CONFIG_BUSYBOX_CONFIG_WATCH=y
++
++#
++# Shells
++#
++CONFIG_BUSYBOX_CONFIG_FEATURE_SH_IS_ASH=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_SH_IS_HUSH is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_SH_IS_MSH is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_SH_IS_NONE is not set
++CONFIG_BUSYBOX_CONFIG_ASH=y
++
++#
++# Ash Shell Options
++#
++CONFIG_BUSYBOX_CONFIG_ASH_BASH_COMPAT=y
++CONFIG_BUSYBOX_CONFIG_ASH_JOB_CONTROL=y
++CONFIG_BUSYBOX_CONFIG_ASH_READ_NCHARS=y
++CONFIG_BUSYBOX_CONFIG_ASH_READ_TIMEOUT=y
++CONFIG_BUSYBOX_CONFIG_ASH_ALIAS=y
++CONFIG_BUSYBOX_CONFIG_ASH_MATH_SUPPORT=y
++CONFIG_BUSYBOX_CONFIG_ASH_MATH_SUPPORT_64=y
++CONFIG_BUSYBOX_CONFIG_ASH_GETOPTS=y
++CONFIG_BUSYBOX_CONFIG_ASH_BUILTIN_ECHO=y
++CONFIG_BUSYBOX_CONFIG_ASH_BUILTIN_PRINTF=y
++CONFIG_BUSYBOX_CONFIG_ASH_BUILTIN_TEST=y
++CONFIG_BUSYBOX_CONFIG_ASH_CMDCMD=y
++# CONFIG_BUSYBOX_CONFIG_ASH_MAIL is not set
++# CONFIG_BUSYBOX_CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
++CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
++CONFIG_BUSYBOX_CONFIG_ASH_EXPAND_PRMT=y
++# CONFIG_BUSYBOX_CONFIG_HUSH is not set
++# CONFIG_BUSYBOX_CONFIG_LASH is not set
++# CONFIG_BUSYBOX_CONFIG_MSH is not set
++
++#
++# Bourne Shell Options
++#
++# CONFIG_BUSYBOX_CONFIG_FEATURE_SH_EXTRA_QUIET is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_SH_STANDALONE is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_SH_NOFORK is not set
++# CONFIG_BUSYBOX_CONFIG_CTTYHACK is not set
++
++#
++# System Logging Utilities
++#
++CONFIG_BUSYBOX_CONFIG_SYSLOGD=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_ROTATE_LOGFILE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_REMOTE_LOG=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOGD_DUP is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
++CONFIG_BUSYBOX_CONFIG_LOGREAD=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
++CONFIG_BUSYBOX_CONFIG_KLOGD=y
++CONFIG_BUSYBOX_CONFIG_LOGGER=y
++
++#
++# Runit Utilities
++#
++# CONFIG_BUSYBOX_CONFIG_RUNSV is not set
++# CONFIG_BUSYBOX_CONFIG_RUNSVDIR is not set
++# CONFIG_BUSYBOX_CONFIG_SV is not set
++# CONFIG_BUSYBOX_CONFIG_SVLOGD is not set
++# CONFIG_BUSYBOX_CONFIG_CHPST is not set
++# CONFIG_BUSYBOX_CONFIG_SETUIDGID is not set
++# CONFIG_BUSYBOX_CONFIG_ENVUIDGID is not set
++# CONFIG_BUSYBOX_CONFIG_ENVDIR is not set
++# CONFIG_BUSYBOX_CONFIG_SOFTLIMIT is not set
++
++#
++# Print Utilities
++#
++# CONFIG_BUSYBOX_CONFIG_LPD is not set
++# CONFIG_BUSYBOX_CONFIG_LPR is not set
++# CONFIG_BUSYBOX_CONFIG_LPQ is not set
++# CONFIG_PACKAGE_dnsmasq is not set
++# CONFIG_PACKAGE_dropbear is not set
++# CONFIG_PACKAGE_ead is not set
++CONFIG_PACKAGE_firewall=y
++# CONFIG_PACKAGE_hotplug2 is not set
++CONFIG_PACKAGE_iptables=y
++CONFIG_PACKAGE_iptables-mod-conntrack=y
++CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
++CONFIG_PACKAGE_iptables-mod-extra=y
++CONFIG_PACKAGE_iptables-mod-filter=y
++# CONFIG_PACKAGE_iptables-mod-imq is not set
++CONFIG_PACKAGE_iptables-mod-ipopt=y
++CONFIG_PACKAGE_iptables-mod-iprange=y
++# CONFIG_PACKAGE_iptables-mod-ipsec is not set
++# CONFIG_PACKAGE_iptables-mod-ipset is not set
++CONFIG_PACKAGE_iptables-mod-nat=y
++CONFIG_PACKAGE_iptables-mod-nat-extra=y
++# CONFIG_PACKAGE_iptables-mod-ulog is not set
++CONFIG_PACKAGE_iptables-utils=y
++CONFIG_PACKAGE_libc=y
++CONFIG_PACKAGE_libgcc=y
++CONFIG_PACKAGE_libpthread=y
++CONFIG_PACKAGE_librt=y
++# CONFIG_PACKAGE_libssp is not set
++# CONFIG_PACKAGE_mtd is not set
++# CONFIG_PACKAGE_opkg is not set
++# CONFIG_PACKAGE_qos-scripts is not set
++# CONFIG_PACKAGE_swconfig is not set
++# CONFIG_PACKAGE_uci is not set
++# CONFIG_PACKAGE_udevtrigger is not set
++# CONFIG_PACKAGE_wireless-tools is not set
++
++#
++# Libraries
++#
++
++#
++# disc
++#
++# CONFIG_PACKAGE_libfuse is not set
++CONFIG_PACKAGE_libblkid=y
++CONFIG_PACKAGE_libevent=y
++# CONFIG_PACKAGE_libext2fs is not set
++CONFIG_PACKAGE_libiptc=y
++# CONFIG_PACKAGE_libiw is not set
++# CONFIG_PACKAGE_libltdl is not set
++# CONFIG_PACKAGE_liblua is not set
++# CONFIG_PACKAGE_libncurses is not set
++# CONFIG_PACKAGE_libnl is not set
++CONFIG_PACKAGE_libnl-tiny=y
++CONFIG_PACKAGE_libopenssl=y
++CONFIG_PACKAGE_libpcap=y
++# CONFIG_PACKAGE_libreadline is not set
++# CONFIG_PACKAGE_libuci is not set
++# CONFIG_PACKAGE_libuci-lua is not set
++CONFIG_PACKAGE_libupnp=y
++CONFIG_PACKAGE_libuuid=y
++CONFIG_PACKAGE_libxtables=y
++# CONFIG_PACKAGE_linux-atm is not set
++CONFIG_PACKAGE_zlib=y
++
++#
++# Network
++#
++# CONFIG_PACKAGE_arptables is not set
++# CONFIG_PACKAGE_crda is not set
++# CONFIG_PACKAGE_ebtables is not set
++# CONFIG_PACKAGE_ebtables-utils is not set
++# CONFIG_PACKAGE_genl is not set
++# CONFIG_PACKAGE_hostapd is not set
++# CONFIG_PACKAGE_hostapd-mini is not set
++# CONFIG_PACKAGE_ifenslave is not set
++CONFIG_PACKAGE_ip=y
++# CONFIG_PACKAGE_ipset is not set
++# CONFIG_PACKAGE_iw is not set
++# CONFIG_PACKAGE_ppp is not set
++# CONFIG_PACKAGE_pptp is not set
++CONFIG_PACKAGE_tc=y
++CONFIG_PACKAGE_tor=y
++# CONFIG_PACKAGE_wpa-supplicant is not set
++# CONFIG_PACKAGE_wprobe-export is not set
++# CONFIG_PACKAGE_wprobe-info is not set
++
++#
++# IPv6
++#
++CONFIG_PACKAGE_ip6tables=y
++CONFIG_PACKAGE_ip6tables-utils=y
++
++#
++# Kernel modules
++#
++
++#
++# Block Devices
++#
++# CONFIG_PACKAGE_kmod-aoe is not set
++# CONFIG_PACKAGE_kmod-ata-core is not set
++# CONFIG_PACKAGE_kmod-ide-aec62xx is not set
++# CONFIG_PACKAGE_kmod-ide-core is not set
++# CONFIG_PACKAGE_kmod-ide-it821x is not set
++# CONFIG_PACKAGE_kmod-loop is not set
++# CONFIG_PACKAGE_kmod-nbd is not set
++# CONFIG_PACKAGE_kmod-scsi-core is not set
++# CONFIG_PACKAGE_kmod-scsi-generic is not set
++
++#
++# Cryptographic API modules
++#
++# CONFIG_PACKAGE_kmod-crypto-aes is not set
++# CONFIG_PACKAGE_kmod-crypto-arc4 is not set
++# CONFIG_PACKAGE_kmod-crypto-authenc is not set
++# CONFIG_PACKAGE_kmod-crypto-core is not set
++# CONFIG_PACKAGE_kmod-crypto-des is not set
++# CONFIG_PACKAGE_kmod-crypto-hmac is not set
++# CONFIG_PACKAGE_kmod-crypto-hw-geode is not set
++# CONFIG_PACKAGE_kmod-crypto-hw-hifn-795x is not set
++# CONFIG_PACKAGE_kmod-crypto-hw-padlock is not set
++# CONFIG_PACKAGE_kmod-crypto-md5 is not set
++# CONFIG_PACKAGE_kmod-crypto-michael-mic is not set
++# CONFIG_PACKAGE_kmod-crypto-misc is not set
++# CONFIG_PACKAGE_kmod-crypto-null is not set
++# CONFIG_PACKAGE_kmod-crypto-ocf is not set
++# CONFIG_PACKAGE_kmod-crypto-sha1 is not set
++# CONFIG_PACKAGE_kmod-crypto-test is not set
++
++#
++# Filesystems
++#
++# CONFIG_PACKAGE_kmod-fs-cifs is not set
++# CONFIG_PACKAGE_kmod-fs-exportfs is not set
++# CONFIG_PACKAGE_kmod-fs-ext2 is not set
++# CONFIG_PACKAGE_kmod-fs-ext3 is not set
++# CONFIG_PACKAGE_kmod-fs-ext4 is not set
++# CONFIG_PACKAGE_kmod-fs-hfs is not set
++# CONFIG_PACKAGE_kmod-fs-hfsplus is not set
++# CONFIG_PACKAGE_kmod-fs-isofs is not set
++# CONFIG_PACKAGE_kmod-fs-mbcache is not set
++# CONFIG_PACKAGE_kmod-fs-minix is not set
++# CONFIG_PACKAGE_kmod-fs-msdos is not set
++# CONFIG_PACKAGE_kmod-fs-nfs is not set
++# CONFIG_PACKAGE_kmod-fs-nfs-common is not set
++# CONFIG_PACKAGE_kmod-fs-nfsd is not set
++# CONFIG_PACKAGE_kmod-fs-ntfs is not set
++# CONFIG_PACKAGE_kmod-fs-reiserfs is not set
++# CONFIG_PACKAGE_kmod-fs-udf is not set
++# CONFIG_PACKAGE_kmod-fs-vfat is not set
++# CONFIG_PACKAGE_kmod-fs-xfs is not set
++# CONFIG_PACKAGE_kmod-fuse is not set
++# CONFIG_PACKAGE_kmod-nls-base is not set
++# CONFIG_PACKAGE_kmod-nls-cp1250 is not set
++# CONFIG_PACKAGE_kmod-nls-cp1251 is not set
++# CONFIG_PACKAGE_kmod-nls-cp437 is not set
++# CONFIG_PACKAGE_kmod-nls-cp850 is not set
++# CONFIG_PACKAGE_kmod-nls-cp852 is not set
++# CONFIG_PACKAGE_kmod-nls-iso8859-1 is not set
++# CONFIG_PACKAGE_kmod-nls-iso8859-15 is not set
++# CONFIG_PACKAGE_kmod-nls-iso8859-2 is not set
++# CONFIG_PACKAGE_kmod-nls-koi8r is not set
++# CONFIG_PACKAGE_kmod-nls-utf8 is not set
++
++#
++# FireWire support
++#
++# CONFIG_PACKAGE_kmod-ieee1394 is not set
++
++#
++# Hardware Monitoring Support
++#
++# CONFIG_PACKAGE_kmod-hwmon-core is not set
++
++#
++# I2C support
++#
++# CONFIG_PACKAGE_kmod-i2c-core is not set
++
++#
++# Netfilter Extensions
++#
++# CONFIG_PACKAGE_kmod-arptables is not set
++# CONFIG_PACKAGE_kmod-ebtables is not set
++CONFIG_PACKAGE_kmod-ip6tables=y
++CONFIG_PACKAGE_kmod-ipt-core=y
++CONFIG_PACKAGE_kmod-ipt-conntrack=y
++CONFIG_PACKAGE_kmod-ipt-conntrack-extra=y
++CONFIG_PACKAGE_kmod-ipt-extra=y
++CONFIG_PACKAGE_kmod-ipt-filter=y
++# CONFIG_PACKAGE_kmod-ipt-imq is not set
++CONFIG_PACKAGE_kmod-ipt-ipopt=y
++CONFIG_PACKAGE_kmod-ipt-iprange=y
++# CONFIG_PACKAGE_kmod-ipt-ipsec is not set
++# CONFIG_PACKAGE_kmod-ipt-ipset is not set
++CONFIG_PACKAGE_kmod-ipt-nat=y
++CONFIG_PACKAGE_kmod-ipt-nat-extra=y
++CONFIG_PACKAGE_kmod-ipt-nathelper=y
++# CONFIG_PACKAGE_kmod-ipt-nathelper-extra is not set
++# CONFIG_PACKAGE_kmod-ipt-queue is not set
++# CONFIG_PACKAGE_kmod-ipt-ulog is not set
++# CONFIG_PACKAGE_kmod-nf-conntrack-netlink is not set
++# CONFIG_PACKAGE_kmod-nfnetlink is not set
++# CONFIG_PACKAGE_kmod-nfnetlink-log is not set
++# CONFIG_PACKAGE_kmod-nfnetlink-queue is not set
++
++#
++# Network Devices
++#
++# CONFIG_PACKAGE_kmod-3c59x is not set
++# CONFIG_PACKAGE_kmod-8139too is not set
++# CONFIG_PACKAGE_kmod-b44 is not set
++# CONFIG_PACKAGE_kmod-e100 is not set
++# CONFIG_PACKAGE_kmod-e1000 is not set
++# CONFIG_PACKAGE_kmod-hfcmulti is not set
++CONFIG_PACKAGE_kmod-libphy=y
++# CONFIG_PACKAGE_kmod-natsemi is not set
++# CONFIG_PACKAGE_kmod-ne2k-pci is not set
++# CONFIG_PACKAGE_kmod-pcnet32 is not set
++# CONFIG_PACKAGE_kmod-r8169 is not set
++# CONFIG_PACKAGE_kmod-siit is not set
++# CONFIG_PACKAGE_kmod-sis900 is not set
++# CONFIG_PACKAGE_kmod-sky2 is not set
++# CONFIG_PACKAGE_kmod-tg3 is not set
++# CONFIG_PACKAGE_kmod-via-rhine is not set
++
++#
++# Network Support
++#
++# CONFIG_PACKAGE_kmod-atm is not set
++# CONFIG_PACKAGE_kmod-bonding is not set
++# CONFIG_PACKAGE_kmod-capi is not set
++# CONFIG_PACKAGE_kmod-gre is not set
++# CONFIG_PACKAGE_kmod-ip6-tunnel is not set
++# CONFIG_PACKAGE_kmod-ipip is not set
++# CONFIG_PACKAGE_kmod-ipsec is not set
++# CONFIG_PACKAGE_kmod-iptunnel4 is not set
++# CONFIG_PACKAGE_kmod-iptunnel6 is not set
++CONFIG_PACKAGE_kmod-ipv6=y
++# CONFIG_PACKAGE_kmod-isdn4linux is not set
++# CONFIG_PACKAGE_kmod-misdn is not set
++# CONFIG_PACKAGE_kmod-mp-alg is not set
++# CONFIG_PACKAGE_kmod-ppp is not set
++# CONFIG_PACKAGE_kmod-pktgen is not set
++# CONFIG_PACKAGE_kmod-sched is not set
++# CONFIG_PACKAGE_kmod-sit is not set
++# CONFIG_PACKAGE_kmod-tun is not set
++# CONFIG_PACKAGE_kmod-wprobe is not set
++
++#
++# OCF Configuration
++#
++
++#
++# Other modules
++#
++# CONFIG_PACKAGE_kmod-button-hotplug is not set
++# CONFIG_PACKAGE_kmod-crc-ccitt is not set
++# CONFIG_PACKAGE_kmod-crc-itu-t is not set
++# CONFIG_PACKAGE_kmod-crc16 is not set
++# CONFIG_PACKAGE_kmod-crc7 is not set
++# CONFIG_PACKAGE_kmod-cs5535-gpio is not set
++# CONFIG_PACKAGE_kmod-eeprom-93cx6 is not set
++# CONFIG_PACKAGE_kmod-hid is not set
++# CONFIG_PACKAGE_kmod-input-core is not set
++# CONFIG_PACKAGE_kmod-input-evdev is not set
++# CONFIG_PACKAGE_kmod-input-joydev is not set
++# CONFIG_PACKAGE_kmod-input-polldev is not set
++# CONFIG_PACKAGE_kmod-leds-alix is not set
++# CONFIG_PACKAGE_kmod-leds-net48xx is not set
++# CONFIG_PACKAGE_kmod-leds-wrap is not set
++# CONFIG_PACKAGE_kmod-ledtrig-morse is not set
++# CONFIG_PACKAGE_kmod-ledtrig-netdev is not set
++# CONFIG_PACKAGE_kmod-mmc is not set
++# CONFIG_PACKAGE_kmod-mmc-spi is not set
++# CONFIG_PACKAGE_kmod-nsc-gpio is not set
++# CONFIG_PACKAGE_kmod-pcmcia-core is not set
++# CONFIG_PACKAGE_kmod-pcspkr is not set
++# CONFIG_PACKAGE_kmod-rfkill is not set
++# CONFIG_PACKAGE_kmod-sc520-wdt is not set
++# CONFIG_PACKAGE_kmod-scx200-gpio is not set
++# CONFIG_PACKAGE_kmod-scx200-wdt is not set
++# CONFIG_PACKAGE_kmod-softdog is not set
++# CONFIG_PACKAGE_kmod-spi-bitbang is not set
++# CONFIG_PACKAGE_kmod-spi-dev is not set
++# CONFIG_PACKAGE_kmod-spi-ks8995 is not set
++# CONFIG_PACKAGE_kmod-ssb is not set
++CONFIG_PACKAGE_kmod-textsearch=y
++
++#
++# Sound Support
++#
++# CONFIG_PACKAGE_kmod-sound-core is not set
++
++#
++# USB Support
++#
++
++#
++# Video Support
++#
++# CONFIG_PACKAGE_kmod-video-core is not set
++
++#
++# W1 support
++#
++# CONFIG_PACKAGE_kmod-w1 is not set
++
++#
++# Wireless Drivers
++#
++# CONFIG_PACKAGE_kmod-ath is not set
++# CONFIG_PACKAGE_kmod-ath5k is not set
++# CONFIG_PACKAGE_kmod-ath9k is not set
++# CONFIG_PACKAGE_kmod-b43 is not set
++# CONFIG_PACKAGE_kmod-b43legacy is not set
++# CONFIG_PACKAGE_kmod-hostap is not set
++# CONFIG_PACKAGE_kmod-ieee80211 is not set
++# CONFIG_PACKAGE_kmod-libertas is not set
++# CONFIG_PACKAGE_kmod-mac80211 is not set
++# CONFIG_PACKAGE_kmod-mac80211-hwsim is not set
++# CONFIG_PACKAGE_kmod-madwifi is not set
++# CONFIG_PACKAGE_kmod-net-airo is not set
++# CONFIG_PACKAGE_kmod-net-hermes is not set
++# CONFIG_PACKAGE_kmod-net-ipw2100 is not set
++# CONFIG_PACKAGE_kmod-net-ipw2200 is not set
++# CONFIG_PACKAGE_kmod-net-prism54 is not set
++# CONFIG_PACKAGE_kmod-p54-common is not set
++# CONFIG_PACKAGE_kmod-p54-pci is not set
++# CONFIG_PACKAGE_kmod-rt2400-pci is not set
++# CONFIG_PACKAGE_kmod-rt2500-pci is not set
++# CONFIG_PACKAGE_kmod-rt2800-pci is not set
++# CONFIG_PACKAGE_kmod-rt2x00-lib is not set
++# CONFIG_PACKAGE_kmod-rt2x00-pci is not set
++# CONFIG_PACKAGE_kmod-rt61-pci is not set
++
++#
++# Boot Loaders
++#
++# CONFIG_PACKAGE_grub is not set
++
++#
++# Utilities
++#
++
++#
++# disc
++#
++# CONFIG_PACKAGE_cfdisk is not set
++# CONFIG_PACKAGE_fdisk is not set
++# CONFIG_PACKAGE_fuse-utils is not set
++# CONFIG_PACKAGE_swap-utils is not set
++# CONFIG_PACKAGE_blkid is not set
++# CONFIG_PACKAGE_dropbearconvert is not set
++# CONFIG_PACKAGE_e2fsprogs is not set
++# CONFIG_PACKAGE_fconfig is not set
++# CONFIG_PACKAGE_flock is not set
++# CONFIG_PACKAGE_gdb is not set
++# CONFIG_PACKAGE_gdbserver is not set
++# CONFIG_PACKAGE_hwclock is not set
++# CONFIG_PACKAGE_kexec-tools is not set
++CONFIG_KEXEC_TOOLS_TARGET_NAME="i386"
++# CONFIG_PACKAGE_ldconfig is not set
++# CONFIG_PACKAGE_ldd is not set
++# CONFIG_PACKAGE_losetup is not set
++# CONFIG_PACKAGE_mount-utils is not set
++# CONFIG_PACKAGE_ocf-crypto-headers is not set
++# CONFIG_PACKAGE_openssl-util is not set
++# CONFIG_PACKAGE_robocfg is not set
++# CONFIG_PACKAGE_spidev-test is not set
++# CONFIG_PACKAGE_udev is not set
++# CONFIG_PACKAGE_udevextras is not set
++# CONFIG_UDEVEXTRAS_ata_id is not set
++# CONFIG_UDEVEXTRAS_cdrom_id is not set
++# CONFIG_UDEVEXTRAS_dasd_id is not set
++# CONFIG_UDEVEXTRAS_edd_id is not set
++# CONFIG_UDEVEXTRAS_path_id is not set
++# CONFIG_UDEVEXTRAS_scsi_id is not set
++# CONFIG_UDEVEXTRAS_usb_id is not set
++# CONFIG_UDEVEXTRAS_volume_id is not set
++# CONFIG_PACKAGE_uuidgen is not set
++
++#
++# Languages
++#
++
++#
++# Lua
++#
++# CONFIG_PACKAGE_lua is not set
++# CONFIG_PACKAGE_luac is not set
+diff -Naur a/include/kernel-build.mk b/include/kernel-build.mk
+--- a/include/kernel-build.mk 2009-04-21 13:08:56.868141000 +0000
++++ b/include/kernel-build.mk 2009-05-27 06:43:26.258621967 +0000
+@@ -58,8 +58,9 @@
+ $(Kernel/Configure)
+ touch $$@
+
++# XXX: need a configurable way to signal module / static kernel builds
++# for now just remove $(Kernel/CompileModules)
+ $(LINUX_DIR)/.modules: $(STAMP_CONFIGURED) $(LINUX_DIR)/.config FORCE
+- $(Kernel/CompileModules)
+ touch $$@
+
+ $(LINUX_DIR)/.image: $(STAMP_CONFIGURED) FORCE
+diff -Naur a/include/kernel-defaults.mk b/include/kernel-defaults.mk
+--- a/include/kernel-defaults.mk 2009-04-29 20:53:38.764833000 +0000
++++ b/include/kernel-defaults.mk 2009-05-28 03:32:29.101809145 +0000
+@@ -99,12 +99,10 @@
+ $(SCRIPT_DIR)/kconfig.pl 'm+' $(LINUX_DIR)/.config.target $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config
+ $(call Kernel/SetInitramfs)
+ $(call Kernel/Configure/$(KERNEL))
+- rm -rf $(KERNEL_BUILD_DIR)/modules
+ endef
+
+ define Kernel/CompileModules/Default
+ rm -f $(LINUX_DIR)/vmlinux $(LINUX_DIR)/System.map
+- +$(MAKE) $(KERNEL_MAKEOPTS) modules
+ endef
+
+ OBJCOPY_STRIP = -R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
Modified: torvm/trunk/build/kamikaze/patches/000-kamikaze-mod-openssl-386.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/000-kamikaze-mod-openssl-386.patch 2009-05-31 21:30:32 UTC (rev 19604)
+++ torvm/trunk/build/kamikaze/patches/000-kamikaze-mod-openssl-386.patch 2009-05-31 23:12:42 UTC (rev 19605)
@@ -1,22 +1,22 @@
diff -Naur a/package/openssl/Makefile b/package/openssl/Makefile
---- a/package/openssl/Makefile 2009-01-19 09:50:41.579748000 +0000
-+++ b/package/openssl/Makefile 2009-03-14 23:01:32.442069224 +0000
-@@ -19,8 +19,6 @@
+--- a/package/openssl/Makefile 2009-05-17 00:25:41.209156000 +0000
++++ b/package/openssl/Makefile 2009-05-30 05:06:49.549118296 +0000
+@@ -18,8 +18,6 @@
ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/
- PKG_MD5SUM:=a5cb5f6c3d11affb387ecf7a997cac0c
+ PKG_MD5SUM:=e555c6d58d276aec7fdc53363e338ab3
-PKG_BUILD_DEPENDS:=ocf-crypto-headers
-
include $(INCLUDE_DIR)/package.mk
define Package/openssl/Default
-@@ -73,25 +71,26 @@
+@@ -72,25 +70,25 @@
OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic \
no-sse2 no-perlasm --with-cryptodev
else
-OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic \
-+OPENSSL_OPTIONS:= shared no-ec no-err no-hw threads zlib-dynamic \
- no-engines no-sse2 no-perlasm
+- no-engines no-sse2 no-perlasm
++OPENSSL_OPTIONS:= shared no-ec no-err no-hw threads zlib-dynamic
endif
@@ -26,6 +26,7 @@
+ ./Configure linux-elf \
--prefix=/usr \
--openssldir=/etc/ssl \
++ --with-fipslibdir="$(PKG_INSTALL_DIR)\ssl/fips-1.0/lib" \
$(TARGET_CPPFLAGS) \
$(TARGET_LDFLAGS) -ldl \
- -DOPENSSL_SMALL_FOOTPRINT \
@@ -35,12 +36,11 @@
endef
TARGET_CFLAGS += $(FPIC)
-+# apps is currently broken
+TARGET_BUILDDIRS=crypto fips ssl
define Build/Compile
- rm -rf $(PKG_INSTALL_DIR)
-@@ -99,21 +98,24 @@
+ # XXX: OpenSSL "make depend" will look for installed headers before its own,
+@@ -99,21 +97,18 @@
$(MAKE) -C $(PKG_BUILD_DIR) \
MAKEDEPPROG="$(TARGET_CROSS)gcc" \
OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
@@ -53,53 +53,163 @@
OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
+ DIRS="$(TARGET_BUILDDIRS)" \
all build-shared
- # Work around openssl build bug to link libssl.so with libcrypto.so.
+- # Work around openssl build bug to link libssl.so with libcrypto.so.
- -rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
- $(MAKE) -C $(PKG_BUILD_DIR) \
- CC="$(TARGET_CC)" \
- OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
- do_linux-shared
-+ # -rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
-+ # $(MAKE) -C $(PKG_BUILD_DIR) \
-+ # CC="$(TARGET_CC)" \
-+ # OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \
-+ # do_linux-shared
$(MAKE) -C $(PKG_BUILD_DIR) \
INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
+ DIRS="$(TARGET_BUILDDIRS)" \
install
endef
-diff -Naur a/package/openssl/patches/100-parallel-build.patch b/package/openssl/patches/100-parallel-build.patch
---- a/package/openssl/patches/100-parallel-build.patch 2009-01-19 09:50:41.579748000 +0000
-+++ b/package/openssl/patches/100-parallel-build.patch 1970-01-01 00:00:00.000000000 +0000
-@@ -1,24 +0,0 @@
--diff -uNr openssl-0.9.8j.ORIG/Makefile.org openssl-0.9.8j/Makefile.org
----- openssl-0.9.8j.ORIG/Makefile.org 2009-01-07 18:06:31.000000000 +0000
--+++ openssl-0.9.8j/Makefile.org 2009-01-07 18:08:38.000000000 +0000
--@@ -333,15 +333,15 @@
-- dir=crypto; target=all; $(BUILD_ONE_CMD)
-- build_fips:
-- @dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD)
---build_ssl:
--+build_ssl: build_crypto
-- @dir=ssl; target=all; $(BUILD_ONE_CMD)
---build_engines:
--+build_engines: build_crypto
-- @dir=engines; target=all; $(BUILD_ONE_CMD)
---build_apps:
--+build_apps: build_libs
-- @dir=apps; target=all; $(BUILD_ONE_CMD)
---build_tests:
--+build_tests: build_libs
-- @dir=test; target=all; $(BUILD_ONE_CMD)
---build_tools:
--+build_tools: build_libs
-- @dir=tools; target=all; $(BUILD_ONE_CMD)
+diff -Naur a/package/openssl/patches/001-upstream_dtls_cisco.patch b/package/openssl/patches/001-upstream_dtls_cisco.patch
+--- a/package/openssl/patches/001-upstream_dtls_cisco.patch 2009-04-25 16:33:00.317897000 +0000
++++ b/package/openssl/patches/001-upstream_dtls_cisco.patch 1970-01-01 00:00:00.000000000 +0000
+@@ -1,139 +0,0 @@
+---- a/ssl/d1_clnt.c
+-+++ b/ssl/d1_clnt.c
+-@@ -130,7 +130,7 @@ static int dtls1_get_hello_verify(SSL *s
-
-- all_testapps: build_libs build_testapps
+- static SSL_METHOD *dtls1_get_client_method(int ver)
+- {
+-- if (ver == DTLS1_VERSION)
+-+ if (ver == DTLS1_VERSION || ver == DTLS1_BAD_VER)
+- return(DTLSv1_client_method());
+- else
+- return(NULL);
+-@@ -181,7 +181,8 @@ int dtls1_connect(SSL *s)
+- s->server=0;
+- if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);
+-
+-- if ((s->version & 0xff00 ) != (DTLS1_VERSION & 0xff00))
+-+ if ((s->version & 0xff00 ) != (DTLS1_VERSION & 0xff00) &&
+-+ (s->version & 0xff00 ) != (DTLS1_BAD_VER & 0xff00))
+- {
+- SSLerr(SSL_F_DTLS1_CONNECT, ERR_R_INTERNAL_ERROR);
+- ret = -1;
+---- a/ssl/d1_lib.c
+-+++ b/ssl/d1_lib.c
+-@@ -187,7 +187,10 @@ void dtls1_free(SSL *s)
+- void dtls1_clear(SSL *s)
+- {
+- ssl3_clear(s);
+-- s->version=DTLS1_VERSION;
+-+ if (s->options & SSL_OP_CISCO_ANYCONNECT)
+-+ s->version=DTLS1_BAD_VER;
+-+ else
+-+ s->version=DTLS1_VERSION;
+- }
+-
+- /*
+---- a/ssl/d1_pkt.c
+-+++ b/ssl/d1_pkt.c
+-@@ -987,15 +987,17 @@ start:
+- if (rr->type == SSL3_RT_CHANGE_CIPHER_SPEC)
+- {
+- struct ccs_header_st ccs_hdr;
+-+ int ccs_hdr_len = DTLS1_CCS_HEADER_LENGTH;
+-
+- dtls1_get_ccs_header(rr->data, &ccs_hdr);
+-
+- /* 'Change Cipher Spec' is just a single byte, so we know
+- * exactly what the record payload has to look like */
+- /* XDTLS: check that epoch is consistent */
+-- if ( (s->client_version == DTLS1_BAD_VER && rr->length != 3) ||
+-- (s->client_version != DTLS1_BAD_VER && rr->length != DTLS1_CCS_HEADER_LENGTH) ||
+-- (rr->off != 0) || (rr->data[0] != SSL3_MT_CCS))
+-+ if (s->client_version == DTLS1_BAD_VER || s->version == DTLS1_BAD_VER)
+-+ ccs_hdr_len = 3;
+-+
+-+ if ((rr->length != ccs_hdr_len) || (rr->off != 0) || (rr->data[0] != SSL3_MT_CCS))
+- {
+- i=SSL_AD_ILLEGAL_PARAMETER;
+- SSLerr(SSL_F_DTLS1_READ_BYTES,SSL_R_BAD_CHANGE_CIPHER_SPEC);
+-@@ -1311,7 +1313,7 @@ int do_dtls1_write(SSL *s, int type, con
+- #if 0
+- /* 'create_empty_fragment' is true only when this function calls itself */
+- if (!clear && !create_empty_fragment && !s->s3->empty_fragment_done
+-- && SSL_version(s) != DTLS1_VERSION)
+-+ && SSL_version(s) != DTLS1_VERSION && SSL_version(s) != DTLS1_BAD_VER)
+- {
+- /* countermeasure against known-IV weakness in CBC ciphersuites
+- * (see http://www.openssl.org/~bodo/tls-cbc.txt)
+---- a/ssl/s3_clnt.c
+-+++ b/ssl/s3_clnt.c
+-@@ -708,7 +708,7 @@ int ssl3_get_server_hello(SSL *s)
+-
+- if (!ok) return((int)n);
+-
+-- if ( SSL_version(s) == DTLS1_VERSION)
+-+ if ( SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
+- {
+- if ( s->s3->tmp.message_type == DTLS1_MT_HELLO_VERIFY_REQUEST)
+- {
+---- a/ssl/ssl.h
+-+++ b/ssl/ssl.h
+-@@ -510,6 +510,8 @@ typedef struct ssl_session_st
+- #define SSL_OP_COOKIE_EXCHANGE 0x00002000L
+- /* Don't use RFC4507 ticket extension */
+- #define SSL_OP_NO_TICKET 0x00004000L
+-+/* Use Cisco's "speshul" version of DTLS_BAD_VER (as client) */
+-+#define SSL_OP_CISCO_ANYCONNECT 0x00008000L
+-
+- /* As server, disallow session resumption on renegotiation */
+- #define SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION 0x00010000L
+---- a/ssl/ssl_lib.c
+-+++ b/ssl/ssl_lib.c
+-@@ -995,7 +995,8 @@ long SSL_ctrl(SSL *s,int cmd,long larg,v
+- s->max_cert_list=larg;
+- return(l);
+- case SSL_CTRL_SET_MTU:
+-- if (SSL_version(s) == DTLS1_VERSION)
+-+ if (SSL_version(s) == DTLS1_VERSION ||
+-+ SSL_version(s) == DTLS1_BAD_VER)
+- {
+- s->d1->mtu = larg;
+- return larg;
+---- a/ssl/ssl_sess.c
+-+++ b/ssl/ssl_sess.c
+-@@ -211,6 +211,11 @@ int ssl_get_new_session(SSL *s, int sess
+- ss->ssl_version=TLS1_VERSION;
+- ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH;
+- }
+-+ else if (s->version == DTLS1_BAD_VER)
+-+ {
+-+ ss->ssl_version=DTLS1_BAD_VER;
+-+ ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH;
+-+ }
+- else if (s->version == DTLS1_VERSION)
+- {
+- ss->ssl_version=DTLS1_VERSION;
+---- a/ssl/t1_enc.c
+-+++ b/ssl/t1_enc.c
+-@@ -765,10 +765,10 @@ int tls1_mac(SSL *ssl, unsigned char *md
+- HMAC_CTX_init(&hmac);
+- HMAC_Init_ex(&hmac,mac_sec,EVP_MD_size(hash),hash,NULL);
+-
+-- if (ssl->version == DTLS1_VERSION && ssl->client_version != DTLS1_BAD_VER)
+-+ if (ssl->version == DTLS1_BAD_VER ||
+-+ (ssl->version == DTLS1_VERSION && ssl->client_version != DTLS1_BAD_VER))
+- {
+- unsigned char dtlsseq[8],*p=dtlsseq;
+--
+- s2n(send?ssl->d1->w_epoch:ssl->d1->r_epoch, p);
+- memcpy (p,&seq[2],6);
+-
+-@@ -793,7 +793,7 @@ printf("rec=");
+- {unsigned int z; for (z=0; z<rec->length; z++) printf("%02X ",buf[z]); printf("\n"); }
+- #endif
+-
+-- if ( SSL_version(ssl) != DTLS1_VERSION)
+-+ if ( SSL_version(ssl) != DTLS1_VERSION && SSL_version(ssl) != DTLS1_BAD_VER)
+- {
+- for (i=7; i>=0; i--)
+- {
diff -Naur a/package/openssl/patches/110-optimize-for-size.patch b/package/openssl/patches/110-optimize-for-size.patch
---- a/package/openssl/patches/110-optimize-for-size.patch 2008-05-31 15:52:11.560038000 +0000
+--- a/package/openssl/patches/110-optimize-for-size.patch 2009-04-17 14:32:29.989894000 +0000
+++ b/package/openssl/patches/110-optimize-for-size.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-diff -ur openssl-0.9.8h.orig/Configure openssl-0.9.8h/Configure
@@ -114,6 +224,34 @@
-
- #### *BSD [do see comment about ${BSDthreads} above!]
- "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+diff -Naur a/package/openssl/patches/121-ocf-config.patch b/package/openssl/patches/121-ocf-config.patch
+--- a/package/openssl/patches/121-ocf-config.patch 2009-04-04 18:30:56.800798000 +0000
++++ b/package/openssl/patches/121-ocf-config.patch 1970-01-01 00:00:00.000000000 +0000
+@@ -1,24 +0,0 @@
+-diff -burN openssl-0.9.8k/config openssl-0.9.8k.patched/config
+---- openssl-0.9.8k/config 2009-02-16 09:43:41.000000000 +0100
+-+++ openssl-0.9.8k.patched/config 2009-03-27 19:38:37.262255825 +0100
+-@@ -399,8 +399,11 @@
+- # this is where the translation occurs into SSLeay terms
+- # ---------------------------------------------------------------------------
+-
+-+# figure out if gcc is available and if so we use it otherwise
+-+# we fallback to whatever cc does on the system
+- GCCVER=`(gcc -dumpversion) 2>/dev/null`
+- if [ "$GCCVER" != "" ]; then
+-+ CC=gcc
+- # then strip off whatever prefix egcs prepends the number with...
+- # Hopefully, this will work for any future prefixes as well.
+- GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
+-@@ -409,6 +412,8 @@
+- # major and minor version numbers.
+- # peak single digit before and after first dot, e.g. 2.95.1 gives 29
+- GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
+-+else
+-+ CC=cc
+- fi
+-
+- # Only set CC if not supplied already
diff -Naur a/package/openssl/patches/150-no_engines.patch b/package/openssl/patches/150-no_engines.patch
--- a/package/openssl/patches/150-no_engines.patch 2008-11-03 21:26:27.396977000 +0000
+++ b/package/openssl/patches/150-no_engines.patch 1970-01-01 00:00:00.000000000 +0000
Modified: torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch 2009-05-31 21:30:32 UTC (rev 19604)
+++ torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch 2009-05-31 23:12:42 UTC (rev 19605)
@@ -313,7 +313,7 @@
+
diff -Naur a/package/tor/files/tor.init b/package/tor/files/tor.init
--- a/package/tor/files/tor.init 1970-01-01 00:00:00.000000000 +0000
-+++ b/package/tor/files/tor.init 2009-05-03 22:36:11.026346847 +0000
++++ b/package/tor/files/tor.init 2009-05-03 22:36:11.026346000 +0000
@@ -0,0 +1,159 @@
+#!/bin/sh
+# make sure we check the system bin dirs
@@ -476,7 +476,7 @@
+exit 0
diff -Naur a/package/tor/files/torrc b/package/tor/files/torrc
--- a/package/tor/files/torrc 1970-01-01 00:00:00.000000000 +0000
-+++ b/package/tor/files/torrc 2009-05-02 20:36:18.116609117 +0000
++++ b/package/tor/files/torrc 2009-05-02 20:36:18.116609000 +0000
@@ -0,0 +1,22 @@
+# Configuration for Tor VM
+User tor
Modified: torvm/trunk/build/kamikaze/patches/002-kamikaze-mod-basefiles.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/002-kamikaze-mod-basefiles.patch 2009-05-31 21:30:32 UTC (rev 19604)
+++ torvm/trunk/build/kamikaze/patches/002-kamikaze-mod-basefiles.patch 2009-05-31 23:12:42 UTC (rev 19605)
@@ -1,76 +1,38 @@
diff -Naur a/package/base-files/Makefile b/package/base-files/Makefile
---- a/package/base-files/Makefile 2009-01-26 19:46:12.339316000 +0000
-+++ b/package/base-files/Makefile 2009-02-01 09:29:53.329466720 +0000
-@@ -39,8 +39,8 @@
+--- a/package/base-files/Makefile 2009-05-23 21:16:04.068729000 +0000
++++ b/package/base-files/Makefile 2009-05-31 22:58:21.180748579 +0000
+@@ -40,11 +40,6 @@
+ TITLE:=Base filesystem for OpenWrt
URL:=http://openwrt.org/
VERSION:=$(PKG_RELEASE)-$(REVISION)
- $(call Config,network.lan.proto,string,static,LAN Protocol)
+- $(call Config,network.lan.proto,string,static,LAN Protocol)
- $(call Config,network.lan.ipaddr,ip,192.168.1.1,LAN IP Address)
- $(call Config,network.lan.netmask,netmask,255.255.255.0,LAN Network Mask)
-+ $(call Config,network.lan.ipaddr,ip,,LAN IP Address)
-+ $(call Config,network.lan.netmask,netmask,,LAN Network Mask)
- $(call Config,network.lan.gateway,ip,,LAN Gateway)
- $(call Config,network.lan.dns,ip,,LAN DNS server)
+- $(call Config,network.lan.gateway,ip,,LAN Gateway)
+- $(call Config,network.lan.dns,ip,,LAN DNS server)
endef
-diff -Naur a/package/base-files/Makefile.rej b/package/base-files/Makefile.rej
---- a/package/base-files/Makefile.rej 1970-01-01 00:00:00.000000000 +0000
-+++ b/package/base-files/Makefile.rej 2009-02-01 09:29:53.329466720 +0000
-@@ -0,0 +1,52 @@
-+***************
-+*** 53,59 ****
-+ /etc/passwd
-+ /etc/profile
-+ /etc/shells
-+- /etc/ipkg.conf
-+ /etc/sysctl.conf
-+ $(call $(TARGET)/conffiles)
-+ endef
-+--- 53,58 ----
-+ /etc/passwd
-+ /etc/profile
-+ /etc/shells
-+ /etc/sysctl.conf
-+ $(call $(TARGET)/conffiles)
-+ endef
-+***************
-+*** 146,164 ****
-+ $(CP) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/* $(1)/; \
-+ fi \
-+ )
-+- $(SED) 's,$$$$R,$(REVISION),g' $(1)/etc/banner
-+- $(SED) 's,$$$$S,$(BOARD),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/ipkg.conf
-+ mkdir -p $(1)/dev
-+ mkdir -p $(1)/etc/crontabs
-+- mkdir -p $(1)/jffs
-+- mkdir -p $(1)/lib/firmware
-+ mkdir -p $(1)/mnt
-+ mkdir -p $(1)/proc
-+ mkdir -p $(1)/tmp
-+ mkdir -p $(1)/usr/lib
-+ mkdir -p $(1)/usr/bin
-+ mkdir -p $(1)/sys
-+- mkdir -p $(1)/www
-+ mkdir -p $(1)/root
-+ ln -sf /proc/mounts $(1)/etc/mtab
-+ rm -f $(1)/var
-+--- 145,158 ----
-+ $(CP) $(PLATFORM_SUBDIR)/base-files-$(PROFILE)/* $(1)/; \
-+ fi \
-+ )
-+ mkdir -p $(1)/dev
-+ mkdir -p $(1)/etc/crontabs
-+ mkdir -p $(1)/mnt
-+ mkdir -p $(1)/proc
-+ mkdir -p $(1)/tmp
-+ mkdir -p $(1)/usr/lib
-+ mkdir -p $(1)/usr/bin
-+ mkdir -p $(1)/sys
-+ mkdir -p $(1)/root
-+ ln -sf /proc/mounts $(1)/etc/mtab
-+ rm -f $(1)/var
+
+ define Package/base-files$(TARGET)/conffiles
+@@ -175,8 +170,6 @@
+ mkdir -p $(1)/CONTROL
+ mkdir -p $(1)/dev
+ mkdir -p $(1)/etc/crontabs
+- mkdir -p $(1)/jffs
+- mkdir -p $(1)/lib/firmware
+ $(if $(LIB_SUFFIX),ln -s lib $(1)/lib$(LIB_SUFFIX))
+ mkdir -p $(1)/mnt
+ mkdir -p $(1)/proc
+@@ -185,7 +178,6 @@
+ $(if $(LIB_SUFFIX),ln -s lib $(1)/usr/lib$(LIB_SUFFIX))
+ mkdir -p $(1)/usr/bin
+ mkdir -p $(1)/sys
+- mkdir -p $(1)/www
+ mkdir -p $(1)/root
+ ln -sf /proc/mounts $(1)/etc/mtab
+ rm -f $(1)/var
diff -Naur a/package/base-files/files/bin/entropy-update.sh b/package/base-files/files/bin/entropy-update.sh
--- a/package/base-files/files/bin/entropy-update.sh 1970-01-01 00:00:00.000000000 +0000
-+++ b/package/base-files/files/bin/entropy-update.sh 2009-02-01 09:29:53.330466568 +0000
++++ b/package/base-files/files/bin/entropy-update.sh 2009-02-01 09:29:53.330466000 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+rndfile="$1"
@@ -80,11 +42,10 @@
+ sleep 60 >/dev/null 2>&1
+done
diff -Naur a/package/base-files/files/bin/firstboot b/package/base-files/files/bin/firstboot
---- a/package/base-files/files/bin/firstboot 2008-08-16 06:35:14.914763000 +0000
+--- a/package/base-files/files/bin/firstboot 2009-04-17 14:09:46.037367000 +0000
+++ b/package/base-files/files/bin/firstboot 1970-01-01 00:00:00.000000000 +0000
-@@ -1,126 +0,0 @@
+@@ -1,125 +0,0 @@
-#!/bin/sh
--# $Id: firstboot 5544 2006-11-17 03:07:10Z nbd $
-. /etc/functions.sh
-
-partname="rootfs_data"
@@ -245,9 +206,9 @@
- }
-}
-EOF
-diff -Naur a/package/base-files/files/bin/login b/package/base-files/files/bin/login
---- a/package/base-files/files/bin/login 2006-06-27 00:36:13.101592000 +0000
-+++ b/package/base-files/files/bin/login 1970-01-01 00:00:00.000000000 +0000
+diff -Naur a/package/base-files/files/bin/login.sh b/package/base-files/files/bin/login.sh
+--- a/package/base-files/files/bin/login.sh 2009-04-17 14:32:29.989894000 +0000
++++ b/package/base-files/files/bin/login.sh 1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
@@ -268,8 +229,8 @@
-
-exec /bin/ash --login
diff -Naur a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner
---- a/package/base-files/files/etc/banner 2005-12-20 15:03:08.038259000 +0000
-+++ b/package/base-files/files/etc/banner 2009-03-22 17:50:37.785636152 +0000
+--- a/package/base-files/files/etc/banner 2009-04-17 14:32:29.989894000 +0000
++++ b/package/base-files/files/etc/banner 2009-05-27 03:52:06.692738202 +0000
@@ -1,10 +1,26 @@
- _______ ________ __
- | |.-----.-----.-----.| | | |.----.| |_
@@ -348,7 +309,7 @@
- option timezone UTC
diff -Naur a/package/base-files/files/etc/device_table.txt b/package/base-files/files/etc/device_table.txt
--- a/package/base-files/files/etc/device_table.txt 1970-01-01 00:00:00.000000000 +0000
-+++ b/package/base-files/files/etc/device_table.txt 2009-02-01 09:30:07.194358936 +0000
++++ b/package/base-files/files/etc/device_table.txt 2009-02-01 09:30:07.194358000 +0000
@@ -0,0 +1,44 @@
+#<name> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
+#/dev d 755 0 0 - - - - -
@@ -395,15 +356,15 @@
+/dev/sg c 640 0 0 21 0 0 1 15
+/dev/scd b 640 0 0 11 0 0 1 15
diff -Naur a/package/base-files/files/etc/diag.sh b/package/base-files/files/etc/diag.sh
---- a/package/base-files/files/etc/diag.sh 2007-05-10 19:19:23.337706000 +0000
+--- a/package/base-files/files/etc/diag.sh 2009-04-30 21:00:57.896294000 +0000
+++ b/package/base-files/files/etc/diag.sh 1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
--# Copyright (C) 2006 OpenWrt.org
+-# Copyright (C) 2006-2009 OpenWrt.org
-
--set_state() :
+-set_state() { :; }
diff -Naur a/package/base-files/files/etc/functions.sh b/package/base-files/files/etc/functions.sh
---- a/package/base-files/files/etc/functions.sh 2008-08-25 05:21:42.703430000 +0000
+--- a/package/base-files/files/etc/functions.sh 2009-04-17 14:32:29.989894000 +0000
+++ b/package/base-files/files/etc/functions.sh 1970-01-01 00:00:00.000000000 +0000
@@ -1,269 +0,0 @@
-#!/bin/sh
@@ -724,9 +685,9 @@
- [ -n "$DEVICE" ] && uci_set_state network "$INTERFACE" ifname "$DEVICE"
-}
diff -Naur a/package/base-files/files/etc/hotplug.d/iface/10-routes b/package/base-files/files/etc/hotplug.d/iface/10-routes
---- a/package/base-files/files/etc/hotplug.d/iface/10-routes 2008-12-22 02:21:25.213365000 +0000
+--- a/package/base-files/files/etc/hotplug.d/iface/10-routes 2009-04-19 17:12:02.320805000 +0000
+++ b/package/base-files/files/etc/hotplug.d/iface/10-routes 1970-01-01 00:00:00.000000000 +0000
-@@ -1,69 +0,0 @@
+@@ -1,74 +0,0 @@
-add_route() {
- local config="$1"
-
@@ -752,7 +713,12 @@
- config_get gateway "$interface" gateway
- }
-
-- netmask="${netmask:-255.255.255.255}"
+- # handle "0.0.0.0" as "no gateway given" to allow
+- # defining gateway-less routes while still keeping
+- # the possibility to have static routes with a
+- # proper gateway on interfaces with dynamic ips
+- [ "$gateway" = "0.0.0.0" ] && gateway=""
+-
- dest="${netmask:+-net "$target" netmask "$netmask"}"
- dest="${dest:--host "$target"}"
-
@@ -879,9 +845,9 @@
-esac
-
diff -Naur a/package/base-files/files/etc/hotplug2-common.rules b/package/base-files/files/etc/hotplug2-common.rules
---- a/package/base-files/files/etc/hotplug2-common.rules 2008-01-26 03:16:11.438222000 +0000
+--- a/package/base-files/files/etc/hotplug2-common.rules 2009-03-09 15:06:15.458249000 +0000
+++ b/package/base-files/files/etc/hotplug2-common.rules 1970-01-01 00:00:00.000000000 +0000
-@@ -1,35 +0,0 @@
+@@ -1,40 +0,0 @@
-
-DEVICENAME ~~ (null|full|ptmx|tty|zero|gpio) {
- nothrottle
@@ -907,6 +873,11 @@
- next
-}
-
+-DEVPATH is set, SUBSYSTEM ~~ (input) {
+- nothrottle
+- makedev /dev/input/%DEVICENAME% 0644
+-}
+-
-DEVPATH is set {
- nothrottle
- makedev /dev/%DEVICENAME% 0644
@@ -927,9 +898,9 @@
- exec kill -USR1 1 ;
-}
diff -Naur a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
---- a/package/base-files/files/etc/init.d/boot 2009-01-06 21:53:45.361427000 +0000
+--- a/package/base-files/files/etc/init.d/boot 2009-04-30 22:59:18.268466000 +0000
+++ b/package/base-files/files/etc/init.d/boot 1970-01-01 00:00:00.000000000 +0000
-@@ -1,68 +0,0 @@
+@@ -1,69 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
@@ -951,8 +922,9 @@
-
- config_get log_ip "$cfg" log_ip
- config_get log_size "$cfg" log_size
-- syslogd -C${log_size:-16} ${log_ip:+-L -R $log_ip}
-- klogd
+- config_get log_port "$cfg" log_port
+- [ -x /sbin/syslogd ] && syslogd -C${log_size:-16} ${log_ip:+-L -R $log_ip${log_port:+:$log_port}}
+- [ -x /sbin/klogd ] && klogd
-}
-
-apply_uci_config() {(
@@ -983,7 +955,7 @@
-
- killall -q hotplug2
- [ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
-- --max-children 1 --no-coldplug &
+- --max-children 1 --no-coldplug >/dev/null 2>&1 &
-
- # the coldplugging of network interfaces needs to happen later, so we do it manually here
- for iface in $(awk -F: '/:/ {print $1}' /proc/net/dev); do
@@ -1018,9 +990,9 @@
- set_state done
-}
diff -Naur a/package/base-files/files/etc/init.d/fstab b/package/base-files/files/etc/init.d/fstab
---- a/package/base-files/files/etc/init.d/fstab 2008-08-04 08:50:16.118952000 +0000
+--- a/package/base-files/files/etc/init.d/fstab 2009-03-07 12:58:08.923945000 +0000
+++ b/package/base-files/files/etc/init.d/fstab 1970-01-01 00:00:00.000000000 +0000
-@@ -1,66 +0,0 @@
+@@ -1,67 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2007 OpenWrt.org
-
@@ -1085,6 +1057,7 @@
- config_load fstab
- config_foreach do_unmount mount
- config_foreach do_swapoff swap
+- [ -x /sbin/swapoff ] && swapoff -a
-}
-
diff -Naur a/package/base-files/files/etc/init.d/led b/package/base-files/files/etc/init.d/led
@@ -1181,22 +1154,20 @@
- ifdown -a
-}
diff -Naur a/package/base-files/files/etc/init.d/rcS b/package/base-files/files/etc/init.d/rcS
---- a/package/base-files/files/etc/init.d/rcS 2007-11-28 02:36:14.270663000 +0000
-+++ b/package/base-files/files/etc/init.d/rcS 2009-02-01 09:30:27.451279416 +0000
-@@ -1,8 +1,2 @@
+--- a/package/base-files/files/etc/init.d/rcS 2009-04-30 22:59:18.268466000 +0000
++++ b/package/base-files/files/etc/init.d/rcS 2009-05-27 03:48:14.757345581 +0000
+@@ -1,6 +1,6 @@
#!/bin/sh
--# Copyright (C) 2006 OpenWrt.org
+ # Copyright (C) 2006 OpenWrt.org
-
--{
-- for i in /etc/rc.d/$1*; do
-- [ -x $i ] && $i $2 2>&1
-- done
--} | logger -s -p 6 -t '' &
+exit 0
+ run_scripts() {
+ for i in /etc/rc.d/$1*; do
+ [ -x $i ] && $i $2 2>&1
diff -Naur a/package/base-files/files/etc/init.d/sysctl b/package/base-files/files/etc/init.d/sysctl
--- a/package/base-files/files/etc/init.d/sysctl 2007-05-10 10:07:38.965405000 +0000
-+++ b/package/base-files/files/etc/init.d/sysctl 2009-02-01 09:30:27.483274552 +0000
-@@ -1,7 +1,2 @@
++++ b/package/base-files/files/etc/init.d/sysctl 1970-01-01 00:00:00.000000000 +0000
+@@ -1,7 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
@@ -1204,8 +1175,6 @@
-start() {
- [ -f /etc/sysctl.conf ] && sysctl -p >&-
-}
-+#!/bin/sh
-+[ -f /etc/sysctl.conf ] && sysctl -p >&-
diff -Naur a/package/base-files/files/etc/init.d/umount b/package/base-files/files/etc/init.d/umount
--- a/package/base-files/files/etc/init.d/umount 2007-05-10 10:45:04.317089000 +0000
+++ b/package/base-files/files/etc/init.d/umount 1970-01-01 00:00:00.000000000 +0000
@@ -1243,8 +1212,8 @@
- [ -c /dev/watchdog ] && watchdog -t 5 /dev/watchdog
-}
diff -Naur a/package/base-files/files/etc/inittab b/package/base-files/files/etc/inittab
---- a/package/base-files/files/etc/inittab 2007-05-10 14:50:42.865525000 +0000
-+++ b/package/base-files/files/etc/inittab 2009-02-01 09:30:27.525268168 +0000
+--- a/package/base-files/files/etc/inittab 2009-04-17 14:32:29.989894000 +0000
++++ b/package/base-files/files/etc/inittab 2009-02-01 09:30:27.525268000 +0000
@@ -1,5 +1,2 @@
::sysinit:/etc/init.d/rcS S boot
::shutdown:/etc/init.d/rcS K stop
@@ -1252,12 +1221,11 @@
-ttyS0::askfirst:/bin/ash --login
-tty1::askfirst:/bin/ash --login
diff -Naur a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
---- a/package/base-files/files/etc/preinit 2008-08-14 22:21:35.073308000 +0000
-+++ b/package/base-files/files/etc/preinit 2009-03-26 03:48:34.351179704 +0000
-@@ -1,6 +1,13 @@
+--- a/package/base-files/files/etc/preinit 2009-04-04 09:35:55.513254000 +0000
++++ b/package/base-files/files/etc/preinit 2009-05-25 23:02:39.761491059 +0000
+@@ -1,5 +1,12 @@
#!/bin/sh
# Copyright (C) 2006 OpenWrt.org
- export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+
+# bypass default kamikaze init if we're running with Tor VM modifications
+if [ -f /etc/torvminit ]; then
@@ -1265,10 +1233,10 @@
+ . /etc/torvminit
+else
+
+ export PATH=/bin:/sbin:/usr/bin:/usr/sbin
. /etc/diag.sh
- failsafe_ip() {
-@@ -86,3 +93,6 @@
+@@ -87,3 +94,6 @@
exec /sbin/init
fi
@@ -1276,8 +1244,8 @@
+# end not Tor VM init
+fi
diff -Naur a/package/base-files/files/etc/profile b/package/base-files/files/etc/profile
---- a/package/base-files/files/etc/profile 2009-01-07 04:38:57.851159000 +0000
-+++ b/package/base-files/files/etc/profile 2009-03-16 00:59:14.150729840 +0000
+--- a/package/base-files/files/etc/profile 2009-04-17 14:32:29.989894000 +0000
++++ b/package/base-files/files/etc/profile 2009-03-16 00:59:14.150729000 +0000
@@ -4,12 +4,8 @@
export PATH=/bin:/sbin:/usr/bin:/usr/sbin
export HOME=$(grep -e "^${USER:-root}:" /etc/passwd | cut -d ":" -f 6)
@@ -1292,113 +1260,10 @@
-
[ -x /sbin/arp ] || arp() { cat /proc/net/arp; }
-[ -z /bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
-diff -Naur a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common
---- a/package/base-files/files/etc/rc.common 2008-09-23 12:35:34.898984000 +0000
-+++ b/package/base-files/files/etc/rc.common 2009-02-01 09:47:48.118074016 +0000
-@@ -1,92 +1,4 @@
- #!/bin/sh
--# Copyright (C) 2006 OpenWrt.org
--
--. $IPKG_INSTROOT/etc/functions.sh
--
--start() {
-- return 0
--}
--
--stop() {
-- return 0
--}
--
--reload() {
-- return 1
--}
--
--restart() {
-- trap '' TERM
-- stop "$@"
-- start "$@"
--}
--
--boot() {
-- start "$@"
--}
--
--shutdown() {
-- return 0
--}
--
--disable() {
-- name="$(basename "${initscript}")"
-- rm -f "$IPKG_INSTROOT"/etc/rc.d/S??$name
-- rm -f "$IPKG_INSTROOT"/etc/rc.d/K??$name
--}
--
--enable() {
-- name="$(basename "${initscript}")"
-- disable
-- [ "$START" ] && ln -s "../init.d/$name" "$IPKG_INSTROOT/etc/rc.d/S${START}${name##S[0-9][0-9]}"
-- [ "$STOP" ] && ln -s "../init.d/$name" "$IPKG_INSTROOT/etc/rc.d/K${STOP}${name##K[0-9][0-9]}"
--}
--
--enabled() {
-- name="$(basename "${initscript}")"
-- [ -x "$IPKG_INSTROOT/etc/rc.d/S${START}${name##S[0-9][0-9]}" ]
--}
--
--depends() {
-- return 0
--}
--
--help() {
-- cat <<EOF
--Syntax: $initscript [command]
--
--Available commands:
-- start Start the service
-- stop Stop the service
-- restart Restart the service
-- reload Reload configuration files (or restart if that fails)
-- enable Enable service autostart
-- disable Disable service autostart
--$EXTRA_HELP
--EOF
--}
--
--initscript="$1"
--[ "$#" -ge 1 ] && shift
--action="$1"
--[ "$#" -ge 1 ] && shift
--
--. "$initscript"
--
--cmds=
--for cmd in $EXTRA_COMMANDS; do
-- cmds="${cmds:+$cmds$N}$cmd) $cmd \"\$@\";;"
--done
--eval "case \"\$action\" in
-- start) start \"\$@\";;
-- stop) stop \"\$@\";;
-- reload) reload \"\$@\" || restart \"\$@\";;
-- restart) restart \"\$@\";;
-- boot) boot \"\$@\";;
-- shutdown) shutdown \"\$@\";;
-- enable) enable \"\$@\";;
-- enabled) enabled \"\$@\";;
-- disable) disable \"\$@\";;
-- $cmds
-- *) help;;
--esac"
-+# forcibly disable the usual init process
-+# all start/stop activity is controlled by the Tor VM controller (Vidalia).
-+exit 0
diff -Naur a/package/base-files/files/etc/sysctl.conf b/package/base-files/files/etc/sysctl.conf
---- a/package/base-files/files/etc/sysctl.conf 2009-01-30 14:13:09.991360000 +0000
-+++ b/package/base-files/files/etc/sysctl.conf 2009-02-01 09:46:11.655738520 +0000
-@@ -1,16 +1,13 @@
- kernel.panic=3
--net.ipv4.conf.default.arp_ignore=1
--net.ipv4.conf.all.arp_ignore=1
- net.ipv4.ip_forward=1
+--- a/package/base-files/files/etc/sysctl.conf 2009-04-17 14:32:29.989894000 +0000
++++ b/package/base-files/files/etc/sysctl.conf 2009-05-27 03:51:05.243395728 +0000
+@@ -5,15 +5,15 @@
net.ipv4.icmp_echo_ignore_broadcasts=1
net.ipv4.icmp_ignore_bogus_error_responses=1
net.ipv4.tcp_ecn=1
@@ -1408,17 +1273,19 @@
-net.ipv4.tcp_syncookies=1
+net.ipv4.tcp_syncookies=0
net.ipv4.tcp_timestamps=0
--net.ipv4.netfilter.ip_conntrack_max=16384
-+net.ipv4.netfilter.ip_conntrack_max=65535
+ net.core.netdev_max_backlog=30
+ net.netfilter.nf_conntrack_checksum=0
+ net.ipv4.netfilter.ip_conntrack_checksum=0
+ net.ipv4.netfilter.ip_conntrack_max=16384
net.ipv4.netfilter.ip_conntrack_tcp_timeout_established=3600
-net.ipv4.netfilter.ip_conntrack_udp_timeout=60
-net.ipv4.netfilter.ip_conntrack_udp_timeout_stream=180
--# net.ipv6.conf.all.forwarding=1
-+net.ipv4.netfilter.ip_conntrack_udp_timeout=600
-+net.ipv4.netfilter.ip_conntrack_udp_timeout_stream=1800
++net.ipv4.netfilter.ip_conntrack_udp_timeout=300
++net.ipv4.netfilter.ip_conntrack_udp_timeout_stream=600
+ # net.ipv6.conf.all.forwarding=1
diff -Naur a/package/base-files/files/etc/torvminit b/package/base-files/files/etc/torvminit
--- a/package/base-files/files/etc/torvminit 1970-01-01 00:00:00.000000000 +0000
-+++ b/package/base-files/files/etc/torvminit 2009-03-26 03:49:06.422304152 +0000
++++ b/package/base-files/files/etc/torvminit 2009-03-26 03:49:06.422304000 +0000
@@ -0,0 +1,235 @@
+#!/bin/sh
+# Copyright (C) 2008-2009 The Tor Project, Inc.
@@ -2334,9 +2201,9 @@
- validate_config()
-}
diff -Naur a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
---- a/package/base-files/files/lib/network/config.sh 2008-11-17 10:47:02.945064000 +0000
+--- a/package/base-files/files/lib/network/config.sh 2009-04-13 00:43:23.929209000 +0000
+++ b/package/base-files/files/lib/network/config.sh 1970-01-01 00:00:00.000000000 +0000
-@@ -1,298 +0,0 @@
+@@ -1,309 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
-
@@ -2422,6 +2289,7 @@
-prepare_interface() {
- local iface="$1"
- local config="$2"
+- local vifmac="$3"
-
- # if we're called for the bridge interface itself, don't bother trying
- # to create any interfaces here. The scripts have already done that, otherwise
@@ -2432,6 +2300,12 @@
- # make sure the interface is removed from any existing bridge and deconfigured
- ifconfig "$iface" 0.0.0.0
- unbridge "$iface"
+-
+- # Change interface MAC address if requested
+- [ -n "$vifmac" ] && {
+- ifconfig "$iface" down
+- ifconfig "$iface" hw ether "$vifmac" up
+- }
- }
-
- # Setup VLAN interfaces
@@ -2511,6 +2385,9 @@
- done
- }
-
+- config_get type "$config" TYPE
+- [ "$type" = "alias" ] && return 0
+-
- env -i ACTION="ifup" INTERFACE="$config" DEVICE="$iface" PROTO=static /sbin/hotplug-call "iface" &
-}
-
@@ -2548,6 +2425,7 @@
-setup_interface() {
- local iface="$1"
- local config="$2"
+- local vifmac="$4"
- local proto
- local macaddr
-
@@ -2557,7 +2435,7 @@
- }
- proto="${3:-$(config_get "$config" proto)}"
-
-- prepare_interface "$iface" "$config" || return 0
+- prepare_interface "$iface" "$config" "$vifmac" || return 0
-
- [ "$iface" = "br-$config" ] && {
- # need to bring up the bridge and wait a second for
@@ -2636,9 +2514,9 @@
- }
-}
diff -Naur a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
---- a/package/base-files/files/lib/upgrade/common.sh 2008-09-25 11:31:35.208889000 +0000
+--- a/package/base-files/files/lib/upgrade/common.sh 2009-05-15 12:10:26.529854000 +0000
+++ b/package/base-files/files/lib/upgrade/common.sh 1970-01-01 00:00:00.000000000 +0000
-@@ -1,165 +0,0 @@
+@@ -1,173 +0,0 @@
-#!/bin/sh
-
-RAM_ROOT=/tmp/root
@@ -2686,7 +2564,7 @@
-}
-
-run_ramfs() { # <command> [...]
-- install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount /sbin/pivot_root /usr/bin/wget /sbin/reboot /bin/sync /bin/dd /bin/grep /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" /bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump
+- install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount /sbin/pivot_root /usr/bin/wget /sbin/reboot /bin/sync /bin/dd /bin/grep /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" /bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump /bin/sleep /bin/zcat
- install_bin /sbin/mtd
- for file in $RAMFS_COPY_BIN; do
- install_bin $file
@@ -2746,10 +2624,13 @@
-
-get_image() {
- local from="$1"
+- local conc="cat"
-
+- [ $GZIPED -eq 1 ] && conc="zcat"
+-
- case "$from" in
-- http://*|ftp://*) wget -O- -q "$from";;
-- *) cat "$from"
+- http://*|ftp://*) wget -O- -q "$from" | "$conc";;
+- *) cat "$from" | "$conc";;
- esac
-}
-
@@ -2801,11 +2682,16 @@
- jffs2_copy_config
- fi
- }
+- v "Upgrade completed"
- [ -n "$DELAY" ] && sleep "$DELAY"
-- ask_bool 1 "Reboot" && reboot
+- ask_bool 1 "Reboot" && {
+- v "Rebooting system..."
+- echo b 2>/dev/null >/proc/sysrq-trigger
+- reboot
+- }
-}
diff -Naur a/package/base-files/files/rom/note b/package/base-files/files/rom/note
---- a/package/base-files/files/rom/note 2005-07-17 22:52:59.000000000 +0000
+--- a/package/base-files/files/rom/note 2009-04-17 14:32:29.989894000 +0000
+++ b/package/base-files/files/rom/note 1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-SQUASHFS USERS:
@@ -2844,7 +2730,7 @@
- ); done
-}
diff -Naur a/package/base-files/files/sbin/ifdown b/package/base-files/files/sbin/ifdown
---- a/package/base-files/files/sbin/ifdown 2008-10-29 20:31:14.226470000 +0000
+--- a/package/base-files/files/sbin/ifdown 2009-04-17 14:32:29.989894000 +0000
+++ b/package/base-files/files/sbin/ifdown 1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-#!/bin/sh
@@ -2920,7 +2806,7 @@
- uci_revert_state network "$config"
-done
diff -Naur a/package/base-files/files/sbin/ifup b/package/base-files/files/sbin/ifup
---- a/package/base-files/files/sbin/ifup 2008-11-28 16:13:23.311140000 +0000
+--- a/package/base-files/files/sbin/ifup 2009-04-17 14:32:29.989894000 +0000
+++ b/package/base-files/files/sbin/ifup 1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-#!/bin/sh
@@ -2976,7 +2862,7 @@
- exit 1
- }
diff -Naur a/package/base-files/files/sbin/mount_root b/package/base-files/files/sbin/mount_root
---- a/package/base-files/files/sbin/mount_root 2007-05-31 12:09:08.638373000 +0000
+--- a/package/base-files/files/sbin/mount_root 2009-04-17 14:32:29.989894000 +0000
+++ b/package/base-files/files/sbin/mount_root 1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-#!/bin/sh
@@ -3005,9 +2891,9 @@
- mount -o remount,rw /dev/root /
-}
diff -Naur a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
---- a/package/base-files/files/sbin/sysupgrade 2008-09-28 19:45:59.928625000 +0000
+--- a/package/base-files/files/sbin/sysupgrade 2009-05-17 11:54:44.741219000 +0000
+++ b/package/base-files/files/sbin/sysupgrade 1970-01-01 00:00:00.000000000 +0000
-@@ -1,111 +0,0 @@
+@@ -1,117 +0,0 @@
-#!/bin/sh
-. /etc/functions.sh
-
@@ -3019,7 +2905,7 @@
-export SAVE_CONFIG=1
-export DELAY=
-export CONF_IMAGE=
--
+-export GZIPED=0
-# parse options
-while [ -n "$1" ]; do
- case "$1" in
@@ -3029,6 +2915,7 @@
- -q) export VERBOSE="$(($VERBOSE - 1))";;
- -n) export SAVE_CONFIG=0;;
- -f) export CONF_IMAGE="$2"; shift;;
+- -g) export GZIPED=1;;
- -*)
- echo "Invalid option: $1"
- exit 1
@@ -3051,6 +2938,7 @@
-Options:
- -d <delay> add a delay before rebooting
- -f <config> restore configuration from .tar.gz (file or url)
+- -g gziped image
- -i interactive mode
- -n do not save configuration over reflash
- -q less verbose
@@ -3117,12 +3005,16 @@
-fi
-run_hooks "" $sysupgrade_pre_upgrade
-
--v "Switching to ramdisk..."
--run_ramfs '. /etc/functions.sh; include /lib/upgrade; do_upgrade'
+-if [ -n "$(rootfs_type)" ]; then
+- v "Switching to ramdisk..."
+- run_ramfs '. /etc/functions.sh; include /lib/upgrade; do_upgrade'
+-else
+- do_upgrade
+-fi
diff -Naur a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
---- a/package/base-files/files/sbin/wifi 2008-10-29 17:26:49.127150000 +0000
+--- a/package/base-files/files/sbin/wifi 2009-04-09 20:16:01.208626000 +0000
+++ b/package/base-files/files/sbin/wifi 1970-01-01 00:00:00.000000000 +0000
-@@ -1,124 +0,0 @@
+@@ -1,160 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
-
@@ -3159,7 +3051,42 @@
- [ "$iftype" = bridge ] && config_get "$cfg" ifname
-)}
-
+-wifi_fixup_hwmode() {
+- local device="$1"
+- local default="$2"
+- local hwmode hwmode_11n
-
+- config_get channel "$device" channel
+- config_get hwmode "$device" hwmode
+- case "$hwmode" in
+- 11bg) hwmode=bg;;
+- 11a) hwmode=a;;
+- 11b) hwmode=b;;
+- 11g) hwmode=g;;
+- 11n*)
+- hwmode_11n="${hwmode##11n}"
+- case "$hwmode" in
+- a|g) ;;
+- default) hwmode_11n="$default"
+- esac
+- config_set "$device" hwmode_11n "$hwmode_11n"
+- ;;
+- *)
+- hwmode=
+- if [ "${channel:-0}" -gt 0 ]; then
+- if [ "${channel:-0}" -gt 14 ]; then
+- hwmode=a
+- else
+- hwmode=g
+- fi
+- else
+- hwmode="$default"
+- fi
+- ;;
+- esac
+- config_set "$device" hwmode "$hwmode"
+-}
+-
-wifi_updown() {
- [ enable = "$1" ] && wifi_updown disable "$2"
- for device in ${2:-$DEVICES}; do (
@@ -3191,11 +3118,12 @@
-start_net() {(
- local iface="$1"
- local config="$2"
+- local vifmac="$3"
-
- [ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null
- include /lib/network
- scan_interfaces
-- setup_interface "$1" "$2"
+- setup_interface "$iface" "$config" "" "$vifmac"
-)}
-
-set_wifi_up() {
@@ -3319,53 +3247,3 @@
- for(;x<3;ret=and(ip,255)"."ret,ip=rshift(ip,8),x++);
- return ret
-}
-diff -Naur a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script
---- a/package/base-files/files/usr/share/udhcpc/default.script 2008-09-23 17:29:22.613179000 +0000
-+++ b/package/base-files/files/usr/share/udhcpc/default.script 2009-02-01 09:33:35.367711776 +0000
-@@ -1,33 +1,11 @@
- #!/bin/sh
- [ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1
--. /etc/functions.sh
--include /lib/network
-
- RESOLV_CONF="/tmp/resolv.conf.auto"
-
--hotplug_event() {
-- scan_interfaces
-- for ifc in $interfaces; do
-- config_get ifname $ifc ifname
-- [ "$ifname" = "$interface" ] || continue
--
-- config_get proto $ifc proto
-- [ "$proto" = "dhcp" ] || continue
-- [ ifup = "$1" ] && {
-- uci_set_state network "$ifc" ipaddr "$ip"
-- uci_set_state network "$ifc" netmask "${subnet:-255.255.255.0}"
-- uci_set_state network "$ifc" dnsdomain "$domain"
-- uci_set_state network "$ifc" dns "$dns"
-- uci_set_state network "$ifc" gateway "$router"
-- }
-- env -i ACTION="$1" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
-- done
--}
--
- case "$1" in
- deconfig)
- ifconfig $interface 0.0.0.0
-- hotplug_event ifdown
- ;;
- renew|bound)
- ifconfig $interface $ip \
-@@ -56,12 +34,6 @@
- mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF"
- }
-
-- if [ "$1" = "renew" ]; then
-- hotplug_event update
-- else
-- hotplug_event ifup
-- fi
--
- # user rules
- [ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
- ;;
Modified: torvm/trunk/build/kamikaze/patches/003-kamikaze-kernel-config.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/003-kamikaze-kernel-config.patch 2009-05-31 21:30:32 UTC (rev 19604)
+++ torvm/trunk/build/kamikaze/patches/003-kamikaze-kernel-config.patch 2009-05-31 23:12:42 UTC (rev 19605)
@@ -1,276 +1,235 @@
-diff -Naur a/target/linux/x86/Makefile b/target/linux/x86/Makefile
---- a/target/linux/x86/Makefile 2009-01-25 18:33:19.619997000 +0000
-+++ b/target/linux/x86/Makefile 2009-02-03 10:06:14.111344504 +0000
-@@ -9,13 +9,13 @@
- ARCH=i386
- BOARD:=x86
- BOARDNAME:=x86
--FEATURES:=squashfs jffs2 ext2 vdi vmdk
-+FEATURES:=ext2
- SUBTARGETS=generic
-
- LINUX_VERSION:=2.6.27.13
-
- include $(INCLUDE_DIR)/target.mk
--DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci
-+DEFAULT_PACKAGES +=
-
- $(eval $(call BuildTarget))
-
-diff -Naur a/target/linux/x86/config-2.6.26 b/target/linux/x86/config-2.6.26
---- a/target/linux/x86/config-2.6.26 2008-11-25 13:52:25.936515000 +0000
-+++ b/target/linux/x86/config-2.6.26 2009-03-14 19:17:34.353969136 +0000
-@@ -1,11 +1,8 @@
-+CONFIG_LOCALVERSION="-torvm"
-+CONFIG_LOG_BUF_SHIFT=17
- # CONFIG_3C515 is not set
--CONFIG_4KSTACKS=y
+diff -Naur a/target/linux/x86/config-2.6.28 b/target/linux/x86/config-2.6.28
+--- a/target/linux/x86/config-2.6.28 2009-05-15 10:40:04.149461000 +0000
++++ b/target/linux/x86/config-2.6.28 2009-05-31 22:30:50.832743731 +0000
+@@ -2,7 +2,6 @@
+ CONFIG_4KSTACKS=y
# CONFIG_60XX_WDT is not set
# CONFIG_64BIT is not set
--CONFIG_8139TOO=m
--# CONFIG_8139TOO_8129 is not set
--CONFIG_8139TOO_PIO=y
--# CONFIG_8139TOO_TUNE_TWISTER is not set
- # CONFIG_8139_OLD_RX_RESET is not set
+-# CONFIG_8139TOO is not set
# CONFIG_AC3200 is not set
- CONFIG_AC97_BUS=m
-@@ -17,27 +14,21 @@
- # CONFIG_ALIM7101_WDT is not set
- # CONFIG_APRICOT is not set
- CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
--CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+ # CONFIG_ACQUIRE_WDT is not set
+ # CONFIG_ADVANTECH_WDT is not set
+@@ -14,25 +13,28 @@
CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
CONFIG_ARCH_HAS_CPU_RELAX=y
- # CONFIG_ARCH_HAS_ILOG2_U32 is not set
- # CONFIG_ARCH_HAS_ILOG2_U64 is not set
+ CONFIG_ARCH_HAS_DEFAULT_IDLE=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set
- CONFIG_ARCH_MAY_HAVE_PC_FDC=y
++# CONFIG_ARCH_MAY_HAVE_PC_FDC is not set
+ # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
CONFIG_ARCH_POPULATES_NODE_MAP=y
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
- CONFIG_ARCH_SUPPORTS_AOUT=y
--CONFIG_ARCH_SUPPORTS_MSI=y
--CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
++CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+ CONFIG_ARCH_SUPPORTS_MSI=y
+ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
++CONFIG_ARCH_WANT_FRAME_POINTERS=y
+ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
# CONFIG_AT1700 is not set
--CONFIG_ATA=m
--# CONFIG_ATA_NONSTANDARD is not set
# CONFIG_AUDIT_ARCH is not set
CONFIG_BASE_SMALL=0
- # CONFIG_BINFMT_AOUT is not set
--CONFIG_BINFMT_MISC=y
+-# CONFIG_BINFMT_AOUT is not set
++# CONFIG_BINARY_PRINTF is not set
+ CONFIG_BINFMT_MISC=y
CONFIG_BITREVERSE=y
# CONFIG_BLK_DEV_4DRIVES is not set
# CONFIG_BLK_DEV_ALI14XX is not set
-@@ -47,44 +38,21 @@
- CONFIG_BLK_DEV_IDE=y
- CONFIG_BLK_DEV_IDEDISK=y
- CONFIG_BLK_DEV_IDEDMA=y
--CONFIG_BLK_DEV_IDEDMA_PCI=y
+ CONFIG_BLK_DEV_AMD74XX=y
++# CONFIG_BLK_DEV_CS5536 is not set
+ # CONFIG_BLK_DEV_DTC2278 is not set
+ CONFIG_BLK_DEV_GENERIC=y
+ # CONFIG_BLK_DEV_HT6560B is not set
+@@ -40,6 +42,7 @@
+ CONFIG_BLK_DEV_IDEDMA_PCI=y
CONFIG_BLK_DEV_IDEDMA_SFF=y
CONFIG_BLK_DEV_IDEPCI=y
++# CONFIG_BLK_DEV_IT8172 is not set
+ CONFIG_BLK_DEV_PIIX=y
# CONFIG_BLK_DEV_QD65XX is not set
--CONFIG_BLK_DEV_SC1200=y
- # CONFIG_BLK_DEV_UMC8672 is not set
--CONFIG_BLK_DEV_VIA82CXXX=y
+ CONFIG_BLK_DEV_SC1200=y
+@@ -47,11 +50,11 @@
+ CONFIG_BLK_DEV_VIA82CXXX=y
# CONFIG_BLK_DEV_XD is not set
CONFIG_BOUNCE=y
--# CONFIG_BT_HIDP is not set
- CONFIG_CLASSIC_RCU=y
+-CONFIG_CLASSIC_RCU=y
++# CONFIG_CC_STACKPROTECTOR is not set
CONFIG_CLOCKSOURCE_WATCHDOG=y
+ # CONFIG_CMDLINE_BOOL is not set
CONFIG_COMPAT_VDSO=y
+-CONFIG_CONSOLE_TRANSLATIONS=y
++# CONFIG_CONSOLE_TRANSLATIONS is not set
# CONFIG_CPU5_WDT is not set
--CONFIG_CPU_FREQ=y
--# CONFIG_CPU_FREQ_DEBUG is not set
--# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
--# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
--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_GOV_CONSERVATIVE is not set
--# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
--CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
--# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
--# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
--CONFIG_CPU_FREQ_STAT=y
--CONFIG_CPU_FREQ_STAT_DETAILS=y
--CONFIG_CPU_FREQ_TABLE=y
- # CONFIG_CPU_IDLE is not set
--CONFIG_CRYPTO_AES_586=m
--CONFIG_CRYPTO_GF128MUL=m
--# CONFIG_CRYPTO_SALSA20_586 is not set
--CONFIG_CRYPTO_TWOFISH_586=m
+ CONFIG_CPU_FREQ=y
+ # CONFIG_CPU_FREQ_DEBUG is not set
+@@ -69,7 +72,7 @@
+ CONFIG_CPU_FREQ_STAT_DETAILS=y
+ CONFIG_CPU_FREQ_TABLE=y
+ CONFIG_CPU_SUP_AMD=y
+-CONFIG_CPU_SUP_CENTAUR_32=y
++CONFIG_CPU_SUP_CENTAUR=y
+ CONFIG_CPU_SUP_CYRIX_32=y
+ CONFIG_CPU_SUP_INTEL=y
+ CONFIG_CPU_SUP_TRANSMETA_32=y
+@@ -77,12 +80,16 @@
# CONFIG_CS5535_GPIO is not set
# CONFIG_CS89x0 is not set
# CONFIG_DCDBAS is not set
-CONFIG_DEBUG_BUGVERBOSE=y
+-CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_BUGVERBOSE is not set
++# CONFIG_DEBUG_MEMORY_INIT is not set
++CONFIG_DECOMPRESS_BZIP2=y
++CONFIG_DECOMPRESS_GZIP=y
++CONFIG_DECOMPRESS_LZMA=y
CONFIG_DEFAULT_IO_DELAY_TYPE=0
# CONFIG_DELL_RBU is not set
# CONFIG_DEPCA is not set
-@@ -95,10 +63,6 @@
+ CONFIG_DEVPORT=y
++# CONFIG_DMA_API_DEBUG is not set
+ CONFIG_DMI=y
+ # CONFIG_DMIID is not set
CONFIG_DNOTIFY=y
- CONFIG_DOUBLEFAULT=y
- CONFIG_DUMMY_CONSOLE=y
--CONFIG_E1000=m
--# CONFIG_E1000E_ENABLED is not set
--# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
--CONFIG_E1000_NAPI=y
- CONFIG_EARLY_PRINTK=y
- # CONFIG_EDAC is not set
- # CONFIG_EDD is not set
-@@ -114,36 +78,28 @@
- CONFIG_EXT2_FS=y
- CONFIG_FAST_CMPXCHG_LOCAL=y
+@@ -106,6 +113,8 @@
+ CONFIG_FIRMWARE_IN_KERNEL=y
+ CONFIG_FIRMWARE_MEMMAP=y
CONFIG_FIX_EARLYCON_MEM=y
--CONFIG_FS_POSIX_ACL=y
++# CONFIG_FRAME_POINTER is not set
++# CONFIG_FTRACE_SYSCALLS is not set
CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
- CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+@@ -113,7 +122,9 @@
CONFIG_GENERIC_CMOS_UPDATE=y
# CONFIG_GENERIC_CPU is not set
--CONFIG_GENERIC_FIND_FIRST_BIT=y
--CONFIG_GENERIC_FIND_NEXT_BIT=y
- # CONFIG_GENERIC_GPIO is not set
+ CONFIG_GENERIC_FIND_FIRST_BIT=y
++CONFIG_GENERIC_FIND_LAST_BIT=y
+ CONFIG_GENERIC_FIND_NEXT_BIT=y
++CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_ISA_DMA=y
- # CONFIG_GENERIC_LOCKBREAK is not set
--CONFIG_GENERIC_PENDING_IRQ=y
# CONFIG_GENERIC_TIME_VSYSCALL is not set
- # CONFIG_HANGCHECK_TIMER is not set
- CONFIG_HAS_DMA=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_IOPORT=y
--CONFIG_HAVE_ARCH_KGDB=y
--# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
--# CONFIG_HAVE_DMA_ATTRS is not set
+@@ -126,36 +137,46 @@
+ CONFIG_HAVE_ARCH_TRACEHOOK=y
+ CONFIG_HAVE_ATOMIC_IOMAP=y
+ # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
++CONFIG_HAVE_DMA_API_DEBUG=y
+ CONFIG_HAVE_DYNAMIC_FTRACE=y
++CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y
+ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
++CONFIG_HAVE_FTRACE_SYSCALLS=y
++CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+ CONFIG_HAVE_FUNCTION_TRACER=y
++CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_HAVE_IDE=y
+ CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_SETUP_PER_CPU_AREA=y
--CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+-# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
++CONFIG_HAVE_KERNEL_BZIP2=y
++CONFIG_HAVE_KERNEL_GZIP=y
++CONFIG_HAVE_KERNEL_LZMA=y
+# CONFIG_HAVE_KPROBES is not set
+# CONFIG_HAVE_KRETPROBES is not set
+# CONFIG_HAVE_KVM is not set
++# CONFIG_HAVE_KVM_IRQCHIP is not set
+# CONFIG_HAVE_LATENCYTOP_SUPPORT is not set
++CONFIG_HAVE_MLOCK=y
++# CONFIG_HAVE_MMIOTRACE_SUPPORT is not set
+# CONFIG_HAVE_OPROFILE is not set
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
++CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
CONFIG_HID=y
+-CONFIG_HID_COMPAT=y
CONFIG_HID_SUPPORT=y
# CONFIG_HIGHMEM4G is not set
-@@ -153,19 +109,7 @@
+ # CONFIG_HIGHMEM64G is not set
+-# CONFIG_HIGH_RES_TIMERS is not set
+-# CONFIG_HPET_TIMER is not set
++CONFIG_HIGH_RES_TIMERS=y
++CONFIG_HPET_TIMER=y
# CONFIG_HP_WATCHDOG is not set
CONFIG_HT_IRQ=y
# CONFIG_HUGETLBFS is not set
--CONFIG_HWMON=m
--# CONFIG_HWMON_DEBUG_CHIP is not set
--CONFIG_HWMON_VID=m
CONFIG_HW_CONSOLE=y
-CONFIG_HW_RANDOM=y
--# CONFIG_HW_RANDOM_AMD is not set
++# CONFIG_HW_RANDOM is not set
+ # CONFIG_HW_RANDOM_AMD is not set
-CONFIG_HW_RANDOM_GEODE=y
--# CONFIG_HW_RANDOM_INTEL is not set
++# CONFIG_HW_RANDOM_GEODE is not set
+ # CONFIG_HW_RANDOM_INTEL is not set
-CONFIG_HW_RANDOM_VIA=y
--CONFIG_I2C=m
--CONFIG_I2C_ALGOBIT=m
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=m
++# CONFIG_HW_RANDOM_VIA is not set
+ # CONFIG_I2C is not set
# CONFIG_I6300ESB_WDT is not set
- # CONFIG_I82365 is not set
# CONFIG_I8K is not set
-@@ -178,17 +122,15 @@
- # CONFIG_IBM_NEW_EMAC_ZMII is not set
- CONFIG_IDE=y
- CONFIG_IDEPCI_PCIBUS_ORDER=y
-+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
+@@ -170,7 +191,7 @@
CONFIG_IDE_GENERIC=y
# CONFIG_IDE_PROC_FS is not set
- CONFIG_INITRAMFS_SOURCE=""
+ CONFIG_IDE_TIMINGS=y
+-CONFIG_INITRAMFS_SOURCE=""
++CONFIG_IDE_XFER_MODE=y
CONFIG_INPUT=y
-+CONFIG_INPUT_APANEL=n
- # CONFIG_INPUT_EVDEV is not set
CONFIG_INPUT_KEYBOARD=y
--CONFIG_INPUT_MOUSE=y
--CONFIG_INPUT_MOUSEDEV=y
--CONFIG_INPUT_MOUSEDEV_PSAUX=y
--CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
--CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-+# CONFIG_INPUT_MOUSE is not set
+ CONFIG_INPUT_MOUSE=y
+@@ -178,6 +199,8 @@
+ CONFIG_INPUT_MOUSEDEV_PSAUX=y
+ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
++# CONFIG_INPUT_YEALINK is not set
++# CONFIG_IOMMU_API is not set
# CONFIG_IOMMU_HELPER is not set
CONFIG_IO_DELAY_0X80=y
# CONFIG_IO_DELAY_0XED is not set
-@@ -198,18 +140,14 @@
- CONFIG_IO_DELAY_TYPE_NONE=3
- CONFIG_IO_DELAY_TYPE_UDELAY=2
- # CONFIG_IO_DELAY_UDELAY is not set
--CONFIG_IPV6_NDISC_NODETYPE=y
- # CONFIG_IPWIRELESS is not set
- CONFIG_IRQBALANCE=y
- CONFIG_ISA=y
- CONFIG_ISAPNP=y
- CONFIG_ISA_DMA_API=y
--# CONFIG_ISCSI_IBFT_FIND is not set
- # CONFIG_IT8712F_WDT is not set
+@@ -195,6 +218,9 @@
+ # CONFIG_IT87_WDT is not set
# CONFIG_ITCO_WDT is not set
--# CONFIG_IWLWIFI_LEDS is not set
CONFIG_KALLSYMS=y
--CONFIG_KEXEC=y
++# CONFIG_KERNEL_BZIP2 is not set
++CONFIG_KERNEL_GZIP=y
++# CONFIG_KERNEL_LZMA is not set
+ CONFIG_KEXEC=y
CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_LKKBD is not set
- # CONFIG_KEYBOARD_NEWTON is not set
-@@ -222,14 +160,9 @@
- # CONFIG_LATENCYTOP is not set
- # CONFIG_LEDS_ALIX is not set
+@@ -204,13 +230,15 @@
+ # CONFIG_KEYBOARD_XTKBD is not set
+ CONFIG_KTIME_SCALAR=y
+ # CONFIG_LANCE is not set
++# CONFIG_LEDS_ALIX2 is not set
# CONFIG_LEDS_CLEVO_MAIL is not set
--CONFIG_LEDS_NET48XX=m
-+# CONFIG_LEDS_NET48XX is not set
- # CONFIG_LEDS_WRAP is not set
--CONFIG_LOCK_KERNEL=y
-CONFIG_M386=y
++# CONFIG_LIB80211 is not set
++# CONFIG_M386 is not set
# CONFIG_M486 is not set
--# CONFIG_M586 is not set
--# CONFIG_M586MMX is not set
--# CONFIG_M586TSC is not set
- # CONFIG_M686 is not set
+ # CONFIG_M586 is not set
+ # CONFIG_M586MMX is not set
+ # CONFIG_M586TSC is not set
+-# CONFIG_M686 is not set
++CONFIG_M686=y
# CONFIG_MACHZ_WDT is not set
# CONFIG_MACINTOSH_DRIVERS is not set
-@@ -239,31 +172,22 @@
- # CONFIG_MCRUSOE is not set
- # CONFIG_MCYRIXIII is not set
- # CONFIG_MDA_CONSOLE is not set
--CONFIG_MEDIA_TUNER=m
--CONFIG_MEDIA_TUNER_MT20XX=m
--CONFIG_MEDIA_TUNER_SIMPLE=m
--CONFIG_MEDIA_TUNER_TDA8290=m
--CONFIG_MEDIA_TUNER_TDA9887=m
--CONFIG_MEDIA_TUNER_TEA5761=m
--CONFIG_MEDIA_TUNER_TEA5767=m
--CONFIG_MEDIA_TUNER_XC2028=m
--CONFIG_MEDIA_TUNER_XC5000=m
- # CONFIG_MEFFICEON is not set
-+# CONFIG_MEMSTICK is not set
- # CONFIG_MGEODEGX1 is not set
- # CONFIG_MGEODE_LX is not set
--CONFIG_MICROCODE=y
--CONFIG_MICROCODE_OLD_INTERFACE=y
-+# CONFIG_MICROCODE is not set
- # CONFIG_MIXCOMWD is not set
+ CONFIG_MATH_EMULATION=y
+@@ -231,15 +259,16 @@
# CONFIG_MK6 is not set
# CONFIG_MK7 is not set
# CONFIG_MK8 is not set
++# CONFIG_MMIOTRACE is not set
+ # CONFIG_MOUSE_BCM5974 is not set
-CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_PS2_ALPS=y
++# CONFIG_MOUSE_PS2 is not set
++# CONFIG_MOUSE_PS2_ALPS is not set
+ # CONFIG_MOUSE_PS2_ELANTECH is not set
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-+# CONFIG_MOUSE_PS2 is not set
-+# CONFIG_MOUSE_PS2_ALPS=y
+# CONFIG_MOUSE_PS2_LIFEBOOK is not set
+# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
@@ -280,1427 +239,375 @@
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_VSXXXAA is not set
# CONFIG_MPENTIUM4 is not set
-@@ -271,42 +195,6 @@
- # CONFIG_MPENTIUMIII is not set
- # CONFIG_MPENTIUMM is not set
- # CONFIG_MPSC is not set
--CONFIG_MTD=y
--# CONFIG_MTD_ABSENT is not set
--CONFIG_MTD_BLKDEVS=y
--CONFIG_MTD_BLOCK=y
--CONFIG_MTD_BLOCK2MTD=y
--# CONFIG_MTD_CFI is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--CONFIG_MTD_CHAR=y
--# CONFIG_MTD_CMDLINE_PARTS is not set
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_CONCAT is not set
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_ONENAND is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_PLATRAM is not set
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_REDBOOT_PARTS is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_TS5500 is not set
- CONFIG_MTRR=y
- # CONFIG_MVIAC3_2 is not set
- # CONFIG_MVIAC7 is not set
-@@ -314,25 +202,15 @@
- # CONFIG_MWINCHIP3D is not set
+@@ -259,10 +288,13 @@
# CONFIG_MWINCHIPC6 is not set
CONFIG_NAMESPACES=y
--CONFIG_NATSEMI=m
--CONFIG_NE2K_PCI=m
--CONFIG_NET_VENDOR_3COM=y
+ # CONFIG_NATSEMI is not set
++# CONFIG_NET_NS is not set
+ CONFIG_NET_VENDOR_3COM=y
# CONFIG_NET_VENDOR_RACAL is not set
# CONFIG_NET_VENDOR_SMC is not set
++CONFIG_NLATTR=y
CONFIG_NOHIGHMEM=y
--# CONFIG_NONPROMISC_DEVMEM is not set
--CONFIG_NR_CPUS=8
--CONFIG_NSC_GPIO=m
-+# CONFIG_NR_CPUS is not set
++CONFIG_NR_CPUS=1
+ # CONFIG_NSC_GPIO is not set
CONFIG_NVRAM=y
--# CONFIG_OCF_OCF is not set
--# CONFIG_OLPC is not set
--CONFIG_PAGEFLAGS_EXTENDED=y
- CONFIG_PAGE_OFFSET=0xC0000000
- # CONFIG_PARAVIRT_GUEST is not set
--CONFIG_PC8736x_GPIO=m
-+# CONFIG_PATA_CS5536 is not set
- # CONFIG_PC87413_WDT is not set
--CONFIG_PCCARD=m
--CONFIG_PCCARD_NONSTATIC=m
- CONFIG_PCI=y
- # CONFIG_PCIEPORTBUS is not set
- # CONFIG_PCIPCWATCHDOG is not set
-@@ -343,13 +221,7 @@
- # CONFIG_PCI_GOBIOS is not set
+ # CONFIG_OLPC is not set
+@@ -282,26 +314,30 @@
# CONFIG_PCI_GODIRECT is not set
# CONFIG_PCI_GOMMCONFIG is not set
--# CONFIG_PCI_GOOLPC is not set
--CONFIG_PCMCIA=m
--CONFIG_PCMCIA_IOCTL=y
--CONFIG_PCMCIA_LOAD_CIS=y
--CONFIG_PCMCIA_PROBE=y
--CONFIG_PCNET32=m
+ # CONFIG_PCI_GOOLPC is not set
-CONFIG_PCSPKR_PLATFORM=y
-+# CONFIG_PCMCIA is not set
++# CONFIG_PCI_STUB is not set
++# CONFIG_PCSPKR_PLATFORM is not set
# CONFIG_PCWATCHDOG is not set
CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_PHYSICAL_START=0x100000
-@@ -361,102 +233,62 @@
+ CONFIG_PNP=y
+ # CONFIG_PNPACPI is not set
+ # CONFIG_PNPBIOS is not set
+-CONFIG_PNP_DEBUG_MESSAGES=y
+-CONFIG_PROC_PAGE_MONITOR=y
++# CONFIG_PNP_DEBUG_MESSAGES is not set
++# CONFIG_POWER_TRACER is not set
++# CONFIG_PROC_PAGE_MONITOR is not set
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
- # CONFIG_R6040 is not set
+-# CONFIG_R6040 is not set
++CONFIG_RD_BZIP2=y
++CONFIG_RD_GZIP=y
# CONFIG_RELOCATABLE is not set
--CONFIG_RFKILL_LEDS=y
CONFIG_RTC=y
--CONFIG_RWSEM_GENERIC_SPINLOCK=y
--# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
++# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
# CONFIG_SBC7240_WDT is not set
# CONFIG_SBC8360_WDT is not set
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
--CONFIG_SC1200_WDT=m
-+# CONFIG_SC1200_WDT is not set
+ # CONFIG_SC1200_WDT is not set
# CONFIG_SC520_WDT is not set
- # CONFIG_SCC is not set
# CONFIG_SCHED_HRTICK is not set
- CONFIG_SCHED_MC=y
- CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_SCHED_SMT=y
--# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
--CONFIG_SCSI_WAIT_SCAN=m
--CONFIG_SCx200=y
--CONFIG_SCx200HR_TIMER=y
--CONFIG_SCx200_ACB=m
--CONFIG_SCx200_GPIO=m
--CONFIG_SCx200_I2C=m
--CONFIG_SCx200_I2C_SCL=12
--CONFIG_SCx200_I2C_SDA=13
--CONFIG_SCx200_WDT=m
-+# CONFIG_SCHED_SMT is not set
-+# CONFIG_SEMAPHORE_SLEEPERS is not set
- # CONFIG_SENSORS_FSCHMD is not set
--CONFIG_SENSORS_PC87360=m
-+# CONFIG_SENSORS_PC87360 is not set
- # CONFIG_SERIAL_8250_CS is not set
- # CONFIG_SERIAL_8250_EXTENDED is not set
--CONFIG_SERIAL_8250_PCI=y
--CONFIG_SERIAL_8250_PNP=y
--CONFIG_SERIO=y
--# CONFIG_SERIO_CT82C710 is not set
--CONFIG_SERIO_I8042=y
--CONFIG_SERIO_LIBPS2=y
--# CONFIG_SERIO_PCIPS2 is not set
--# CONFIG_SERIO_RAW is not set
--CONFIG_SERIO_SERPORT=y
-+# CONFIG_SERIAL_8250_PCI is not set
-+# CONFIG_SERIAL_8250_PNP is not set
-+# CONFIG_SERIO is not set
- CONFIG_SLABINFO=y
--CONFIG_SLUB_DEBUG=y
--# CONFIG_SLUB_DEBUG_ON is not set
--# CONFIG_SLUB_STATS is not set
--CONFIG_SMP=y
-+# CONFIG_SMP is not set
+-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
++CONFIG_SCHED_OMIT_FRAME_POINTER=y
+ # CONFIG_SCSI_DMA is not set
+ CONFIG_SCx200=y
+ CONFIG_SCx200HR_TIMER=y
+@@ -318,26 +354,29 @@
+ # CONFIG_SERIO_RAW is not set
+ CONFIG_SERIO_SERPORT=y
+ # CONFIG_SLAB is not set
++# CONFIG_SLOW_WORK is not set
+ CONFIG_SLUB=y
+ CONFIG_SLUB_DEBUG=y
+ # CONFIG_SLUB_DEBUG_ON is not set
+ # CONFIG_SLUB_STATS is not set
+ # CONFIG_SMP is not set
# CONFIG_SMSC37B787_WDT is not set
--CONFIG_SND_AC97_CODEC=m
--CONFIG_SND_HDA_CODEC_ANALOG=y
--CONFIG_SND_HDA_CODEC_ATIHDMI=y
--CONFIG_SND_HDA_CODEC_CMEDIA=y
--CONFIG_SND_HDA_CODEC_CONEXANT=y
--CONFIG_SND_HDA_CODEC_REALTEK=y
--CONFIG_SND_HDA_CODEC_SI3054=y
--CONFIG_SND_HDA_CODEC_SIGMATEL=y
--CONFIG_SND_HDA_CODEC_VIA=y
--CONFIG_SND_HDA_GENERIC=y
--# CONFIG_SND_HDA_HWDEP is not set
--CONFIG_SND_HDA_INTEL=m
--# CONFIG_SND_HDA_POWER_SAVE is not set
--CONFIG_SND_INTEL8X0=m
--# CONFIG_SND_SC6000 is not set
--# CONFIG_SND_SIS7019 is not set
--CONFIG_SND_VMASTER=y
--CONFIG_SOFT_WATCHDOG=m
++# CONFIG_SMSC_SCH311X_WDT is not set
# CONFIG_SONYPI is not set
CONFIG_SPARSEMEM_STATIC=y
- # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
- CONFIG_SSB_POSSIBLE=y
--CONFIG_STOP_MACHINE=y
- CONFIG_SYSVIPC_SYSCTL=y
- # CONFIG_TCIC is not set
++# CONFIG_SPARSE_IRQ is not set
+ CONFIG_STRICT_DEVMEM=y
+ # CONFIG_SYSPROF_TRACER is not set
# CONFIG_TELCLOCK is not set
--# CONFIG_TICK_ONESHOT is not set
-+# CONFIG_THERMAL is not set
# CONFIG_TOSHIBA is not set
++# CONFIG_TRACING_SUPPORT is not set
# CONFIG_TYPHOON is not set
CONFIG_UID16=y
--CONFIG_USB=m
--CONFIG_USB_EHCI_HCD=m
-+# CONFIG_USB is not set
-+# CONFIG_USBPCWATCHDOG is not set
-+# CONFIG_USB_EHCI_HCD is not set
- # CONFIG_USB_NET_DM9601 is not set
- # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
- # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
--CONFIG_USB_OHCI_HCD=m
-+# CONFIG_USB_OHCI_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
- # CONFIG_USB_SERIAL_OTI6858 is not set
-CONFIG_USB_SUPPORT=y
--CONFIG_USB_UHCI_HCD=m
-+# CONFIG_USB_UHCI_HCD is not set
++# CONFIG_USB_SUPPORT is not set
# CONFIG_USER_NS is not set
++CONFIG_USER_STACKTRACE_SUPPORT=y
# CONFIG_VGACON_SOFT_SCROLLBACK is not set
- # CONFIG_VGASTATE is not set
+-# CONFIG_VGASTATE is not set
CONFIG_VGA_CONSOLE=y
--CONFIG_VIA_RHINE=m
--CONFIG_VIA_RHINE_MMIO=y
--CONFIG_VIA_RHINE_NAPI=y
--CONFIG_VIDEO_MEDIA=m
-+# CONFIG_VIA_RHINE is not set
-+# CONFIG_VIA_RHINE_MMIO is not set
-+# CONFIG_VIA_RHINE_NAPI is not set
- # CONFIG_VIDEO_SELECT is not set
--CONFIG_VIDEO_V4L2=m
--CONFIG_VIDEO_V4L2_COMMON=m
-+# CONFIG_VIDEO_V4L2_COMMON is not set
-+# CONFIG_VIRTUALIZATION is not set
+-# CONFIG_VIA_RHINE is not set
CONFIG_VM86=y
CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_VORTEX=m
-+# CONFIG_VORTEX is not set
- CONFIG_VT=y
- CONFIG_VT_CONSOLE=y
- # CONFIG_VT_HW_CONSOLE_BINDING is not set
-@@ -464,58 +296,416 @@
+ # CONFIG_VORTEX is not set
+@@ -349,23 +388,25 @@
# CONFIG_WDT is not set
CONFIG_X86=y
CONFIG_X86_32=y
--CONFIG_X86_32_SMP=y
++CONFIG_X86_32_LAZY_GS=y
# CONFIG_X86_64 is not set
- # CONFIG_X86_BIGSMP is not set
- CONFIG_X86_BIOS_REBOOT=y
--# CONFIG_X86_CMPXCHG is not set
--CONFIG_X86_CPU=y
+-CONFIG_X86_BIOS_REBOOT=y
+ # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+ # CONFIG_X86_CMPXCHG is not set
+ CONFIG_X86_CPU=y
# CONFIG_X86_CPUFREQ_NFORCE2 is not set
# CONFIG_X86_CPUID is not set
++# CONFIG_X86_CPU_DEBUG is not set
# CONFIG_X86_ELAN is not set
- # CONFIG_X86_ES7000 is not set
++CONFIG_X86_EXTENDED_PLATFORM=y
# CONFIG_X86_E_POWERSAVER is not set
CONFIG_X86_F00F_BUG=y
-CONFIG_X86_FIND_SMP_CONFIG=y
CONFIG_X86_GENERIC=y
- # CONFIG_X86_GENERICARCH is not set
--CONFIG_X86_GX_SUSPMOD=m
--CONFIG_X86_HT=y
-+# CONFIG_X86_GX_SUSPMOD is not set
+-# CONFIG_X86_GENERICARCH is not set
+ # CONFIG_X86_GX_SUSPMOD is not set
CONFIG_X86_INTEL_USERCOPY=y
++CONFIG_X86_INTERNODE_CACHE_BYTES=64
CONFIG_X86_IO_APIC=y
- CONFIG_X86_L1_CACHE_SHIFT=7
+-CONFIG_X86_L1_CACHE_SHIFT=7
++CONFIG_X86_L1_CACHE_BYTES=64
++CONFIG_X86_L1_CACHE_SHIFT=4
CONFIG_X86_LOCAL_APIC=y
# CONFIG_X86_LONGRUN is not set
--CONFIG_X86_MCE=y
-+# CONFIG_X86_MCE is not set
- # CONFIG_X86_MCE_NONFATAL is not set
- # CONFIG_X86_MCE_P4THERMAL is not set
--CONFIG_X86_MINIMUM_CPU_FAMILY=3
- CONFIG_X86_MPPARSE=y
- # CONFIG_X86_MSR is not set
- # CONFIG_X86_NUMAQ is not set
+ CONFIG_X86_MCE=y
+@@ -377,13 +418,13 @@
# CONFIG_X86_P4_CLOCKMOD is not set
# CONFIG_X86_PAE is not set
--CONFIG_X86_PAT=y
- CONFIG_X86_PC=y
-+CONFIG_M586=y
+ CONFIG_X86_PAT=y
+-CONFIG_X86_PC=y
++CONFIG_X86_PLATFORM_DEVICES=y
# CONFIG_X86_POWERNOW_K6 is not set
# CONFIG_X86_POWERNOW_K7 is not set
- # CONFIG_X86_POWERNOW_K8 is not set
--CONFIG_X86_PPRO_FENCE=y
+-# CONFIG_X86_POWERNOW_K8 is not set
+ CONFIG_X86_PPRO_FENCE=y
# CONFIG_X86_RDC321X is not set
--# CONFIG_X86_REBOOTFIXUPS is not set
--CONFIG_X86_SMP=y
+ # CONFIG_X86_REBOOTFIXUPS is not set
++CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+ CONFIG_X86_RESERVE_LOW_64K=y
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
# CONFIG_X86_SPEEDSTEP_ICH is not set
- # CONFIG_X86_SPEEDSTEP_LIB is not set
- # CONFIG_X86_SPEEDSTEP_SMI is not set
- # CONFIG_X86_SUMMIT is not set
--CONFIG_X86_TRAMPOLINE=y
- # CONFIG_X86_VISWS is not set
- # CONFIG_X86_VOYAGER is not set
- # CONFIG_X86_VSMP is not set
--CONFIG_YENTA_ENE_TUNE=y
--CONFIG_YENTA_O2=y
--CONFIG_YENTA_RICOH=y
--CONFIG_YENTA_TI=y
--CONFIG_YENTA_TOSHIBA=y
-+# CONFIG_ZONE_DMA32 is not setQ
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_TICK_ONESHOT=y
+@@ -392,6 +433,240 @@
+ CONFIG_X86_UP_APIC=y
+ CONFIG_X86_UP_IOAPIC=y
+ CONFIG_X86_VERBOSE_BOOTUP=y
+-# CONFIG_X86_VOYAGER is not set
+-# CONFIG_X86_VSMP is not set
+ # CONFIG_ZONE_DMA32 is not set
++CONFIG_X86_PC=y
++# CONFIG_X86_ELAN is not set
++# CONFIG_X86_VOYAGER is not set
++# CONFIG_X86_GENERICARCH is not set
++CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
++# CONFIG_X86_POWERNOW_K8 is not set
++CONFIG_BINFMT_AOUT=y
++CONFIG_LOCALVERSION="torvm"
++CONFIG_LOG_BUF_SHIFT=17
++# CONFIG_MODULES is not set
++CONFIG_LBD=y
+CONFIG_NO_HZ=y
-+CONFIG_M586=y
-+CONFIG_X86_CMPXCHG=y
-+CONFIG_X86_XADD=y
-+CONFIG_X86_WP_WORKS_OK=y
-+CONFIG_X86_INVLPG=y
-+CONFIG_X86_BSWAP=y
-+CONFIG_X86_POPAD_OK=y
-+CONFIG_X86_ALIGNMENT_16=y
-+CONFIG_X86_REBOOTFIXUPS=y
-+CONFIG_NET_IPIP=y
-+CONFIG_BRIDGE_NETFILTER=y
-+CONFIG_NF_CONNTRACK_FTP=y
-+CONFIG_NF_CONNTRACK_H323=y
-+CONFIG_NF_CONNTRACK_IRC=y
-+CONFIG_NF_CONNTRACK_SIP=y
-+CONFIG_NF_CONNTRACK_TFTP=y
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
-+CONFIG_NETFILTER_XT_TARGET_MARK=y
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=y
-+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=y
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
-+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-+CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=y
-+CONFIG_NETFILTER_XT_MATCH_MAC=y
-+CONFIG_NETFILTER_XT_MATCH_MARK=y
-+CONFIG_NETFILTER_XT_MATCH_OWNER=y
-+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=y
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
-+CONFIG_NETFILTER_XT_MATCH_LAYER7=y
-+CONFIG_NETFILTER_XT_MATCH_STRING=y
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
-+CONFIG_NETFILTER_XT_MATCH_U32=y
-+CONFIG_IP_NF_MATCH_ADDRTYPE=y
-+CONFIG_IP_NF_TARGET_LOG=y
-+CONFIG_IP_NF_TARGET_REDIRECT=y
-+CONFIG_IP_NF_TARGET_NETMAP=y
-+CONFIG_NF_NAT_FTP=y
-+CONFIG_NF_NAT_IRC=y
-+CONFIG_NF_NAT_TFTP=y
-+CONFIG_NF_NAT_H323=y
-+CONFIG_NF_NAT_SIP=y
-+CONFIG_IP_NF_ARPTABLES=y
-+CONFIG_IP_NF_ARPFILTER=y
-+CONFIG_IP_NF_ARP_MANGLE=y
-+CONFIG_IP_NF_SET=y
-+CONFIG_IP_NF_SET_IPMAP=y
-+CONFIG_IP_NF_SET_MACIPMAP=y
-+CONFIG_IP_NF_SET_PORTMAP=y
-+CONFIG_IP_NF_SET_IPHASH=y
-+CONFIG_IP_NF_SET_NETHASH=y
-+CONFIG_IP_NF_SET_IPPORTHASH=y
-+CONFIG_IP_NF_SET_IPTREE=y
-+CONFIG_IP_NF_SET_IPTREEMAP=y
-+CONFIG_IP_NF_MATCH_SET=y
-+CONFIG_IP_NF_TARGET_SET=y
-+CONFIG_NET_SCH_CBQ=y
-+CONFIG_NET_SCH_HTB=y
-+CONFIG_NET_SCH_HFSC=y
-+CONFIG_NET_SCH_PRIO=y
-+CONFIG_NET_SCH_SFQ=y
-+CONFIG_NET_SCH_ESFQ=y
-+CONFIG_NET_SCH_TBF=y
-+CONFIG_NET_SCH_INGRESS=y
-+CONFIG_NET_CLS_BASIC=y
-+CONFIG_NET_CLS_TCINDEX=y
-+CONFIG_NET_CLS_ROUTE4=y
-+CONFIG_NET_CLS_FW=y
-+CONFIG_NET_CLS_U32=y
-+CONFIG_NET_CLS_FLOW=y
-+CONFIG_NET_EMATCH_CMP=y
-+CONFIG_NET_EMATCH_NBYTE=y
-+CONFIG_NET_EMATCH_U32=y
-+CONFIG_NET_ACT_GACT=y
-+CONFIG_NET_ACT_MIRRED=y
-+CONFIG_NET_ACT_IPT=y
-+CONFIG_NET_ACT_PEDIT=y
-+CONFIG_BLK_DEV_LOOP=y
-+CONFIG_BLK_DEV_IDECD=y
-+CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-+CONFIG_BLK_DEV_IDEDMA_PCI=y
-+CONFIG_TUN=y
-+CONFIG_PCNET32=y
-+CONFIG_E100=y
-+CONFIG_NE2K_PCI=y
-+CONFIG_8139TOO=y
-+CONFIG_E1000=y
-+CONFIG_R8169=y
-+CONFIG_PPP=y
-+CONFIG_PPP_BSDCOMP=y
-+CONFIG_PPP_MPPE=y
-+CONFIG_PPPOL2TP=y
-+CONFIG_SLHC=y
-+CONFIG_HIDRAW=y
-+CONFIG_ISO9660_FS=y
-+CONFIG_NLS=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_AEAD=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_SEQIV=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+CONFIG_CRYPTO_NULL=y
-+CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_SHA1=y
-+CONFIG_CRYPTO_GF128MUL=y
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_CTR=y
-+CONFIG_CRYPTO_AES=y
-+CONFIG_CRYPTO_AES_586=y
-+CONFIG_CRYPTO_ARC4=y
-+CONFIG_CRYPTO_DEFLATE=y
-+CONFIG_CRYPTO_CRC32C=y
-+CONFIG_CRYPTO_LZO=y
-+CONFIG_LIBCRC32C=y
-+CONFIG_LZO_COMPRESS=y
-+CONFIG_TEXTSEARCH_KMP=y
-+CONFIG_TEXTSEARCH_BM=y
-+CONFIG_TEXTSEARCH_FSM=y
-+# CONFIG_TCP_CONG_SCALABLE is not set
-+# CONFIG_TCP_CONG_LP is not set
-+# CONFIG_TCP_CONG_VENO is not set
-+# CONFIG_TCP_CONG_YEAH is not set
-+# CONFIG_TCP_CONG_ILLINOIS is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_INET6_XFRM_TUNNEL is not set
-+# CONFIG_INET6_TUNNEL is not set
-+# CONFIG_NF_CONNTRACK_AMANDA is not set
-+# CONFIG_NF_CONNTRACK_PPTP is not set
-+# CONFIG_NF_CONNTRACK_RTSP is not set
-+# CONFIG_NETFILTER_XT_TARGET_CHAOS is not set
-+# CONFIG_NETFILTER_XT_TARGET_DELUDE is not set
-+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-+# CONFIG_NETFILTER_XT_TARGET_TARPIT is not set
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-+# CONFIG_NETFILTER_XT_MATCH_PORTSCAN is not set
-+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-+# CONFIG_IP_NF_QUEUE is not set
-+# CONFIG_IP_NF_MATCH_IPP2P is not set
-+# CONFIG_IP_NF_MATCH_TIME is not set
-+# CONFIG_IP_NF_MATCH_RECENT is not set
-+# CONFIG_IP_NF_MATCH_ECN is not set
-+# CONFIG_IP_NF_MATCH_AH is not set
-+# CONFIG_IP_NF_MATCH_TTL is not set
-+# CONFIG_IP_NF_TARGET_ULOG is not set
-+# CONFIG_NF_NAT_SNMP_BASIC is not set
-+# CONFIG_NF_NAT_RTSP is not set
-+# CONFIG_NF_NAT_AMANDA is not set
-+# CONFIG_NF_NAT_PPTP is not set
-+# CONFIG_IP_NF_TARGET_ECN is not set
-+# CONFIG_IP_NF_TARGET_TTL is not set
-+# CONFIG_IP_NF_RAW is not set
-+# CONFIG_BRIDGE_NF_EBTABLES is not set
-+# CONFIG_ATM is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_NET_SCH_RR is not set
-+# CONFIG_NET_SCH_RED is not set
-+# CONFIG_NET_SCH_TEQL is not set
-+# CONFIG_NET_SCH_GRED is not set
-+# CONFIG_NET_SCH_DSMARK is not set
-+# CONFIG_NET_SCH_NETEM is not set
-+# CONFIG_NET_CLS_RSVP is not set
-+# CONFIG_NET_CLS_RSVP6 is not set
-+# CONFIG_NET_EMATCH_META is not set
-+# CONFIG_NET_EMATCH_TEXT is not set
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_BT is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_MTD is not set
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+# CONFIG_MISC_DEVICES is not set
-+# CONFIG_BLK_DEV_SC1200 is not set
-+# CONFIG_BLK_DEV_VIA82CXXX is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_ATA is not set
-+# CONFIG_IFB is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_IMQ is not set
-+# CONFIG_IMQ_BEHAVIOR_BA is not set
-+# CONFIG_NET_VENDOR_3COM is not set
-+# CONFIG_PCNET32_NAPI is not set
-+# CONFIG_NATSEMI is not set
-+# CONFIG_8139TOO_PIO is not set
-+# CONFIG_E1000_NAPI is not set
-+# CONFIG_R8169_NAPI is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_BCM43XX_DMA_AND_PIO_MODE is not set
-+# CONFIG_PPP_ASYNC is not set
-+# CONFIG_PPP_SYNC_TTY is not set
-+# CONFIG_PPP_DEFLATE is not set
-+# CONFIG_PPPOE is not set
-+# CONFIG_ISDN is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_PC8736x_GPIO is not set
-+# CONFIG_NSC_GPIO is not set
-+# CONFIG_I2C is not set
-+# CONFIG_W1 is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_WATCHDOG is not set
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_SOUND is not set
-+# CONFIG_USB_SUPPORT is not set
-+# CONFIG_NEW_LEDS is not set
-+# CONFIG_EXT3_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+CONFIG_XFS_FS=y
-+# CONFIG_XFS_DEBUG is not set
-+# CONFIG_XFS_QUOTA is not set
-+# CONFIG_XFS_SECURITY is not set
-+# CONFIG_XFS_POSIX_ACL is not set
-+# CONFIG_XFS_RT is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_UDF_FS is not set
-+# CONFIG_MSDOS_FS is not set
-+# CONFIG_VFAT_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_JFFS2_CMODE_PRIORITY is not set
-+# CONFIG_SQUASHFS is not set
-+# CONFIG_MINI_FO is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_NETWORK_FILESYSTEMS is not set
-+# CONFIG_MAC_PARTITION is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_DES is not set
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+# CONFIG_CRYPTO_TWOFISH_586 is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_ANUBIS is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_TEST is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-+# CONFIG_GENERIC_PENDING_IRQ is not set
-+# CONFIG_X86_SMP is not set
-+# CONFIG_X86_32_SMP is not set
-+# CONFIG_X86_HT is not set
-+# CONFIG_X86_TRAMPOLINE is not set
-+# CONFIG_LOCK_KERNEL is not set
-+# CONFIG_STOP_MACHINE is not set
-+# CONFIG_M386 is not set
-+# CONFIG_X86_UP_APIC is not set
++# CONFIG_X86_RESERVE_LOW_64K is not set
+# CONFIG_KEXEC is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
++# CONFIG_HT_IRQ is not set
+# CONFIG_SCx200 is not set
-+# CONFIG_PCCARD is not set
-+# CONFIG_CARDBUS is not set
-+# CONFIG_YENTA is not set
-+# CONFIG_BINFMT_MISC is not set
++# CONFIG_XFRM_USER is not set
++# CONFIG_XFRM_IPCOMP is not set
++# CONFIG_NET_KEY is not set
+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_XFRM is not set
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_SYN_COOKIES is not set
++# CONFIG_IP_ROUTE_VERBOSE is not set
++# CONFIG_NET_IPIP is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
++# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_8139CP is not set
-+# CONFIG_8139TOO_8129 is not set
-+# CONFIG_8139TOO_TUNE_TWISTER is not set
-+# CONFIG_ACENIC is not set
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_ADAPTEC_STARFIRE is not set
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_AF_RXRPC is not set
-+# CONFIG_AMD8111_ETH is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_APPLICOM is not set
-+# CONFIG_ARCNET is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_ATL1 is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_B44 is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+# CONFIG_CAN is not set
-+# CONFIG_CASSINI is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_CFG80211 is not set
-+# CONFIG_CGROUPS is not set
-+# CONFIG_COMPAT_BRK is not set
-+# CONFIG_CONNECTOR is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRAMFS is not set
-+CONFIG_M586MMX=y
-+CONFIG_M586TSC=y
-+# CONFIG_MFD_SM501 is not set
-+# CONFIG_PARPORT is not set
-+# CONFIG_QUOTA is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_SERIAL_JSM is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+# CONFIG_SERIO_CT82C710 is not set
-+# CONFIG_SERIO_PCIPS2 is not set
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_SERIO_SERPORT is not set
-+# CONFIG_X86_PPRO_FENCE is not set
-+# CONFIG_XFRM_MIGRATE is not set
-+# CONFIG_XFRM_STATISTICS is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+# CONFIG_YELLOWFIN is not set
- # CONFIG_ZONE_DMA32 is not set
-+CONFIG_MII=y
-+CONFIG_MMU=y
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_NR_UARTS=2
-+CONFIG_SERIAL_8250_PCI=y
-+CONFIG_SERIAL_8250_PNP=y
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_SERIO=y
-+CONFIG_SERIO_I8042=y
-+CONFIG_SERIO_LIBPS2=y
-+CONFIG_ZONE_DMA=y
-+CONFIG_ZONE_DMA_FLAG=1
-+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-+CONFIG_INPUT_MOUSEDEV_PSAUX=y
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-+# CONFIG_CRYPTO_SALSA20_586 is not set
-+# CONFIG_NONPROMISC_DEVMEM is not set
-+# CONFIG_X86_PAT is not set
-+# CONFIG_OLPC is not set
-+# CONFIG_BLK_DEV_HD_ONLY is not set
-+# CONFIG_THERMAL_HWMON is not set
-+# CONFIG_ACCESSIBILITY is not set
-+# CONFIG_ISCSI_IBFT_FIND is not set
-+# CONFIG_4KSTACKS is not set
-diff -Naur a/target/linux/x86/config-2.6.27 b/target/linux/x86/config-2.6.27
---- a/target/linux/x86/config-2.6.27 2008-12-10 01:39:29.530827000 +0000
-+++ b/target/linux/x86/config-2.6.27 2009-03-14 14:08:31.048979984 +0000
-@@ -1,8 +1,11 @@
-+CONFIG_LOCALVERSION="-torvm"
-+CONFIG_INITRAMFS_SOURCE=""
-+# CONFIG_BSD_PROCESS_ACCT is not set
- # CONFIG_3C515 is not set
- CONFIG_4KSTACKS=y
- # CONFIG_60XX_WDT is not set
- # CONFIG_64BIT is not set
--CONFIG_8139TOO=m
-+CONFIG_8139TOO=y
- # CONFIG_8139TOO_8129 is not set
- CONFIG_8139TOO_PIO=y
- # CONFIG_8139TOO_TUNE_TWISTER is not set
-@@ -20,18 +23,18 @@
- CONFIG_ARCH_HAS_CPU_RELAX=y
- # CONFIG_ARCH_HAS_ILOG2_U32 is not set
- # CONFIG_ARCH_HAS_ILOG2_U64 is not set
--CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-+# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set
- CONFIG_ARCH_MAY_HAVE_PC_FDC=y
- CONFIG_ARCH_POPULATES_NODE_MAP=y
- CONFIG_ARCH_SELECT_MEMORY_MODEL=y
- CONFIG_ARCH_SPARSEMEM_ENABLE=y
- CONFIG_ARCH_SUPPORTS_AOUT=y
--CONFIG_ARCH_SUPPORTS_MSI=y
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
- CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
--CONFIG_ARCH_SUSPEND_POSSIBLE=y
-+# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
- CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
- # CONFIG_AT1700 is not set
--CONFIG_ATA=m
-+CONFIG_ATA=y
- # CONFIG_ATA_NONSTANDARD is not set
- # CONFIG_AUDIT_ARCH is not set
- CONFIG_BASE_SMALL=0
-@@ -50,42 +53,26 @@
- CONFIG_BLK_DEV_IDEDMA_SFF=y
- CONFIG_BLK_DEV_IDEPCI=y
- # CONFIG_BLK_DEV_QD65XX is not set
--CONFIG_BLK_DEV_SC1200=y
-+# CONFIG_BLK_DEV_SC1200 is not set
- # CONFIG_BLK_DEV_UMC8672 is not set
--CONFIG_BLK_DEV_VIA82CXXX=y
-+# CONFIG_BLK_DEV_VIA82CXXX is not set
- # CONFIG_BLK_DEV_XD is not set
- CONFIG_BOUNCE=y
- # CONFIG_BT_HIDP is not set
-+# CONFIG_CARDBUS is not set
- CONFIG_CLASSIC_RCU=y
--CONFIG_CLOCKSOURCE_WATCHDOG=y
- CONFIG_COMPAT_VDSO=y
--CONFIG_CONSOLE_TRANSLATIONS=y
- # CONFIG_CPU5_WDT is not set
--CONFIG_CPU_FREQ=y
--# CONFIG_CPU_FREQ_DEBUG is not set
--# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
--# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
--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_GOV_CONSERVATIVE is not set
--# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
--CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
--# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
--# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
--CONFIG_CPU_FREQ_STAT=y
--CONFIG_CPU_FREQ_STAT_DETAILS=y
--CONFIG_CPU_FREQ_TABLE=y
--# CONFIG_CPU_IDLE is not set
--CONFIG_CRYPTO_AES_586=m
--CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_AES_586=y
-+CONFIG_CRYPTO_GF128MUL=y
- # CONFIG_CRYPTO_SALSA20_586 is not set
--CONFIG_CRYPTO_TWOFISH_586=m
-+CONFIG_CRYPTO_TWOFISH_586=y
- # CONFIG_CS5535_GPIO is not set
- # CONFIG_CS89x0 is not set
- # CONFIG_DCDBAS is not set
- CONFIG_DEBUG_BUGVERBOSE=y
--CONFIG_DEBUG_MEMORY_INIT=y
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_DEBUG_MEMORY_INIT is not set
- CONFIG_DEFAULT_IO_DELAY_TYPE=0
- # CONFIG_DELL_RBU is not set
- # CONFIG_DEPCA is not set
-@@ -95,7 +82,7 @@
- CONFIG_DNOTIFY=y
- CONFIG_DOUBLEFAULT=y
- CONFIG_DUMMY_CONSOLE=y
--CONFIG_E1000=m
-+CONFIG_E1000=y
- # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
- CONFIG_EARLY_PRINTK=y
- # CONFIG_EDAC is not set
-@@ -111,13 +98,11 @@
- # CONFIG_EUROTECH_WDT is not set
- CONFIG_EXT2_FS=y
- CONFIG_FAST_CMPXCHG_LOCAL=y
--CONFIG_FIRMWARE_IN_KERNEL=y
--CONFIG_FIRMWARE_MEMMAP=y
-+# CONFIG_FIRMWARE_IN_KERNEL is not set
-+# CONFIG_FIRMWARE_MEMMAP is not set
- CONFIG_FIX_EARLYCON_MEM=y
--CONFIG_FS_POSIX_ACL=y
- CONFIG_GENERIC_BUG=y
- CONFIG_GENERIC_CLOCKEVENTS=y
--CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
- CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
- CONFIG_GENERIC_CMOS_UPDATE=y
- # CONFIG_GENERIC_CPU is not set
-@@ -133,46 +118,45 @@
- CONFIG_HAS_DMA=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_IOPORT=y
--CONFIG_HAVE_ARCH_KGDB=y
-+# CONFIG_HAVE_ARCH_KGDB is not set
- # CONFIG_HAVE_ARCH_TRACEHOOK is not set
- # CONFIG_HAVE_CLK is not set
- # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
- # CONFIG_HAVE_DMA_ATTRS is not set
--CONFIG_HAVE_DYNAMIC_FTRACE=y
--CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
--CONFIG_HAVE_FTRACE=y
--CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
- CONFIG_HAVE_IDE=y
- CONFIG_HAVE_IOREMAP_PROT=y
--CONFIG_HAVE_KPROBES=y
--CONFIG_HAVE_KRETPROBES=y
--CONFIG_HAVE_KVM=y
--CONFIG_HAVE_LATENCYTOP_SUPPORT=y
--CONFIG_HAVE_OPROFILE=y
--CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-+# CONFIG_HAVE_KPROBES is not set
-+# CONFIG_HAVE_KRETPROBES is not set
-+# CONFIG_HAVE_KVM is not set
-+# CONFIG_HAVE_LATENCYTOP_SUPPORT is not set
-+# CONFIG_HAVE_OPROFILE is not set
-+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
- CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
- CONFIG_HID=y
- CONFIG_HID_SUPPORT=y
-+CONFIG_NOHIGHMEM=y
-+# CONFIG_RESOURCES_64BIT is not set
- # CONFIG_HIGHMEM4G is not set
- # CONFIG_HIGHMEM64G is not set
- # CONFIG_HIGH_RES_TIMERS is not set
- # CONFIG_HPET_TIMER is not set
- # CONFIG_HP_WATCHDOG is not set
--CONFIG_HT_IRQ=y
-+# CONFIG_HT_IRQ is not set
- # CONFIG_HUGETLBFS is not set
--CONFIG_HWMON=m
-+# CONFIG_RELOCATABLE is not set
-+# CONFIG_HOTPLUG_CPU is not set
++# CONFIG_INET_XFRM_MODE_TUNNEL is not set
++# CONFIG_INET_XFRM_MODE_BEET is not set
++# CONFIG_INET_DIAG is not set
++# CONFIG_INET_TCP_DIAG is not set
++# CONFIG_IPV6 is not set
++# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
++# CONFIG_INET6_XFRM_MODE_BEET is not set
++# CONFIG_BRIDGE_NETFILTER is not set
++# CONFIG_NETFILTER_NETLINK is not set
++# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
-+# CONFIG_HWMON is not set
- # CONFIG_HWMON_DEBUG_CHIP is not set
--CONFIG_HWMON_VID=m
-+# CONFIG_HWMON_VID is not set
- CONFIG_HW_CONSOLE=y
- CONFIG_HW_RANDOM=y
- # CONFIG_HW_RANDOM_AMD is not set
- CONFIG_HW_RANDOM_GEODE=y
- # CONFIG_HW_RANDOM_INTEL is not set
- CONFIG_HW_RANDOM_VIA=y
--CONFIG_I2C=m
--CONFIG_I2C_ALGOBIT=m
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=m
-+# CONFIG_I2C is not set
- # CONFIG_I6300ESB_WDT is not set
- # CONFIG_I82365 is not set
- # CONFIG_I8K is not set
-@@ -184,15 +168,9 @@
- CONFIG_IDE_GENERIC=y
- # CONFIG_IDE_PROC_FS is not set
- CONFIG_IDE_TIMINGS=y
--CONFIG_INITRAMFS_SOURCE=""
- CONFIG_INPUT=y
- # CONFIG_INPUT_EVDEV is not set
- CONFIG_INPUT_KEYBOARD=y
--CONFIG_INPUT_MOUSE=y
--CONFIG_INPUT_MOUSEDEV=y
--CONFIG_INPUT_MOUSEDEV_PSAUX=y
--CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
--CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
- # CONFIG_IOMMU_HELPER is not set
- CONFIG_IO_DELAY_0X80=y
- # CONFIG_IO_DELAY_0XED is not set
-@@ -210,26 +188,24 @@
- # CONFIG_IT8712F_WDT is not set
- # CONFIG_ITCO_WDT is not set
- CONFIG_KALLSYMS=y
--CONFIG_KEXEC=y
-+# CONFIG_KEXEC is not set
- CONFIG_KEYBOARD_ATKBD=y
- # CONFIG_KEYBOARD_LKKBD is not set
- # CONFIG_KEYBOARD_NEWTON is not set
- # CONFIG_KEYBOARD_STOWAWAY is not set
- # CONFIG_KEYBOARD_SUNKBD is not set
--# CONFIG_KEYBOARD_XTKBD is not set
-+CONFIG_KEYBOARD_XTKBD=y
- CONFIG_KMOD=y
- CONFIG_KTIME_SCALAR=y
- # CONFIG_LANCE is not set
- # CONFIG_LEDS_ALIX is not set
- # CONFIG_LEDS_CLEVO_MAIL is not set
--CONFIG_LEDS_NET48XX=m
-+CONFIG_LEDS_NET48XX=y
- # CONFIG_LEDS_WRAP is not set
- CONFIG_LOCK_KERNEL=y
--CONFIG_M386=y
-+CONFIG_LZO_COMPRESS=y
-+CONFIG_LZO_DECOMPRESS=y
- # CONFIG_M486 is not set
--# CONFIG_M586 is not set
--# CONFIG_M586MMX is not set
--# CONFIG_M586TSC is not set
- # CONFIG_M686 is not set
- # CONFIG_MACHZ_WDT is not set
- # CONFIG_MACINTOSH_DRIVERS is not set
-@@ -239,35 +215,32 @@
- # CONFIG_MCRUSOE is not set
- # CONFIG_MCYRIXIII is not set
- # CONFIG_MDA_CONSOLE is not set
--CONFIG_MEDIA_TUNER=m
--CONFIG_MEDIA_TUNER_MT20XX=m
--CONFIG_MEDIA_TUNER_SIMPLE=m
--CONFIG_MEDIA_TUNER_TDA8290=m
--CONFIG_MEDIA_TUNER_TDA9887=m
--CONFIG_MEDIA_TUNER_TEA5761=m
--CONFIG_MEDIA_TUNER_TEA5767=m
--CONFIG_MEDIA_TUNER_XC2028=m
--CONFIG_MEDIA_TUNER_XC5000=m
-+CONFIG_MEDIA_TUNER=y
-+CONFIG_MEDIA_TUNER_MT20XX=y
-+CONFIG_MEDIA_TUNER_SIMPLE=y
-+CONFIG_MEDIA_TUNER_TDA8290=y
-+CONFIG_MEDIA_TUNER_TDA9887=y
-+CONFIG_MEDIA_TUNER_TEA5761=y
-+CONFIG_MEDIA_TUNER_TEA5767=y
-+CONFIG_MEDIA_TUNER_XC2028=y
-+CONFIG_MEDIA_TUNER_XC5000=y
- # CONFIG_MEFFICEON is not set
- # CONFIG_MEMTEST is not set
- # CONFIG_MFD_CORE is not set
- # CONFIG_MFD_TMIO is not set
- # CONFIG_MGEODEGX1 is not set
- # CONFIG_MGEODE_LX is not set
--CONFIG_MICROCODE=y
--CONFIG_MICROCODE_OLD_INTERFACE=y
-+# CONFIG_MICROCODE is not set
- # CONFIG_MIXCOMWD is not set
- # CONFIG_MK6 is not set
- # CONFIG_MK7 is not set
- # CONFIG_MK8 is not set
-+# CONFIG_INPUT_MOUSE is not set
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
- # CONFIG_MOUSE_BCM5974 is not set
--CONFIG_MOUSE_PS2=y
--CONFIG_MOUSE_PS2_ALPS=y
--CONFIG_MOUSE_PS2_LIFEBOOK=y
--CONFIG_MOUSE_PS2_LOGIPS2PP=y
--CONFIG_MOUSE_PS2_SYNAPTICS=y
--# CONFIG_MOUSE_PS2_TOUCHKIT is not set
--CONFIG_MOUSE_PS2_TRACKPOINT=y
-+# CONFIG_MOUSE_PS2 is not set
- # CONFIG_MOUSE_SERIAL is not set
- # CONFIG_MOUSE_VSXXXAA is not set
- # CONFIG_MPENTIUM4 is not set
-@@ -275,38 +248,6 @@
- # CONFIG_MPENTIUMIII is not set
- # CONFIG_MPENTIUMM is not set
- # CONFIG_MPSC is not set
--CONFIG_MTD=y
--# CONFIG_MTD_ABSENT is not set
--CONFIG_MTD_BLKDEVS=y
--CONFIG_MTD_BLOCK=y
--CONFIG_MTD_BLOCK2MTD=y
--# CONFIG_MTD_CFI is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--CONFIG_MTD_CHAR=y
--# CONFIG_MTD_CMDLINE_PARTS is not set
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_CONCAT is not set
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_ONENAND is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_PLATRAM is not set
--# CONFIG_MTD_PMC551 is not set
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_REDBOOT_PARTS is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_TS5500 is not set
- CONFIG_MTRR=y
- # CONFIG_MTRR_SANITIZER is not set
- # CONFIG_MVIAC3_2 is not set
-@@ -315,24 +256,23 @@
- # CONFIG_MWINCHIP3D is not set
- # CONFIG_MWINCHIPC6 is not set
- CONFIG_NAMESPACES=y
--CONFIG_NATSEMI=m
--CONFIG_NE2K_PCI=m
-+CONFIG_NATSEMI=y
-+CONFIG_NE2K_PCI=y
- CONFIG_NET_VENDOR_3COM=y
- # CONFIG_NET_VENDOR_RACAL is not set
- # CONFIG_NET_VENDOR_SMC is not set
- CONFIG_NOHIGHMEM=y
--CONFIG_NR_CPUS=8
--CONFIG_NSC_GPIO=m
-+# CONFIG_NR_CPUS is not set
-+# CONFIG_NSC_GPIO is not set
- CONFIG_NVRAM=y
- # CONFIG_OLPC is not set
- # CONFIG_OPTIMIZE_INLINING is not set
- CONFIG_PAGEFLAGS_EXTENDED=y
- CONFIG_PAGE_OFFSET=0xC0000000
- # CONFIG_PARAVIRT_GUEST is not set
--CONFIG_PC8736x_GPIO=m
-+CONFIG_PC8736x_GPIO=y
- # CONFIG_PC87413_WDT is not set
--CONFIG_PCCARD=m
--CONFIG_PCCARD_NONSTATIC=m
-+# CONFIG_PCCARD is not set
- CONFIG_PCI=y
- # CONFIG_PCIEPORTBUS is not set
- CONFIG_PCI_BIOS=y
-@@ -343,11 +283,11 @@
- # CONFIG_PCI_GODIRECT is not set
- # CONFIG_PCI_GOMMCONFIG is not set
- # CONFIG_PCI_GOOLPC is not set
--CONFIG_PCMCIA=m
--CONFIG_PCMCIA_IOCTL=y
--CONFIG_PCMCIA_LOAD_CIS=y
--CONFIG_PCMCIA_PROBE=y
--CONFIG_PCNET32=m
-+# CONFIG_PCMCIA is not set
-+# CONFIG_PCMCIA_IOCTL is not set
-+# CONFIG_PCMCIA_LOAD_CIS is not set
-+# CONFIG_PCMCIA_PROBE is not set
-+CONFIG_PCNET32=y
- CONFIG_PCSPKR_PLATFORM=y
- # CONFIG_PCWATCHDOG is not set
- CONFIG_PHYSICAL_ALIGN=0x100000
-@@ -359,6 +299,7 @@
- CONFIG_PROC_PAGE_MONITOR=y
- # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
- # CONFIG_R6040 is not set
-+# CONFIG_R8169 is not set
- # CONFIG_RELOCATABLE is not set
- CONFIG_RFKILL_LEDS=y
- CONFIG_RTC=y
-@@ -367,23 +308,17 @@
- # CONFIG_SBC7240_WDT is not set
- # CONFIG_SBC8360_WDT is not set
- # CONFIG_SBC_EPX_C3_WATCHDOG is not set
--CONFIG_SC1200_WDT=m
-+CONFIG_SC1200_WDT=y
- # CONFIG_SC520_WDT is not set
- # CONFIG_SCC is not set
- # CONFIG_SCHED_HRTICK is not set
- CONFIG_SCHED_MC=y
- CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
--CONFIG_SCHED_SMT=y
--CONFIG_SCSI_WAIT_SCAN=m
--CONFIG_SCx200=y
--CONFIG_SCx200HR_TIMER=y
--CONFIG_SCx200_ACB=m
--CONFIG_SCx200_GPIO=m
--CONFIG_SCx200_I2C=m
--CONFIG_SCx200_I2C_SCL=12
--CONFIG_SCx200_I2C_SDA=13
--CONFIG_SCx200_WDT=m
--CONFIG_SENSORS_PC87360=m
-+# CONFIG_SCHED_SMT is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCx200 is not set
-+# CONFIG_SENSORS_PC87360 is not set
- # CONFIG_SERIAL_8250_CS is not set
- # CONFIG_SERIAL_8250_EXTENDED is not set
- CONFIG_SERIAL_8250_PCI=y
-@@ -395,11 +330,17 @@
- # CONFIG_SERIO_PCIPS2 is not set
- # CONFIG_SERIO_RAW is not set
- CONFIG_SERIO_SERPORT=y
--CONFIG_SMP=y
-+# CONFIG_SMP is not set
-+CONFIG_BROKEN_ON_SMP=y
-+# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-+CONFIG_MODULES=y
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+# CONFIG_LSF is not set
- # CONFIG_SMSC37B787_WDT is not set
--CONFIG_SND_ISA=y
-+# CONFIG_SND_ISA is not set
- # CONFIG_SND_SC6000 is not set
--CONFIG_SOFT_WATCHDOG=m
-+CONFIG_SOFT_WATCHDOG=y
- # CONFIG_SONYPI is not set
- CONFIG_SPARSEMEM_STATIC=y
- # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-@@ -412,87 +353,318 @@
- # CONFIG_TELCLOCK is not set
- # CONFIG_TICK_ONESHOT is not set
- # CONFIG_TOSHIBA is not set
-+CONFIG_TUN=y
- # CONFIG_TYPHOON is not set
- CONFIG_UID16=y
--CONFIG_USB=m
--CONFIG_USB_EHCI_HCD=m
-+# CONFIG_USB is not set
-+# CONFIG_USB_EHCI_HCD is not set
- # CONFIG_USB_NET_DM9601 is not set
- # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
- # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
--CONFIG_USB_OHCI_HCD=m
-+# CONFIG_USB_OHCI_HCD is not set
- # CONFIG_USB_SERIAL_OTI6858 is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_UHCI_HCD=m
-+# CONFIG_USB_SUPPORT is not set
-+# CONFIG_USB_UHCI_HCD is not set
- # CONFIG_USER_NS is not set
--CONFIG_USE_GENERIC_SMP_HELPERS=y
-+# CONFIG_USE_GENERIC_SMP_HELPERS is not set
- # CONFIG_VGACON_SOFT_SCROLLBACK is not set
- # CONFIG_VGASTATE is not set
- CONFIG_VGA_CONSOLE=y
--CONFIG_VIA_RHINE=m
--CONFIG_VIA_RHINE_MMIO=y
--CONFIG_VIDEO_MEDIA=m
-+# CONFIG_VIA_RHINE is not set
-+CONFIG_VIDEO_MEDIA=y
- # CONFIG_VIDEO_SELECT is not set
--CONFIG_VIDEO_V4L2=m
--CONFIG_VIDEO_V4L2_COMMON=m
--CONFIG_VM86=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_VORTEX=m
-+# CONFIG_VIDEO_V4L2 is not set
-+# CONFIG_VM86 is not set
-+# CONFIG_VM_EVENT_COUNTERS is not set
-+CONFIG_VORTEX=y
- CONFIG_VT=y
- CONFIG_VT_CONSOLE=y
- # CONFIG_VT_HW_CONSOLE_BINDING is not set
- # CONFIG_WAFER_WDT is not set
- # CONFIG_WDT is not set
--CONFIG_X86=y
--CONFIG_X86_32=y
--CONFIG_X86_32_SMP=y
--# CONFIG_X86_64 is not set
- CONFIG_X86_BIOS_REBOOT=y
- # CONFIG_X86_CMPXCHG is not set
--CONFIG_X86_CPU=y
- # CONFIG_X86_CPUFREQ_NFORCE2 is not set
- # CONFIG_X86_CPUID is not set
- # CONFIG_X86_ELAN is not set
- # CONFIG_X86_E_POWERSAVER is not set
- CONFIG_X86_F00F_BUG=y
--CONFIG_X86_FIND_SMP_CONFIG=y
- CONFIG_X86_GENERIC=y
- # CONFIG_X86_GENERICARCH is not set
--CONFIG_X86_GX_SUSPMOD=m
--CONFIG_X86_HT=y
--CONFIG_X86_INTEL_USERCOPY=y
-+CONFIG_X86_GX_SUSPMOD=y
- CONFIG_X86_IO_APIC=y
- CONFIG_X86_L1_CACHE_SHIFT=7
--CONFIG_X86_LOCAL_APIC=y
- # CONFIG_X86_LONGRUN is not set
--CONFIG_X86_MCE=y
-+# CONFIG_X86_MCE is not set
- # CONFIG_X86_MCE_NONFATAL is not set
- # CONFIG_X86_MCE_P4THERMAL is not set
--CONFIG_X86_MINIMUM_CPU_FAMILY=3
--CONFIG_X86_MPPARSE=y
- # CONFIG_X86_MSR is not set
- # CONFIG_X86_P4_CLOCKMOD is not set
- # CONFIG_X86_PAE is not set
--CONFIG_X86_PAT=y
-+# CONFIG_X86_PAT is not set
- CONFIG_X86_PC=y
- # CONFIG_X86_POWERNOW_K6 is not set
- # CONFIG_X86_POWERNOW_K7 is not set
- # CONFIG_X86_POWERNOW_K8 is not set
--CONFIG_X86_PPRO_FENCE=y
-+# CONFIG_X86_PPRO_FENCE is not set
- # CONFIG_X86_RDC321X is not set
- # CONFIG_X86_REBOOTFIXUPS is not set
- CONFIG_X86_RESERVE_LOW_64K=y
--CONFIG_X86_SMP=y
- # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
- # CONFIG_X86_SPEEDSTEP_ICH is not set
- # CONFIG_X86_SPEEDSTEP_LIB is not set
- # CONFIG_X86_SPEEDSTEP_SMI is not set
- CONFIG_X86_TRAMPOLINE=y
--CONFIG_X86_VERBOSE_BOOTUP=y
- # CONFIG_X86_VOYAGER is not set
- # CONFIG_X86_VSMP is not set
--CONFIG_YENTA_ENE_TUNE=y
--CONFIG_YENTA_O2=y
--CONFIG_YENTA_RICOH=y
--CONFIG_YENTA_TI=y
--CONFIG_YENTA_TOSHIBA=y
- # CONFIG_ZONE_DMA32 is not set
-+# CONFIG_X86_UP_APIC is not set
-+# CONFIG_CPU_FREQ is not set
-+# CONFIG_CPU_IDLE is not set
-+CONFIG_X86_VERBOSE_BOOTUP=y
-+# CONFIG_TCP_CONG_BIC is not set
-+# CONFIG_TCP_CONG_CUBIC is not set
-+# CONFIG_TCP_CONG_WESTWOOD is not set
-+# CONFIG_TCP_CONG_HTCP is not set
-+# CONFIG_TCP_CONG_HSTCP is not set
-+# CONFIG_TCP_CONG_HYBLA is not set
-+# CONFIG_TCP_CONG_SCALABLE is not set
-+# CONFIG_TCP_CONG_LP is not set
-+# CONFIG_TCP_CONG_VENO is not set
-+# CONFIG_TCP_CONG_YEAH is not set
-+# CONFIG_TCP_CONG_ILLINOIS is not set
-+CONFIG_BRIDGE_NETFILTER=y
+CONFIG_NF_CONNTRACK=y
-+CONFIG_NF_CT_PROTO_GRE=y
-+CONFIG_NF_CONNTRACK_FTP=y
-+CONFIG_NF_CONNTRACK_H323=y
-+CONFIG_NF_CONNTRACK_IRC=y
-+CONFIG_NF_CONNTRACK_PPTP=y
-+CONFIG_NF_CONNTRACK_TFTP=y
++# CONFIG_NF_CONNTRACK_FTP is not set
++# CONFIG_NF_CONNTRACK_IRC is not set
++# CONFIG_NF_CONNTRACK_TFTP is not set
++CONFIG_NF_CT_NETLINK=y
++CONFIG_NETFILTER_TPROXY=y
+CONFIG_NETFILTER_XTABLES=y
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
++# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
++# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-+CONFIG_NETFILTER_XT_TARGET_MARK=y
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=y
-+CONFIG_NETFILTER_XT_TARGET_RATEEST=y
-+CONFIG_NETFILTER_XT_TARGET_TARPIT=y
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
-+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=y
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
++# CONFIG_NETFILTER_XT_TARGET_IMQ is not set
++# CONFIG_NETFILTER_XT_TARGET_MARK is not set
++# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
++# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
++# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
++CONFIG_NETFILTER_XT_TARGET_TPROXY=y
++# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
++# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
++# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
++# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-+CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=y
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=y
-+CONFIG_NETFILTER_XT_MATCH_MAC=y
-+CONFIG_NETFILTER_XT_MATCH_MARK=y
-+CONFIG_NETFILTER_XT_MATCH_OWNER=y
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
-+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=y
++# CONFIG_NETFILTER_XT_MATCH_ESP is not set
++# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
++# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
++# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
++# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
++# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
++# CONFIG_NETFILTER_XT_MATCH_MAC is not set
++# CONFIG_NETFILTER_XT_MATCH_MARK is not set
++# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
++# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
++# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
++# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
++CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
++# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
++# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
++# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
+CONFIG_NETFILTER_XT_MATCH_STATE=y
++# CONFIG_NETFILTER_XT_MATCH_LAYER7 is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-+CONFIG_NETFILTER_XT_MATCH_STRING=y
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
-+CONFIG_NETFILTER_XT_MATCH_TIME=y
-+CONFIG_NETFILTER_XT_MATCH_U32=y
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
++# CONFIG_NETFILTER_XT_MATCH_STRING is not set
++# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
++# CONFIG_NETFILTER_XT_MATCH_TIME is not set
++# CONFIG_NETFILTER_XT_MATCH_U32 is not set
++CONFIG_NF_DEFRAG_IPV4=y
+CONFIG_NF_CONNTRACK_IPV4=y
++# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=y
-+CONFIG_IP_NF_MATCH_IPP2P=y
-+CONFIG_IP_NF_MATCH_TIME=y
-+CONFIG_IP_NF_MATCH_ECN=y
-+CONFIG_IP_NF_MATCH_TTL=y
-+CONFIG_IP_NF_MATCH_ADDRTYPE=y
++# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
++# CONFIG_IP_NF_MATCH_AH is not set
++# CONFIG_IP_NF_MATCH_ECN is not set
++# CONFIG_IP_NF_MATCH_TTL is not set
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_LOG=y
+CONFIG_NF_NAT=y
+CONFIG_IP_NF_TARGET_MASQUERADE=y
++CONFIG_IP_NF_TARGET_NETMAP=y
+CONFIG_IP_NF_TARGET_REDIRECT=y
-+CONFIG_NF_NAT_PROTO_GRE=y
-+CONFIG_NF_NAT_FTP=y
-+CONFIG_NF_NAT_IRC=y
-+CONFIG_NF_NAT_TFTP=y
-+CONFIG_NF_NAT_PPTP=y
-+CONFIG_NF_NAT_H323=y
++# CONFIG_NF_NAT_FTP is not set
++# CONFIG_NF_NAT_IRC is not set
++# CONFIG_NF_NAT_TFTP is not set
+CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_TARGET_ECN=y
+CONFIG_IP_NF_TARGET_TTL=y
-+CONFIG_IP_NF_ARPTABLES=y
-+CONFIG_IP_NF_ARPFILTER=y
-+CONFIG_IP_NF_ARP_MANGLE=y
-+CONFIG_BRIDGE_NF_EBTABLES=y
-+CONFIG_BRIDGE_EBT_BROUTE=y
-+CONFIG_BRIDGE_EBT_T_FILTER=y
-+# CONFIG_BRIDGE_EBT_T_NAT is not set
-+# CONFIG_BRIDGE_EBT_802_3 is not set
-+# CONFIG_BRIDGE_EBT_AMONG is not set
-+CONFIG_BRIDGE_EBT_ARP=y
-+CONFIG_BRIDGE_EBT_IP=y
-+# CONFIG_BRIDGE_EBT_LIMIT is not set
-+CONFIG_BRIDGE_EBT_MARK=y
-+CONFIG_BRIDGE_EBT_PKTTYPE=y
-+# CONFIG_BRIDGE_EBT_STP is not set
-+# CONFIG_BRIDGE_EBT_VLAN is not set
-+CONFIG_BRIDGE_EBT_ARPREPLY=y
-+CONFIG_BRIDGE_EBT_DNAT=y
-+CONFIG_BRIDGE_EBT_MARK_T=y
-+CONFIG_BRIDGE_EBT_REDIRECT=y
-+CONFIG_BRIDGE_EBT_SNAT=y
-+CONFIG_BRIDGE_EBT_LOG=y
-+# CONFIG_BRIDGE_EBT_ULOG is not set
-+# CONFIG_BRIDGE_EBT_NFLOG is not set
-+CONFIG_NET_SCH_CBQ=y
-+CONFIG_NET_SCH_HTB=y
-+CONFIG_NET_SCH_HFSC=y
-+CONFIG_NET_SCH_PRIO=y
-+CONFIG_NET_SCH_RED=y
-+CONFIG_NET_SCH_SFQ=y
-+CONFIG_NET_SCH_ESFQ=y
-+CONFIG_NET_SCH_TEQL=y
-+CONFIG_NET_SCH_TBF=y
-+CONFIG_NET_SCH_GRED=y
-+CONFIG_NET_SCH_DSMARK=y
-+CONFIG_NET_SCH_INGRESS=y
-+CONFIG_NET_CLS_BASIC=y
-+CONFIG_NET_CLS_TCINDEX=y
-+CONFIG_NET_CLS_ROUTE4=y
-+CONFIG_NET_CLS_FW=y
-+CONFIG_NET_CLS_U32=y
-+CONFIG_NET_CLS_RSVP=y
-+CONFIG_NET_CLS_RSVP6=y
-+CONFIG_NET_CLS_FLOW=y
-+CONFIG_NET_ACT_GACT=y
-+CONFIG_NET_ACT_MIRRED=y
-+CONFIG_NET_ACT_IPT=y
-+CONFIG_NET_ACT_PEDIT=y
++CONFIG_IP_NF_RAW=y
+# CONFIG_HAMRADIO is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MISC_DEVICES is not set
++# CONFIG_WIRELESS is not set
++# CONFIG_MAC80211_RC_DEFAULT_PID is not set
++CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_IDECD=y
-+CONFIG_IDE_PROC_FS=y
-+CONFIG_IFB=y
++CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
++CONFIG_BLK_DEV_IDEPNP=y
++# CONFIG_IMQ is not set
++# CONFIG_IMQ_NUM_DEVS is not set
++CONFIG_TUN=y
++CONFIG_EL3=y
++CONFIG_VORTEX=y
+CONFIG_PCNET32=y
++CONFIG_B44=y
++CONFIG_B44_PCI_AUTOSELECT=y
++CONFIG_B44_PCICORE_AUTOSELECT=y
++CONFIG_B44_PCI=y
+CONFIG_E100=y
++CONFIG_NATSEMI=y
+CONFIG_NE2K_PCI=y
-+# CONFIG_WLAN_80211 is not set
++CONFIG_8139TOO=y
++# CONFIG_VIA_RHINE is not set
++# CONFIG_E1000 is not set
++CONFIG_R8169=y
++# CONFIG_VIA_VELOCITY is not set
++# CONFIG_BNX2 is not set
++# CONFIG_ISDN is not set
+# CONFIG_WATCHDOG is not set
-+# CONFIG_USB_SUPPORT is not set
++CONFIG_SSB=y
++CONFIG_SSB_SPROM=y
++# CONFIG_SSB_BLOCKIO is not set
++CONFIG_SSB_PCIHOST_POSSIBLE=y
++CONFIG_SSB_PCIHOST=y
++CONFIG_SSB_B43_PCI_BRIDGE=y
++# CONFIG_SSB_DEBUG is not set
++CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
++CONFIG_SSB_DRIVER_PCICORE=y
+# CONFIG_NEW_LEDS is not set
++# CONFIG_ACCESSIBILITY is not set
++# CONFIG_INFINIBAND is not set
++# CONFIG_EDAC is not set
++CONFIG_RTC_LIB=y
++CONFIG_RTC_CLASS=y
++CONFIG_RTC_HCTOSYS=y
++CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
++# CONFIG_RTC_DEBUG is not set
++CONFIG_RTC_INTF_SYSFS=y
++CONFIG_RTC_INTF_PROC=y
++CONFIG_RTC_INTF_DEV=y
++# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
++# CONFIG_RTC_DRV_TEST is not set
++CONFIG_RTC_DRV_CMOS=y
++# CONFIG_RTC_DRV_DS1286 is not set
++# CONFIG_RTC_DRV_DS1511 is not set
++# CONFIG_RTC_DRV_DS1553 is not set
++# CONFIG_RTC_DRV_DS1742 is not set
++# CONFIG_RTC_DRV_STK17TA8 is not set
++# CONFIG_RTC_DRV_M48T86 is not set
++# CONFIG_RTC_DRV_M48T35 is not set
++# CONFIG_RTC_DRV_M48T59 is not set
++# CONFIG_RTC_DRV_BQ4802 is not set
++# CONFIG_RTC_DRV_V3020 is not set
++# CONFIG_RTC_DRV_RTC7301 is not set
++CONFIG_EXT3_FS=y
++CONFIG_JBD=y
+CONFIG_XFS_FS=y
-+# CONFIG_XFS_QUOTA is not set
-+# CONFIG_XFS_POSIX_ACL is not set
-+# CONFIG_XFS_RT is not set
-+# CONFIG_XFS_DEBUG is not set
-+# CONFIG_GFS2_FS is not set
++# CONFIG_DNOTIFY is not set
++CONFIG_INOTIFY=y
++CONFIG_INOTIFY_USER=y
+CONFIG_ISO9660_FS=y
++# CONFIG_VFAT_FS is not set
++# CONFIG_JFFS2_FS is not set
++# CONFIG_JFFS2_CMODE_PRIORITY is not set
++# CONFIG_SQUASHFS is not set
++# CONFIG_MINI_FO is not set
++# CONFIG_NETWORK_FILESYSTEMS is not set
+CONFIG_NLS=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_AEAD=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_GF128MUL=y
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_ECB=y
-+CONFIG_CRYPTO_HMAC=y
-+CONFIG_CRYPTO_SHA1=y
-+CONFIG_CRYPTO_SHA256=y
-+CONFIG_CRYPTO_AES=y
-+CONFIG_CRYPTO_AES_586=y
-+CONFIG_CRYPTO_ARC4=y
-+CONFIG_CRYPTO_DEFLATE=y
-+CONFIG_CRYPTO_DEV_PADLOCK=y
-+CONFIG_CRYPTO_DEV_PADLOCK_AES=y
-+CONFIG_CRYPTO_DEV_PADLOCK_SHA=y
-+CONFIG_CRC16=y
-+CONFIG_TEXTSEARCH_KMP=y
-+CONFIG_TEXTSEARCH_BM=y
-+CONFIG_TEXTSEARCH_FSM=y
-+CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-+CONFIG_BLK_DEV_LOOP=y
-+CONFIG_COMPAT_VDSO=y
-+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-+CONFIG_HIDRAW=y
-+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
-+# CONFIG_M386 is not set
-+# CONFIG_M486 is not set
-+CONFIG_M586=y
-+# CONFIG_M586TSC is not set
-+# CONFIG_M586MMX is not set
-+# CONFIG_M686 is not set
-+# CONFIG_MPENTIUMII is not set
-+# CONFIG_MPENTIUMIII is not set
-+# CONFIG_MPENTIUMM is not set
-+# CONFIG_MPENTIUM4 is not set
-+# CONFIG_MK6 is not set
-+# CONFIG_MK7 is not set
-+# CONFIG_MK8 is not set
-+# CONFIG_MCRUSOE is not set
-+# CONFIG_MEFFICEON is not set
-+# CONFIG_MWINCHIPC6 is not set
-+# CONFIG_MWINCHIP2 is not set
-+# CONFIG_MWINCHIP3D is not set
-+# CONFIG_MGEODEGX1 is not set
-+# CONFIG_MGEODE_LX is not set
-+# CONFIG_MCYRIXIII is not set
-+# CONFIG_MVIAC3_2 is not set
-+# CONFIG_MVIAC7 is not set
-+# CONFIG_MCORE2 is not set
-+CONFIG_SERIAL_8250_CONSOLE=y
-+CONFIG_SERIAL_8250_NR_UARTS=2
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-+CONFIG_SERIAL_8250=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_SERIAL_CORE=y
-+CONFIG_X86_32=y
-+CONFIG_X86_ALIGNMENT_16=y
-+CONFIG_X86_BSWAP=y
-+CONFIG_X86_CMPXCHG=y
-+CONFIG_X86_INTEL_USERCOPY=y
-+CONFIG_X86_INVLPG=y
-+CONFIG_X86_XADD=y
-+CONFIG_X86=y
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_ZONE_DMA=y
-+CONFIG_MTD=y
-+# CONFIG_MTD_ABSENT is not set
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+CONFIG_MTD_BLOCK2MTD=y
-+# CONFIG_MTD_CFI is not set
-+# CONFIG_MTD_CFI_I1 is not set
-+# CONFIG_MTD_CFI_I2 is not set
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_CHAR=y
-+# CONFIG_MTD_CMDLINE_PARTS is not set
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_CONCAT is not set
-+# CONFIG_MTD_JEDECPROBE is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_2 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_ONENAND is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_PLATRAM is not set
-+# CONFIG_MTD_PMC551 is not set
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_TS5500 is not set
-+
++CONFIG_NLS_ASCII=y
++CONFIG_NLS_ISO8859_1=y
++CONFIG_NLS_UTF8=y
++# CONFIG_DEBUG_FS is not set
++# CONFIG_SYSCTL_SYSCALL_CHECK is not set
++# CONFIG_X86_VERBOSE_BOOTUP is not set
++# CONFIG_4KSTACKS is not set
++# CONFIG_CRYPTO_ALGAPI is not set
++# CONFIG_CRYPTO_ALGAPI2 is not set
++# CONFIG_CRYPTO_AEAD is not set
++# CONFIG_CRYPTO_AEAD2 is not set
++# CONFIG_CRYPTO_BLKCIPHER is not set
++# CONFIG_CRYPTO_BLKCIPHER2 is not set
++# CONFIG_CRYPTO_HASH is not set
++# CONFIG_CRYPTO_HASH2 is not set
++# CONFIG_CRYPTO_RNG is not set
++# CONFIG_CRYPTO_RNG2 is not set
++# CONFIG_CRYPTO_MANAGER is not set
++# CONFIG_CRYPTO_MANAGER2 is not set
++# CONFIG_CRYPTO_GF128MUL is not set
++# CONFIG_CRYPTO_AUTHENC is not set
++# CONFIG_CRYPTO_GCM is not set
++# CONFIG_CRYPTO_SEQIV is not set
++# CONFIG_CRYPTO_CBC is not set
++# CONFIG_CRYPTO_CTR is not set
++# CONFIG_CRYPTO_ECB is not set
++# CONFIG_CRYPTO_HMAC is not set
++# CONFIG_CRYPTO_MD5 is not set
++# CONFIG_CRYPTO_SHA1 is not set
++# CONFIG_CRYPTO_SHA256 is not set
++# CONFIG_CRYPTO_AES is not set
++# CONFIG_CRYPTO_AES_586 is not set
++# CONFIG_CRYPTO_ARC4 is not set
++# CONFIG_CRYPTO_BLOWFISH is not set
++# CONFIG_CRYPTO_DES is not set
++# CONFIG_CRYPTO_DEFLATE is not set
++# CONFIG_CRYPTO_DEV_PADLOCK is not set
++# CONFIG_CRYPTO_DEV_PADLOCK_AES is not set
++# CONFIG_CRYPTO_DEV_PADLOCK_SHA is not set
++# CONFIG_CRYPTO_DEV_GEODE is not set
++# CONFIG_CRC_CCITT is not set
++# CONFIG_LIBCRC32C is not set
++# CONFIG_TEXTSEARCH_KMP is not set
++# CONFIG_TEXTSEARCH_BM is not set
++# CONFIG_TEXTSEARCH_FSM is not set
++CONFIG_8139TOO_PIO=y
++# CONFIG_8139TOO_TUNE_TWISTER is not set
++# CONFIG_8139TOO_8129 is not set
++# CONFIG_8139_OLD_RX_RESET is not set
++# CONFIG_VIA_RHINE_MMIO is not set
++# CONFIG_R8169_VLAN is not set
Modified: torvm/trunk/build/kamikaze/patches/004-kamikaze-libevent-package.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/004-kamikaze-libevent-package.patch 2009-05-31 21:30:32 UTC (rev 19604)
+++ torvm/trunk/build/kamikaze/patches/004-kamikaze-libevent-package.patch 2009-05-31 23:12:42 UTC (rev 19605)
@@ -1,6 +1,6 @@
diff -Naur a/package/libevent/Makefile b/package/libevent/Makefile
--- a/package/libevent/Makefile 1970-01-01 00:00:00.000000000 +0000
-+++ b/package/libevent/Makefile 2009-02-01 10:05:07.224105888 +0000
++++ b/package/libevent/Makefile 2009-02-01 10:05:07.224105000 +0000
@@ -0,0 +1,66 @@
+#
+# Copyright (C) 2006 OpenWrt.org
Modified: torvm/trunk/build/kamikaze/patches/005-kamikaze-build-config.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/005-kamikaze-build-config.patch 2009-05-31 21:30:32 UTC (rev 19604)
+++ torvm/trunk/build/kamikaze/patches/005-kamikaze-build-config.patch 2009-05-31 23:12:42 UTC (rev 19605)
@@ -1,11 +1,11 @@
diff -Naur a/.config b/.config
--- a/.config 1970-01-01 00:00:00.000000000 +0000
-+++ b/.config 2009-03-28 10:58:13.348583432 +0000
-@@ -0,0 +1,1292 @@
++++ b/.config 2009-05-31 13:59:30.416741000 +0000
+@@ -0,0 +1,1384 @@
+#
+# Automatically generated make config: don't edit
+# OpenWrt version: Kamikaze (unknown)
-+# Sat Mar 14 12:50:32 2009
++# Sun May 31 06:59:30 2009
+#
+CONFIG_HAVE_DOT_CONFIG=y
+# CONFIG_TARGET_ppc40x is not set
@@ -18,72 +18,51 @@
+# CONFIG_TARGET_brcm_2_4 is not set
+# CONFIG_TARGET_brcm47xx is not set
+# CONFIG_TARGET_sibyte is not set
++# CONFIG_TARGET_cavium_octeon is not set
++# CONFIG_TARGET_cobalt is not set
++# CONFIG_TARGET_gemini is not set
+# CONFIG_TARGET_etrax is not set
+# CONFIG_TARGET_amazon is not set
+# CONFIG_TARGET_ifxmips is not set
+# CONFIG_TARGET_adm5120 is not set
+# CONFIG_TARGET_iop32x is not set
+# CONFIG_TARGET_ixp4xx is not set
++# CONFIG_TARGET_kirkwood is not set
+# CONFIG_TARGET_orion is not set
+# CONFIG_TARGET_pxa is not set
+# CONFIG_TARGET_rb532 is not set
+# CONFIG_TARGET_olpc is not set
+# CONFIG_TARGET_rdc is not set
+# CONFIG_TARGET_au1000 is not set
++# CONFIG_TARGET_s3c24xx is not set
+# CONFIG_TARGET_ps3 is not set
+# CONFIG_TARGET_storm is not set
+# CONFIG_TARGET_ar7 is not set
+# CONFIG_TARGET_uml is not set
-+# CONFIG_TARGET_s3c24xx is not set
+CONFIG_TARGET_x86=y
-+# CONFIG_TARGET_ifxmips_generic is not set
-+# CONFIG_TARGET_ifxmips_nfs is not set
-+CONFIG_TARGET_x86_generic=y
++# CONFIG_TARGET_orion_generic is not set
++# CONFIG_TARGET_orion_harddisk is not set
+# CONFIG_TARGET_ixp4xx_generic is not set
+# CONFIG_TARGET_ixp4xx_harddisk is not set
-+# CONFIG_TARGET_ps3_petitboot is not set
++# CONFIG_TARGET_au1000_au1500 is not set
++# CONFIG_TARGET_au1000_au1550 is not set
+# CONFIG_TARGET_adm5120_router_le is not set
+# CONFIG_TARGET_adm5120_router_be is not set
-+# CONFIG_TARGET_ifxmips_None is not set
-+# CONFIG_TARGET_ifxmips_Atheros is not set
-+# CONFIG_TARGET_ifxmips_Ralink is not set
-+# CONFIG_TARGET_ifxmips_generic_None is not set
-+# CONFIG_TARGET_ifxmips_generic_Atheros is not set
-+# CONFIG_TARGET_ifxmips_generic_Ralink is not set
-+# CONFIG_TARGET_ifxmips_nfs_None is not set
-+# CONFIG_TARGET_ifxmips_nfs_Atheros is not set
-+# CONFIG_TARGET_ifxmips_nfs_Ralink is not set
++CONFIG_TARGET_x86_generic=y
++# CONFIG_TARGET_ps3_petitboot is not set
+# CONFIG_TARGET_ppc44x_Default is not set
+# CONFIG_TARGET_etrax_default is not set
+# CONFIG_TARGET_etrax_vhdl_no_fb is not set
-+# CONFIG_TARGET_brcm_2_4_Broadcom is not set
-+# CONFIG_TARGET_brcm_2_4_BroadcomMimo is not set
-+# CONFIG_TARGET_brcm_2_4_Atheros is not set
-+# CONFIG_TARGET_brcm_2_4_None is not set
-+# CONFIG_TARGET_brcm_2_4_USBGeneric is not set
-+# CONFIG_TARGET_brcm_2_4_WL500G is not set
-+# CONFIG_TARGET_brcm_2_4_WL500GD is not set
-+# CONFIG_TARGET_brcm_2_4_WL500GP is not set
-+# CONFIG_TARGET_brcm_2_4_WL700GE is not set
-+# CONFIG_TARGET_brcm_2_4_WLHDD is not set
-+# CONFIG_TARGET_brcm_2_4_WRT54G3G is not set
+# CONFIG_TARGET_iop32x_Default is not set
-+# CONFIG_TARGET_amazon_Default is not set
-+CONFIG_TARGET_x86_generic_Generic=y
-+# CONFIG_TARGET_x86_generic_Alix is not set
-+# CONFIG_TARGET_x86_generic_Pcengines is not set
-+# CONFIG_TARGET_x86_generic_Soekris45xx is not set
-+# CONFIG_TARGET_x86_generic_Soekris48xx is not set
-+# CONFIG_TARGET_orion_Default is not set
++# CONFIG_TARGET_orion_generic_Default is not set
++# CONFIG_TARGET_orion_harddisk_Default is not set
+# CONFIG_TARGET_pxa_Default is not set
++# CONFIG_TARGET_kirkwood_Default is not set
+# CONFIG_TARGET_ar7_Texas is not set
+# CONFIG_TARGET_ar7_None is not set
-+# CONFIG_TARGET_ar71xx_Default is not set
++# CONFIG_TARGET_rb532_Default is not set
++# CONFIG_TARGET_olpc_Default is not set
+# CONFIG_TARGET_avr32_Default is not set
-+# CONFIG_TARGET_olpc_Default is not set
-+# CONFIG_TARGET_rb532_Default is not set
-+# CONFIG_TARGET_uml_Default is not set
-+# CONFIG_TARGET_sibyte_Default is not set
+# CONFIG_TARGET_ixp4xx_generic_Default is not set
+# CONFIG_TARGET_ixp4xx_generic_Atheros-ath5k is not set
+# CONFIG_TARGET_ixp4xx_generic_NSLU2 is not set
@@ -91,17 +70,11 @@
+# CONFIG_TARGET_ixp4xx_generic_DSMG600RevA is not set
+# CONFIG_TARGET_ixp4xx_generic_USR8200 is not set
+# CONFIG_TARGET_ixp4xx_harddisk_FSG3 is not set
-+# CONFIG_TARGET_storm_Default is not set
-+# CONFIG_TARGET_atheros_Default is not set
-+# CONFIG_TARGET_ps3_petitboot_Default is not set
-+# CONFIG_TARGET_au1000_Atheros is not set
-+# CONFIG_TARGET_au1000_InternetBox is not set
-+# CONFIG_TARGET_au1000_MeshCube is not set
-+# CONFIG_TARGET_rdc_amit is not set
-+# CONFIG_TARGET_rdc_ar525w is not set
-+# CONFIG_TARGET_rdc_dir450 is not set
-+# CONFIG_TARGET_rdc_g570s is not set
-+# CONFIG_TARGET_rdc_wl153 is not set
++# CONFIG_TARGET_cobalt_Default is not set
++# CONFIG_TARGET_au1000_au1500_Atheros is not set
++# CONFIG_TARGET_au1000_au1500_InternetBox is not set
++# CONFIG_TARGET_au1000_au1500_MeshCube is not set
++# CONFIG_TARGET_au1000_au1550_DBAu1550 is not set
+# CONFIG_TARGET_adm5120_router_le_Generic is not set
+# CONFIG_TARGET_adm5120_router_le_CAS630 is not set
+# CONFIG_TARGET_adm5120_router_le_CAS630W is not set
@@ -130,6 +103,8 @@
+# CONFIG_TARGET_adm5120_router_be_Generic is not set
+# CONFIG_TARGET_adm5120_router_be_P334WT is not set
+# CONFIG_TARGET_adm5120_router_be_P335WT is not set
++# CONFIG_TARGET_cavium_octeon_mototech is not set
++# CONFIG_TARGET_cavium_octeon_simulator is not set
+# CONFIG_TARGET_brcm63xx_Broadcom is not set
+# CONFIG_TARGET_brcm63xx_Atheros is not set
+# CONFIG_TARGET_brcm63xx_Ralink is not set
@@ -140,13 +115,55 @@
+# CONFIG_TARGET_brcm47xx_WGT634U is not set
+# CONFIG_TARGET_brcm47xx_WL500GPv1 is not set
+# CONFIG_TARGET_brcm47xx_WRTSL54GS is not set
-+# CONFIG_TARGET_at91_Default is not set
-+# CONFIG_TARGET_ppc40x_Default is not set
++# CONFIG_TARGET_ifxmips_None is not set
++# CONFIG_TARGET_ifxmips_Atheros is not set
++# CONFIG_TARGET_ifxmips_Ralink is not set
++# CONFIG_TARGET_brcm_2_4_Broadcom is not set
++# CONFIG_TARGET_brcm_2_4_BroadcomMimo is not set
++# CONFIG_TARGET_brcm_2_4_None is not set
++# CONFIG_TARGET_brcm_2_4_USBGeneric is not set
++# CONFIG_TARGET_brcm_2_4_WL500G is not set
++# CONFIG_TARGET_brcm_2_4_WL500GD is not set
++# CONFIG_TARGET_brcm_2_4_WL500GP is not set
++# CONFIG_TARGET_brcm_2_4_WL700GE is not set
++# CONFIG_TARGET_brcm_2_4_WLHDD is not set
++# CONFIG_TARGET_brcm_2_4_WRT54G3G is not set
++CONFIG_TARGET_x86_generic_Generic=y
++# CONFIG_TARGET_x86_generic_Alix is not set
++# CONFIG_TARGET_x86_generic_Pcengines is not set
++# CONFIG_TARGET_x86_generic_Soekris45xx is not set
++# CONFIG_TARGET_x86_generic_Soekris48xx is not set
++# CONFIG_TARGET_amazon_Default is not set
++# CONFIG_TARGET_ar71xx_Default is not set
++# CONFIG_TARGET_ar71xx_Madwifi is not set
++# CONFIG_TARGET_ar71xx_A02RBW300N is not set
++# CONFIG_TARGET_ar71xx_WP543 is not set
++# CONFIG_TARGET_ar71xx_DIR615C1 is not set
++# CONFIG_TARGET_ar71xx_MZKW04NU is not set
++# CONFIG_TARGET_ar71xx_TLWR941NDV2 is not set
++# CONFIG_TARGET_ar71xx_TEW632BRP is not set
++# CONFIG_TARGET_ar71xx_TEW652BRP is not set
++# CONFIG_TARGET_ar71xx_UBNTRS is not set
++# CONFIG_TARGET_uml_Default is not set
++# CONFIG_TARGET_sibyte_Default is not set
++# CONFIG_TARGET_storm_Default is not set
++# CONFIG_TARGET_atheros_Default is not set
++# CONFIG_TARGET_ps3_petitboot_Default is not set
++# CONFIG_TARGET_gemini_Default is not set
++# CONFIG_TARGET_rdc_amit is not set
++# CONFIG_TARGET_rdc_ar525w is not set
++# CONFIG_TARGET_rdc_dir450 is not set
++# CONFIG_TARGET_rdc_g570s is not set
++# CONFIG_TARGET_rdc_r8610 is not set
++# CONFIG_TARGET_rdc_wl153 is not set
+# CONFIG_TARGET_s3c24xx_openmoko-gta02-minimal is not set
+# CONFIG_TARGET_s3c24xx_openmoko-gta02-full is not set
++# CONFIG_TARGET_ppc40x_Default is not set
++# CONFIG_TARGET_at91_Default is not set
+CONFIG_HAS_SUBTARGETS=y
+CONFIG_TARGET_BOARD="x86"
-+CONFIG_LINUX_2_6_27=y
++CONFIG_DEFAULT_TARGET_OPTIMIZATION="-O2 -pipe -march=i486 -funit-at-a-time"
++CONFIG_LINUX_2_6_28=y
+CONFIG_DEFAULT_base-files=y
+CONFIG_DEFAULT_busybox=y
+CONFIG_DEFAULT_dnsmasq=y
@@ -178,7 +195,11 @@
+CONFIG_LINUX_2_6=y
+CONFIG_DISPLAY_SUPPORT=y
+CONFIG_PCI_SUPPORT=y
++CONFIG_PCMCIA_SUPPORT=y
++CONFIG_USES_SQUASHFS=y
++CONFIG_USES_JFFS2=y
+CONFIG_USES_EXT2=y
++CONFIG_USES_TGZ=y
+CONFIG_i386=y
+CONFIG_ARCH="i386"
+
@@ -203,14 +224,14 @@
+#
+# Features
+#
-+# CONFIG_CLEAN_IPKG is not set
++CONFIG_CLEAN_IPKG=y
+
+#
+# Package build options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_DIR is not set
-+# CONFIG_NO_STRIP is not set
++CONFIG_NO_STRIP=y
+
+#
+# Kernel build options
@@ -223,54 +244,81 @@
+CONFIG_LOCALMIRROR=""
+CONFIG_AUTOREBUILD=y
+CONFIG_BUILD_SUFFIX=""
-+# CONFIG_CCACHE is not set
++CONFIG_TARGET_ROOTFS_DIR=""
++CONFIG_CCACHE=y
+CONFIG_EXTERNAL_KERNEL_TREE=""
+CONFIG_KERNEL_GIT_CLONE_URI=""
+CONFIG_KERNEL_GIT_LOCAL_REPOSITORY=""
+# CONFIG_NATIVE_TOOLCHAIN is not set
+CONFIG_TOOLCHAINOPTS=y
+# CONFIG_EXTRA_TARGET_ARCH is not set
-+# CONFIG_BINUTILS_VERSION_2_17 is not set
-+CONFIG_BINUTILS_VERSION_2_18=y
-+# CONFIG_BINUTILS_VERSION_2_19 is not set
++# CONFIG_BINUTILS_VERSION_2_18 is not set
++CONFIG_BINUTILS_VERSION_2_19_1=y
+CONFIG_EXTRA_BINUTILS_CONFIG_OPTIONS=""
-+CONFIG_BINUTILS_VERSION="2.18"
++CONFIG_BINUTILS_VERSION="2.19.1"
+# CONFIG_GCC_VERSION_3_4_6 is not set
-+CONFIG_GCC_VERSION_4_1_2=y
++# CONFIG_GCC_VERSION_4_1_2 is not set
+# CONFIG_GCC_VERSION_4_2_4 is not set
-+# CONFIG_GCC_VERSION_4_3_1 is not set
-+# CONFIG_GCC_VERSION_4_3_2 is not set
+# CONFIG_GCC_VERSION_4_3_3 is not set
++CONFIG_GCC_VERSION_4_4_0=y
+CONFIG_EXTRA_GCC_CONFIG_OPTIONS=""
-+# CONFIG_SSP_SUPPORT is not set
++CONFIG_SSP_SUPPORT=y
+# CONFIG_INSTALL_LIBSTDCPP is not set
+# CONFIG_INSTALL_LIBGCJ is not set
-+# CONFIG_USE_EGLIBC is not set
++CONFIG_USE_EGLIBC=y
+# CONFIG_USE_GLIBC is not set
-+CONFIG_USE_UCLIBC=y
-+# CONFIG_UCLIBC_VERSION_SNAPSHOT is not set
-+# CONFIG_UCLIBC_VERSION_0_9_28 is not set
-+CONFIG_UCLIBC_VERSION_0_9_29=y
-+# CONFIG_UCLIBC_VERSION_0_9_30 is not set
-+CONFIG_UCLIBC_EXTRA_VERSION=""
++# CONFIG_USE_UCLIBC is not set
++# CONFIG_EGLIBC_VERSION_2_6_1 is not set
++# CONFIG_EGLIBC_VERSION_2_7 is not set
++# CONFIG_EGLIBC_VERSION_2_8 is not set
++CONFIG_EGLIBC_VERSION_2_9=y
++# CONFIG_EGLIBC_VERSION_TRUNK is not set
++CONFIG_EGLIBC_REVISION="7430"
++
++#
++# eglibc configuration
++#
++CONFIG_EGLIBC_OPTION_EGLIBC_ADVANCED_INET6=y
++# CONFIG_EGLIBC_OPTION_EGLIBC_BACKTRACE is not set
++CONFIG_EGLIBC_OPTION_EGLIBC_BSD=y
++CONFIG_EGLIBC_OPTION_EGLIBC_CXX_TESTS=y
++CONFIG_EGLIBC_OPTION_EGLIBC_CATGETS=y
++CONFIG_EGLIBC_OPTION_EGLIBC_CHARSETS=y
++# CONFIG_EGLIBC_OPTION_EGLIBC_DB_ALIASES is not set
++CONFIG_EGLIBC_OPTION_EGLIBC_ENVZ=y
++CONFIG_EGLIBC_OPTION_EGLIBC_FSTAB=y
++CONFIG_EGLIBC_OPTION_EGLIBC_INET=y
++CONFIG_EGLIBC_OPTION_EGLIBC_LIBM=y
++CONFIG_EGLIBC_OPTION_EGLIBC_LOCALES=y
++CONFIG_EGLIBC_OPTION_EGLIBC_LOCALE_CODE=y
++CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH=y
++# CONFIG_EGLIBC_OPTION_EGLIBC_RCMD is not set
++# CONFIG_EGLIBC_OPTION_EGLIBC_SPAWN is not set
++# CONFIG_EGLIBC_OPTION_EGLIBC_STREAMS is not set
++# CONFIG_EGLIBC_OPTION_EGLIBC_SUNRPC is not set
++# CONFIG_EGLIBC_OPTION_EGLIBC_UTMP is not set
++CONFIG_EGLIBC_OPTION_EGLIBC_WORDEXP=y
++CONFIG_EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR=y
++CONFIG_EGLIBC_OPTION_POSIX_REGEXP=y
++CONFIG_EGLIBC_OPTION_POSIX_WIDE_CHAR_DEVICE_IO=y
+# CONFIG_GDB is not set
+CONFIG_LARGEFILE=y
-+CONFIG_SHADOW_PASSWORDS=y
-+CONFIG_TARGET_OPTIMIZATION="-O2 -pipe -march=i586"
-+CONFIG_GCC_VERSION="4.1.2"
++# CONFIG_SHADOW_PASSWORDS is not set
++CONFIG_TARGET_OPTIMIZATION="-O2 -pipe -march=i686"
++CONFIG_GCC_VERSION="4.4.0"
+CONFIG_GCC_VERSION_4=y
-+CONFIG_GCC_VERSION_4_1=y
-+CONFIG_UCLIBC_VERSION="0.9.29"
-+CONFIG_LIBC="uClibc"
-+CONFIG_LIBC_VERSION="0.9.29"
-+CONFIG_TARGET_SUFFIX="uclibc"
++CONFIG_GCC_VERSION_4_4=y
++CONFIG_EGLIBC_VERSION="2.9"
++CONFIG_LIBC="eglibc"
++CONFIG_LIBC_VERSION="2.9"
++CONFIG_TARGET_SUFFIX="gnu"
+# CONFIG_SDK is not set
+# CONFIG_UCI_PRECONFIG is not set
+CONFIG_UCI_PRECONFIG_network_lan_dns=""
+CONFIG_UCI_PRECONFIG_network_lan_proto="static"
+CONFIG_UCI_PRECONFIG_network_lan_gateway=""
-+CONFIG_UCI_PRECONFIG_network_lan_netmask=""
-+CONFIG_UCI_PRECONFIG_network_lan_ipaddr=""
++CONFIG_UCI_PRECONFIG_network_lan_netmask="255.255.255.0"
++CONFIG_UCI_PRECONFIG_network_lan_ipaddr="192.168.1.1"
+
+#
+# Base system
@@ -297,8 +345,8 @@
+#
+# CONFIG_BUSYBOX_CONFIG_DESKTOP is not set
+# CONFIG_BUSYBOX_CONFIG_FEATURE_ASSUME_UNICODE is not set
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
-+CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_BUSYBOX_CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_BUSYBOX_CONFIG_SHOW_USAGE=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_VERBOSE_USAGE=y
@@ -320,7 +368,8 @@
+#
+# Build Options
+#
-+CONFIG_BUSYBOX_CONFIG_STATIC=y
++# CONFIG_BUSYBOX_CONFIG_STATIC is not set
++CONFIG_BUSYBOX_CONFIG_PIE=y
+# CONFIG_BUSYBOX_CONFIG_NOMMU is not set
+CONFIG_BUSYBOX_CONFIG_LFS=y
+CONFIG_BUSYBOX_CONFIG_CROSS_COMPILER_PREFIX=""
@@ -351,7 +400,7 @@
+CONFIG_BUSYBOX_CONFIG_PASSWORD_MINLEN=6
+CONFIG_BUSYBOX_CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP=y
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_ETC_NETWORKS is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_ETC_NETWORKS=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_MAX_LEN=512
+CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_VI=y
@@ -361,8 +410,8 @@
+# CONFIG_BUSYBOX_CONFIG_FEATURE_USERNAME_COMPLETION is not set
+CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
-+CONFIG_BUSYBOX_CONFIG_FEATURE_COPYBUF_KB=4
-+# CONFIG_BUSYBOX_CONFIG_MONOTONIC_SYSCALL is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_COPYBUF_KB=16
++CONFIG_BUSYBOX_CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_BUSYBOX_CONFIG_IOCTL_HEX2STR_ERROR=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_HWIB is not set
+
@@ -399,7 +448,7 @@
+CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_UNAME_GNAME=y
+# CONFIG_BUSYBOX_CONFIG_UNCOMPRESS is not set
+# CONFIG_BUSYBOX_CONFIG_UNLZMA is not set
-+# CONFIG_BUSYBOX_CONFIG_UNZIP is not set
++CONFIG_BUSYBOX_CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
@@ -428,7 +477,8 @@
+CONFIG_BUSYBOX_CONFIG_DF=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_DF_INODE is not set
+CONFIG_BUSYBOX_CONFIG_DIRNAME=y
-+# CONFIG_BUSYBOX_CONFIG_DOS2UNIX is not set
++CONFIG_BUSYBOX_CONFIG_DOS2UNIX=y
++# CONFIG_BUSYBOX_CONFIG_UNIX2DOS is not set
+CONFIG_BUSYBOX_CONFIG_DU=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_BUSYBOX_CONFIG_ECHO=y
@@ -472,7 +522,7 @@
+CONFIG_BUSYBOX_CONFIG_PWD=y
+CONFIG_BUSYBOX_CONFIG_READLINK=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_READLINK_FOLLOW is not set
-+# CONFIG_BUSYBOX_CONFIG_REALPATH is not set
++CONFIG_BUSYBOX_CONFIG_REALPATH=y
+CONFIG_BUSYBOX_CONFIG_RM=y
+CONFIG_BUSYBOX_CONFIG_RMDIR=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
@@ -505,8 +555,8 @@
+# CONFIG_BUSYBOX_CONFIG_UNEXPAND is not set
+CONFIG_BUSYBOX_CONFIG_UNIQ=y
+CONFIG_BUSYBOX_CONFIG_USLEEP=y
-+# CONFIG_BUSYBOX_CONFIG_UUDECODE is not set
-+# CONFIG_BUSYBOX_CONFIG_UUENCODE is not set
++CONFIG_BUSYBOX_CONFIG_UUDECODE=y
++CONFIG_BUSYBOX_CONFIG_UUENCODE=y
+CONFIG_BUSYBOX_CONFIG_WC=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_WC_LARGE is not set
+# CONFIG_BUSYBOX_CONFIG_WHO is not set
@@ -589,8 +639,8 @@
+#
+CONFIG_BUSYBOX_CONFIG_FIND=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PRINT0=y
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_MTIME is not set
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_MMIN is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_MTIME=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PERM=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_XDEV=y
@@ -605,7 +655,7 @@
+CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PRUNE=y
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_DELETE is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_DELETE=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PATH=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_REGEX=y
+CONFIG_BUSYBOX_CONFIG_GREP=y
@@ -648,13 +698,12 @@
+# CONFIG_BUSYBOX_CONFIG_FEATURE_UTMP is not set
+# CONFIG_BUSYBOX_CONFIG_FEATURE_WTMP is not set
+# CONFIG_BUSYBOX_CONFIG_LOGIN is not set
-+CONFIG_BUSYBOX_CONFIG_PASSWD=y
-+CONFIG_BUSYBOX_CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
++# CONFIG_BUSYBOX_CONFIG_PASSWD is not set
+# CONFIG_BUSYBOX_CONFIG_CRYPTPW is not set
+# CONFIG_BUSYBOX_CONFIG_CHPASSWD is not set
+CONFIG_BUSYBOX_CONFIG_SU=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_SU_SYSLOG is not set
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+# CONFIG_BUSYBOX_CONFIG_SULOGIN is not set
+# CONFIG_BUSYBOX_CONFIG_VLOCK is not set
+
@@ -662,7 +711,7 @@
+# Linux Ext2 FS Progs
+#
+# CONFIG_BUSYBOX_CONFIG_CHATTR is not set
-+# CONFIG_BUSYBOX_CONFIG_FSCK is not set
++CONFIG_BUSYBOX_CONFIG_FSCK=y
+# CONFIG_BUSYBOX_CONFIG_LSATTR is not set
+
+#
@@ -699,17 +748,33 @@
+# CONFIG_BUSYBOX_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
+# CONFIG_BUSYBOX_CONFIG_IPCRM is not set
+# CONFIG_BUSYBOX_CONFIG_IPCS is not set
-+# CONFIG_BUSYBOX_CONFIG_LOSETUP is not set
++CONFIG_BUSYBOX_CONFIG_LOSETUP=y
+# CONFIG_BUSYBOX_CONFIG_MDEV is not set
+# CONFIG_BUSYBOX_CONFIG_MKSWAP is not set
-+# CONFIG_BUSYBOX_CONFIG_MORE is not set
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_USE_TERMIOS is not set
-+# CONFIG_BUSYBOX_CONFIG_VOLUMEID is not set
++CONFIG_BUSYBOX_CONFIG_MORE=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_USE_TERMIOS=y
++CONFIG_BUSYBOX_CONFIG_VOLUMEID=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_EXT=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_REISERFS is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_FAT=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_HFS is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_JFS is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_XFS=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_NTFS is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_ISO9660=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UDF is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_LUKS is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_ROMFS is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SYSV is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
++# CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
+CONFIG_BUSYBOX_CONFIG_MOUNT=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_FAKE is not set
+# CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_VERBOSE is not set
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_HELPERS is not set
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_LABEL is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_HELPERS=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_LABEL=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_NFS is not set
+# CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_CIFS is not set
+CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_FLAGS=y
@@ -778,8 +843,7 @@
+#
+# Networking Utilities
+#
-+CONFIG_BUSYBOX_CONFIG_FEATURE_IPV6=y
-+CONFIG_BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
++# CONFIG_BUSYBOX_CONFIG_FEATURE_IPV6 is not set
+CONFIG_BUSYBOX_CONFIG_VERBOSE_RESOLUTION_ERRORS=y
+CONFIG_BUSYBOX_CONFIG_ARP=y
+CONFIG_BUSYBOX_CONFIG_ARPING=y
@@ -811,16 +875,13 @@
+CONFIG_BUSYBOX_CONFIG_FEATURE_NETSTAT_WIDE=y
+CONFIG_BUSYBOX_CONFIG_NSLOOKUP=y
+CONFIG_BUSYBOX_CONFIG_PING=y
-+# CONFIG_BUSYBOX_CONFIG_PING6 is not set
+CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_BUSYBOX_CONFIG_PSCAN is not set
+CONFIG_BUSYBOX_CONFIG_ROUTE=y
+# CONFIG_BUSYBOX_CONFIG_SENDMAIL is not set
+# CONFIG_BUSYBOX_CONFIG_FETCHMAIL is not set
+# CONFIG_BUSYBOX_CONFIG_SLATTACH is not set
-+CONFIG_BUSYBOX_CONFIG_TELNET=y
-+CONFIG_BUSYBOX_CONFIG_FEATURE_TELNET_TTYPE=y
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
++# CONFIG_BUSYBOX_CONFIG_TELNET is not set
+# CONFIG_BUSYBOX_CONFIG_TELNETD is not set
+# CONFIG_BUSYBOX_CONFIG_TFTP is not set
+# CONFIG_BUSYBOX_CONFIG_TFTPD is not set
@@ -860,8 +921,8 @@
+CONFIG_BUSYBOX_CONFIG_TOP=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_DECIMALS is not set
-+# CONFIG_BUSYBOX_CONFIG_FEATURE_TOPMEM is not set
++CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_DECIMALS=y
++CONFIG_BUSYBOX_CONFIG_FEATURE_TOPMEM=y
+CONFIG_BUSYBOX_CONFIG_UPTIME=y
+CONFIG_BUSYBOX_CONFIG_WATCH=y
+
@@ -879,7 +940,7 @@
+#
+CONFIG_BUSYBOX_CONFIG_ASH_BASH_COMPAT=y
+CONFIG_BUSYBOX_CONFIG_ASH_JOB_CONTROL=y
-+# CONFIG_BUSYBOX_CONFIG_ASH_READ_NCHARS is not set
++CONFIG_BUSYBOX_CONFIG_ASH_READ_NCHARS=y
+CONFIG_BUSYBOX_CONFIG_ASH_READ_TIMEOUT=y
+CONFIG_BUSYBOX_CONFIG_ASH_ALIAS=y
+CONFIG_BUSYBOX_CONFIG_ASH_MATH_SUPPORT=y
@@ -891,7 +952,7 @@
+CONFIG_BUSYBOX_CONFIG_ASH_CMDCMD=y
+# CONFIG_BUSYBOX_CONFIG_ASH_MAIL is not set
+# CONFIG_BUSYBOX_CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
-+# CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT is not set
++CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_BUSYBOX_CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_BUSYBOX_CONFIG_HUSH is not set
+# CONFIG_BUSYBOX_CONFIG_LASH is not set
@@ -948,6 +1009,7 @@
+CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
+CONFIG_PACKAGE_iptables-mod-extra=y
+CONFIG_PACKAGE_iptables-mod-filter=y
++# CONFIG_PACKAGE_iptables-mod-imq is not set
+CONFIG_PACKAGE_iptables-mod-ipopt=y
+CONFIG_PACKAGE_iptables-mod-iprange=y
+# CONFIG_PACKAGE_iptables-mod-ipsec is not set
@@ -956,13 +1018,14 @@
+CONFIG_PACKAGE_iptables-mod-nat-extra=y
+# CONFIG_PACKAGE_iptables-mod-ulog is not set
+CONFIG_PACKAGE_iptables-utils=y
-+# CONFIG_PACKAGE_ldconfig is not set
+CONFIG_PACKAGE_libc=y
+CONFIG_PACKAGE_libgcc=y
+CONFIG_PACKAGE_libpthread=y
+CONFIG_PACKAGE_librt=y
++# CONFIG_PACKAGE_libssp is not set
+# CONFIG_PACKAGE_mtd is not set
+# CONFIG_PACKAGE_opkg is not set
++# CONFIG_PACKAGE_qos-scripts is not set
+# CONFIG_PACKAGE_swconfig is not set
+# CONFIG_PACKAGE_uci is not set
+# CONFIG_PACKAGE_udevtrigger is not set
@@ -976,23 +1039,26 @@
+# disc
+#
+# CONFIG_PACKAGE_libfuse is not set
-+# CONFIG_PACKAGE_libblkid is not set
++CONFIG_PACKAGE_libblkid=y
+CONFIG_PACKAGE_libevent=y
+# CONFIG_PACKAGE_libext2fs is not set
++CONFIG_PACKAGE_libiptc=y
+# CONFIG_PACKAGE_libiw is not set
+# CONFIG_PACKAGE_libltdl is not set
+# CONFIG_PACKAGE_liblua is not set
+# CONFIG_PACKAGE_libncurses is not set
+# CONFIG_PACKAGE_libnl is not set
++CONFIG_PACKAGE_libnl-tiny=y
+CONFIG_PACKAGE_libopenssl=y
-+# CONFIG_PACKAGE_libpcap is not set
++CONFIG_PACKAGE_libpcap=y
+# CONFIG_PACKAGE_libreadline is not set
+# CONFIG_PACKAGE_libuci is not set
+# CONFIG_PACKAGE_libuci-lua is not set
-+# CONFIG_PACKAGE_libuuid is not set
++CONFIG_PACKAGE_libupnp=y
++CONFIG_PACKAGE_libuuid=y
++CONFIG_PACKAGE_libxtables=y
+# CONFIG_PACKAGE_linux-atm is not set
+CONFIG_PACKAGE_zlib=y
-+CONFIG_PACKAGE_libupnp=y
+
+#
+# Network
@@ -1013,6 +1079,8 @@
+CONFIG_PACKAGE_tc=y
+CONFIG_PACKAGE_tor=y
+# CONFIG_PACKAGE_wpa-supplicant is not set
++# CONFIG_PACKAGE_wprobe-export is not set
++# CONFIG_PACKAGE_wprobe-info is not set
+
+#
+# IPv6
@@ -1029,8 +1097,9 @@
+# CONFIG_PACKAGE_kmod-aoe is not set
+# CONFIG_PACKAGE_kmod-ata-core is not set
+# CONFIG_PACKAGE_kmod-ide-aec62xx is not set
-+CONFIG_PACKAGE_kmod-ide-core=y
-+CONFIG_PACKAGE_kmod-loop=y
++# CONFIG_PACKAGE_kmod-ide-core is not set
++# CONFIG_PACKAGE_kmod-ide-it821x is not set
++# CONFIG_PACKAGE_kmod-loop is not set
+# CONFIG_PACKAGE_kmod-nbd is not set
+# CONFIG_PACKAGE_kmod-scsi-core is not set
+# CONFIG_PACKAGE_kmod-scsi-generic is not set
@@ -1039,9 +1108,9 @@
+# Cryptographic API modules
+#
+# CONFIG_PACKAGE_kmod-crypto-aes is not set
-+CONFIG_PACKAGE_kmod-crypto-arc4=y
++# CONFIG_PACKAGE_kmod-crypto-arc4 is not set
+# CONFIG_PACKAGE_kmod-crypto-authenc is not set
-+CONFIG_PACKAGE_kmod-crypto-core=y
++# CONFIG_PACKAGE_kmod-crypto-core is not set
+# CONFIG_PACKAGE_kmod-crypto-des is not set
+# CONFIG_PACKAGE_kmod-crypto-hmac is not set
+# CONFIG_PACKAGE_kmod-crypto-hw-geode is not set
@@ -1052,33 +1121,38 @@
+# CONFIG_PACKAGE_kmod-crypto-misc is not set
+# CONFIG_PACKAGE_kmod-crypto-null is not set
+# CONFIG_PACKAGE_kmod-crypto-ocf is not set
-+CONFIG_PACKAGE_kmod-crypto-sha1=y
++# CONFIG_PACKAGE_kmod-crypto-sha1 is not set
+# CONFIG_PACKAGE_kmod-crypto-test is not set
+
+#
+# Filesystems
+#
+# CONFIG_PACKAGE_kmod-fs-cifs is not set
-+CONFIG_PACKAGE_kmod-fs-ext2=y
++# CONFIG_PACKAGE_kmod-fs-exportfs is not set
++# CONFIG_PACKAGE_kmod-fs-ext2 is not set
+# CONFIG_PACKAGE_kmod-fs-ext3 is not set
++# CONFIG_PACKAGE_kmod-fs-ext4 is not set
+# CONFIG_PACKAGE_kmod-fs-hfs is not set
+# CONFIG_PACKAGE_kmod-fs-hfsplus is not set
-+CONFIG_PACKAGE_kmod-fs-isofs=y
-+CONFIG_PACKAGE_kmod-fs-mbcache=y
++# CONFIG_PACKAGE_kmod-fs-isofs is not set
++# CONFIG_PACKAGE_kmod-fs-mbcache is not set
+# CONFIG_PACKAGE_kmod-fs-minix is not set
+# CONFIG_PACKAGE_kmod-fs-msdos is not set
++# CONFIG_PACKAGE_kmod-fs-nfs is not set
+# CONFIG_PACKAGE_kmod-fs-nfs-common is not set
++# CONFIG_PACKAGE_kmod-fs-nfsd is not set
+# CONFIG_PACKAGE_kmod-fs-ntfs is not set
+# CONFIG_PACKAGE_kmod-fs-reiserfs is not set
+# CONFIG_PACKAGE_kmod-fs-udf is not set
+# CONFIG_PACKAGE_kmod-fs-vfat is not set
+# CONFIG_PACKAGE_kmod-fs-xfs is not set
+# CONFIG_PACKAGE_kmod-fuse is not set
-+CONFIG_PACKAGE_kmod-nls-base=y
++# CONFIG_PACKAGE_kmod-nls-base is not set
+# CONFIG_PACKAGE_kmod-nls-cp1250 is not set
+# CONFIG_PACKAGE_kmod-nls-cp1251 is not set
+# CONFIG_PACKAGE_kmod-nls-cp437 is not set
+# CONFIG_PACKAGE_kmod-nls-cp850 is not set
++# CONFIG_PACKAGE_kmod-nls-cp852 is not set
+# CONFIG_PACKAGE_kmod-nls-iso8859-1 is not set
+# CONFIG_PACKAGE_kmod-nls-iso8859-15 is not set
+# CONFIG_PACKAGE_kmod-nls-iso8859-2 is not set
@@ -1103,7 +1177,7 @@
+#
+# Netfilter Extensions
+#
-+CONFIG_PACKAGE_kmod-arptables=y
++# CONFIG_PACKAGE_kmod-arptables is not set
+# CONFIG_PACKAGE_kmod-ebtables is not set
+# CONFIG_PACKAGE_kmod-ip6tables is not set
+CONFIG_PACKAGE_kmod-ipt-core=y
@@ -1111,6 +1185,7 @@
+CONFIG_PACKAGE_kmod-ipt-conntrack-extra=y
+CONFIG_PACKAGE_kmod-ipt-extra=y
+CONFIG_PACKAGE_kmod-ipt-filter=y
++# CONFIG_PACKAGE_kmod-ipt-imq is not set
+CONFIG_PACKAGE_kmod-ipt-ipopt=y
+CONFIG_PACKAGE_kmod-ipt-iprange=y
+# CONFIG_PACKAGE_kmod-ipt-ipsec is not set
@@ -1121,19 +1196,25 @@
+# CONFIG_PACKAGE_kmod-ipt-nathelper-extra is not set
+# CONFIG_PACKAGE_kmod-ipt-queue is not set
+# CONFIG_PACKAGE_kmod-ipt-ulog is not set
++# CONFIG_PACKAGE_kmod-nf-conntrack-netlink is not set
++# CONFIG_PACKAGE_kmod-nfnetlink is not set
++# CONFIG_PACKAGE_kmod-nfnetlink-log is not set
++# CONFIG_PACKAGE_kmod-nfnetlink-queue is not set
+
+#
+# Network Devices
+#
+# CONFIG_PACKAGE_kmod-3c59x is not set
-+CONFIG_PACKAGE_kmod-8139too=y
-+CONFIG_PACKAGE_kmod-e100=y
-+CONFIG_PACKAGE_kmod-e1000=y
++# CONFIG_PACKAGE_kmod-8139too is not set
++# CONFIG_PACKAGE_kmod-b44 is not set
++# CONFIG_PACKAGE_kmod-e100 is not set
++# CONFIG_PACKAGE_kmod-e1000 is not set
+# CONFIG_PACKAGE_kmod-hfcmulti is not set
-+CONFIG_PACKAGE_kmod-natsemi=y
-+CONFIG_PACKAGE_kmod-ne2k-pci=y
-+CONFIG_PACKAGE_kmod-pcnet32=y
-+CONFIG_PACKAGE_kmod-r8169=y
++CONFIG_PACKAGE_kmod-libphy=y
++# CONFIG_PACKAGE_kmod-natsemi is not set
++# CONFIG_PACKAGE_kmod-ne2k-pci is not set
++# CONFIG_PACKAGE_kmod-pcnet32 is not set
++# CONFIG_PACKAGE_kmod-r8169 is not set
+# CONFIG_PACKAGE_kmod-siit is not set
+# CONFIG_PACKAGE_kmod-sis900 is not set
+# CONFIG_PACKAGE_kmod-sky2 is not set
@@ -1144,7 +1225,6 @@
+# Network Support
+#
+# CONFIG_PACKAGE_kmod-atm is not set
-+# CONFIG_PACKAGE_kmod-ax25 is not set
+# CONFIG_PACKAGE_kmod-bonding is not set
+# CONFIG_PACKAGE_kmod-capi is not set
+# CONFIG_PACKAGE_kmod-gre is not set
@@ -1154,13 +1234,15 @@
+# CONFIG_PACKAGE_kmod-iptunnel4 is not set
+# CONFIG_PACKAGE_kmod-iptunnel6 is not set
+# CONFIG_PACKAGE_kmod-ipv6 is not set
++# CONFIG_PACKAGE_kmod-isdn4linux is not set
+# CONFIG_PACKAGE_kmod-misdn is not set
+# CONFIG_PACKAGE_kmod-mp-alg is not set
+# CONFIG_PACKAGE_kmod-ppp is not set
+# CONFIG_PACKAGE_kmod-pktgen is not set
-+CONFIG_PACKAGE_kmod-sched=y
++# CONFIG_PACKAGE_kmod-sched is not set
+# CONFIG_PACKAGE_kmod-sit is not set
-+CONFIG_PACKAGE_kmod-tun=y
++# CONFIG_PACKAGE_kmod-tun is not set
++# CONFIG_PACKAGE_kmod-wprobe is not set
+
+#
+# OCF Configuration
@@ -1172,12 +1254,14 @@
+# CONFIG_PACKAGE_kmod-button-hotplug is not set
+# CONFIG_PACKAGE_kmod-crc-ccitt is not set
+# CONFIG_PACKAGE_kmod-crc-itu-t is not set
++# CONFIG_PACKAGE_kmod-crc16 is not set
+# CONFIG_PACKAGE_kmod-crc7 is not set
+# CONFIG_PACKAGE_kmod-cs5535-gpio is not set
+# CONFIG_PACKAGE_kmod-eeprom-93cx6 is not set
+# CONFIG_PACKAGE_kmod-hid is not set
+# CONFIG_PACKAGE_kmod-input-core is not set
+# CONFIG_PACKAGE_kmod-input-evdev is not set
++# CONFIG_PACKAGE_kmod-input-joydev is not set
+# CONFIG_PACKAGE_kmod-input-polldev is not set
+# CONFIG_PACKAGE_kmod-leds-alix is not set
+# CONFIG_PACKAGE_kmod-leds-net48xx is not set
@@ -1187,6 +1271,9 @@
+# CONFIG_PACKAGE_kmod-mmc is not set
+# CONFIG_PACKAGE_kmod-mmc-spi is not set
+# CONFIG_PACKAGE_kmod-nsc-gpio is not set
++# CONFIG_PACKAGE_kmod-pcmcia-core is not set
++# CONFIG_PACKAGE_kmod-pcspkr is not set
++# CONFIG_PACKAGE_kmod-rfkill is not set
+# CONFIG_PACKAGE_kmod-sc520-wdt is not set
+# CONFIG_PACKAGE_kmod-scx200-gpio is not set
+# CONFIG_PACKAGE_kmod-scx200-wdt is not set
@@ -1195,6 +1282,7 @@
+# CONFIG_PACKAGE_kmod-spi-dev is not set
+# CONFIG_PACKAGE_kmod-spi-ks8995 is not set
+# CONFIG_PACKAGE_kmod-ssb is not set
++CONFIG_PACKAGE_kmod-textsearch=y
+
+#
+# Sound Support
@@ -1218,11 +1306,14 @@
+#
+# Wireless Drivers
+#
++# CONFIG_PACKAGE_kmod-ath is not set
+# CONFIG_PACKAGE_kmod-ath5k is not set
+# CONFIG_PACKAGE_kmod-ath9k is not set
++# CONFIG_PACKAGE_kmod-b43 is not set
++# CONFIG_PACKAGE_kmod-b43legacy is not set
+# CONFIG_PACKAGE_kmod-hostap is not set
+# CONFIG_PACKAGE_kmod-ieee80211 is not set
-+# CONFIG_PACKAGE_kmod-ieee80211-softmac is not set
++# CONFIG_PACKAGE_kmod-libertas is not set
+# CONFIG_PACKAGE_kmod-mac80211 is not set
+# CONFIG_PACKAGE_kmod-mac80211-hwsim is not set
+# CONFIG_PACKAGE_kmod-madwifi is not set
@@ -1256,19 +1347,24 @@
+# CONFIG_PACKAGE_fdisk is not set
+# CONFIG_PACKAGE_fuse-utils is not set
+# CONFIG_PACKAGE_swap-utils is not set
++# CONFIG_PACKAGE_blkid is not set
+# CONFIG_PACKAGE_dropbearconvert is not set
+# CONFIG_PACKAGE_e2fsprogs is not set
+# CONFIG_PACKAGE_fconfig is not set
++# CONFIG_PACKAGE_flock is not set
+# CONFIG_PACKAGE_gdb is not set
+# CONFIG_PACKAGE_gdbserver is not set
-+CONFIG_PACKAGE_hwclock=y
++# CONFIG_PACKAGE_hwclock is not set
+# CONFIG_PACKAGE_kexec-tools is not set
+CONFIG_KEXEC_TOOLS_TARGET_NAME="i386"
++# CONFIG_PACKAGE_ldconfig is not set
++# CONFIG_PACKAGE_ldd is not set
+# CONFIG_PACKAGE_losetup is not set
+# CONFIG_PACKAGE_mount-utils is not set
+# CONFIG_PACKAGE_ocf-crypto-headers is not set
+# CONFIG_PACKAGE_openssl-util is not set
+# CONFIG_PACKAGE_robocfg is not set
++# CONFIG_PACKAGE_spidev-test is not set
+# CONFIG_PACKAGE_udev is not set
+# CONFIG_PACKAGE_udevextras is not set
+# CONFIG_UDEVEXTRAS_ata_id is not set
@@ -1279,18 +1375,44 @@
+# CONFIG_UDEVEXTRAS_scsi_id is not set
+# CONFIG_UDEVEXTRAS_usb_id is not set
+# CONFIG_UDEVEXTRAS_volume_id is not set
++# CONFIG_PACKAGE_uuidgen is not set
+
+#
-+# Extra packages
-+#
-+# CONFIG_PACKAGE_ldd is not set
-+
-+#
+# Languages
+#
+
+#
-+# LUA
++# Lua
+#
+# CONFIG_PACKAGE_lua is not set
+# CONFIG_PACKAGE_luac is not set
+diff -Naur a/include/kernel-build.mk b/include/kernel-build.mk
+--- a/include/kernel-build.mk 2009-04-21 13:08:56.868141000 +0000
++++ b/include/kernel-build.mk 2009-05-27 06:43:26.258621967 +0000
+@@ -58,8 +58,9 @@
+ $(Kernel/Configure)
+ touch $$@
+
++# XXX: need a configurable way to signal module / static kernel builds
++# for now just remove $(Kernel/CompileModules)
+ $(LINUX_DIR)/.modules: $(STAMP_CONFIGURED) $(LINUX_DIR)/.config FORCE
+- $(Kernel/CompileModules)
+ touch $$@
+
+ $(LINUX_DIR)/.image: $(STAMP_CONFIGURED) FORCE
+diff -Naur a/include/kernel-defaults.mk b/include/kernel-defaults.mk
+--- a/include/kernel-defaults.mk 2009-04-29 20:53:38.764833000 +0000
++++ b/include/kernel-defaults.mk 2009-05-28 03:32:29.101809145 +0000
+@@ -99,12 +99,10 @@
+ $(SCRIPT_DIR)/kconfig.pl 'm+' $(LINUX_DIR)/.config.target $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config
+ $(call Kernel/SetInitramfs)
+ $(call Kernel/Configure/$(KERNEL))
+- rm -rf $(KERNEL_BUILD_DIR)/modules
+ endef
+
+ define Kernel/CompileModules/Default
+ rm -f $(LINUX_DIR)/vmlinux $(LINUX_DIR)/System.map
+- +$(MAKE) $(KERNEL_MAKEOPTS) modules
+ endef
+
+ OBJCOPY_STRIP = -R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
Modified: torvm/trunk/build/kamikaze/patches/006-kamikaze-upnptools.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/006-kamikaze-upnptools.patch 2009-05-31 21:30:32 UTC (rev 19604)
+++ torvm/trunk/build/kamikaze/patches/006-kamikaze-upnptools.patch 2009-05-31 23:12:42 UTC (rev 19605)
@@ -1,6 +1,6 @@
diff -Naur a/package/libupnp/Makefile b/package/libupnp/Makefile
--- a/package/libupnp/Makefile 1970-01-01 00:00:00.000000000 +0000
-+++ b/package/libupnp/Makefile 2009-03-28 10:54:57.220399448 +0000
++++ b/package/libupnp/Makefile 2009-03-28 10:54:57.220399000 +0000
@@ -0,0 +1,42 @@
+# Copyright (C) 2009 The Tor Project, Inc.
+#
Modified: torvm/trunk/build/win32/patches/python3-mingw.patch
===================================================================
--- torvm/trunk/build/win32/patches/python3-mingw.patch 2009-05-31 21:30:32 UTC (rev 19604)
+++ torvm/trunk/build/win32/patches/python3-mingw.patch 2009-05-31 23:12:42 UTC (rev 19605)
@@ -1,6 +1,6 @@
diff -Naur a/Include/pymath.h b/Include/pymath.h
--- a/Include/pymath.h 2008-08-19 21:42:13.000000000 +0000
-+++ b/Include/pymath.h 2009-03-01 04:37:26.000000000 +0000
++++ b/Include/pymath.h 2009-05-26 05:54:41.976746802 +0000
@@ -102,6 +102,8 @@
* it really can't be implemented correctly (& easily) before C99.
* Override in pyconfig.h if you have a better spelling on your platform.
@@ -12,7 +12,7 @@
#ifdef HAVE_ISINF
diff -Naur a/Include/pyport.h b/Include/pyport.h
--- a/Include/pyport.h 2009-01-16 04:13:17.000000000 +0000
-+++ b/Include/pyport.h 2009-03-01 12:31:57.159139480 +0000
++++ b/Include/pyport.h 2009-05-26 05:58:45.560742012 +0000
@@ -460,6 +460,126 @@
#endif /* defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) */
@@ -36,7 +36,7 @@
+#endif
+
+#ifndef PYTHONPATH
-+# define PYTHONPATH ".\\Lib;.\\DLLs;.\\lib;.\\lib\\plat-win;.\\lib\\lib-tk"
++# define PYTHONPATH ".\\DLLs;.\\lib;.\\lib\\plat-win;.\\lib\\lib-tk"
+#endif
+
+/* python 2.6+ requires Windows 2000 or greater. */
@@ -140,17 +140,12 @@
/* On 4.4BSD-descendants, ctype functions serves the whole range of
* wchar_t character set rather than single byte code points only.
* This characteristic can break some operations of string object
-@@ -506,10 +626,10 @@
- /*
- All windows ports, except cygwin, are handled in PC/pyconfig.h.
-
-- Cygwin is the only other autoconf platform requiring special
-- linkage handling and it uses __declspec().
-+ BeOS, mingw32 and cygwin use autoconf and require special
-+ linkage handling and all of these use __declspec().
+@@ -509,7 +629,7 @@
+ Cygwin is the only other autoconf platform requiring special
+ linkage handling and it uses __declspec().
*/
-#if defined(__CYGWIN__)
-+#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BEOS__)
++#if defined(__CYGWIN__) || defined(__MINGW32__)
# define HAVE_DECLSPEC_DLL
#endif
@@ -181,7 +176,7 @@
# if defined(__cplusplus)
diff -Naur a/Lib/ctypes/test/test_as_parameter.py b/Lib/ctypes/test/test_as_parameter.py
--- a/Lib/ctypes/test/test_as_parameter.py 2007-05-03 21:05:51.000000000 +0000
-+++ b/Lib/ctypes/test/test_as_parameter.py 2009-03-01 04:37:26.000000000 +0000
++++ b/Lib/ctypes/test/test_as_parameter.py 2009-05-26 05:54:41.968745608 +0000
@@ -1,6 +1,7 @@
import unittest
from ctypes import *
@@ -204,7 +199,7 @@
("b", c_int),
diff -Naur a/Lib/ctypes/test/test_functions.py b/Lib/ctypes/test/test_functions.py
--- a/Lib/ctypes/test/test_functions.py 2007-11-02 23:46:40.000000000 +0000
-+++ b/Lib/ctypes/test/test_functions.py 2009-03-01 04:37:26.000000000 +0000
++++ b/Lib/ctypes/test/test_functions.py 2009-05-26 05:54:41.956741379 +0000
@@ -359,6 +359,11 @@
self.failUnlessEqual((s2h.x, s2h.y), (99*2, 88*3))
@@ -219,7 +214,7 @@
("b", c_int),
diff -Naur a/Lib/ctypes/util.py b/Lib/ctypes/util.py
--- a/Lib/ctypes/util.py 2009-01-10 22:42:12.000000000 +0000
-+++ b/Lib/ctypes/util.py 2009-03-01 04:37:26.000000000 +0000
++++ b/Lib/ctypes/util.py 2009-05-26 05:54:41.968745608 +0000
@@ -4,6 +4,11 @@
if os.name == "nt":
@@ -250,7 +245,7 @@
if version is None:
diff -Naur a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py
--- a/Lib/distutils/ccompiler.py 2008-12-21 00:55:55.000000000 +0000
-+++ b/Lib/distutils/ccompiler.py 2009-03-01 04:37:25.000000000 +0000
++++ b/Lib/distutils/ccompiler.py 2009-05-26 05:54:41.940743870 +0000
@@ -1022,6 +1022,8 @@
osname = os.name
if platform is None:
@@ -262,7 +257,7 @@
re.match(pattern, osname) is not None:
diff -Naur a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
--- a/Lib/distutils/command/build_ext.py 2009-02-05 22:58:41.000000000 +0000
-+++ b/Lib/distutils/command/build_ext.py 2009-03-01 04:37:25.000000000 +0000
++++ b/Lib/distutils/command/build_ext.py 2009-05-26 05:54:33.112743785 +0000
@@ -16,7 +16,8 @@
from distutils.util import get_platform
from distutils import log
@@ -330,7 +325,7 @@
if not isinstance(self.compiler, MSVCCompiler):
diff -Naur a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
--- a/Lib/distutils/cygwinccompiler.py 2008-08-19 18:57:56.000000000 +0000
-+++ b/Lib/distutils/cygwinccompiler.py 2009-03-01 05:11:34.000000000 +0000
++++ b/Lib/distutils/cygwinccompiler.py 2009-05-26 06:02:29.620743044 +0000
@@ -58,6 +58,18 @@
"""Include the appropriate MSVC runtime library if Python was built
with MSVC 7.0 or later.
@@ -390,7 +385,7 @@
# Hard-code GCC because that's what this is all about.
# XXX optimization, warnings etc. should be customizable.
self.set_executables(compiler='gcc -mcygwin -O -Wall',
-@@ -269,11 +293,19 @@
+@@ -269,8 +293,14 @@
if output_dir is None: output_dir = ''
obj_names = []
for src_name in source_filenames:
@@ -407,14 +402,9 @@
if ext not in (self.src_extensions + ['.rc','.res']):
raise UnknownFileError("unknown file type '%s' (from '%s')" % \
(ext, src_name))
-+ base = os.path.splitdrive(base)[1] # Chop off the drive
-+ base = base[os.path.isabs(base):] # If abs, chop off leading /
- if strip_dir:
- base = os.path.basename (base)
- if ext == '.res' or ext == '.rc':
diff -Naur a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
--- a/Lib/distutils/sysconfig.py 2009-02-10 12:41:19.000000000 +0000
-+++ b/Lib/distutils/sysconfig.py 2009-03-01 04:37:25.000000000 +0000
++++ b/Lib/distutils/sysconfig.py 2009-05-26 05:54:41.936743145 +0000
@@ -70,7 +70,8 @@
"""
if prefix is None:
@@ -447,26 +437,9 @@
g = {}
# set basic install directories
g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
-diff -Naur a/Lib/distutils/version.py b/Lib/distutils/version.py
---- a/Lib/distutils/version.py 2009-01-27 18:31:30.000000000 +0000
-+++ b/Lib/distutils/version.py 2009-03-01 13:20:27.890641032 +0000
-@@ -338,7 +338,12 @@
- if isinstance(other, str):
- other = LooseVersion(other)
-
-- return cmp(self.version, other.version)
-+ if self.version == other.version:
-+ return 0
-+ if self.version < other.version:
-+ return -1
-+ if self.version > other.version:
-+ return 1
-
-
- # end class LooseVersion
diff -Naur a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in 2009-01-13 22:15:07.000000000 +0000
-+++ b/Makefile.pre.in 2009-03-01 04:37:27.000000000 +0000
++++ b/Makefile.pre.in 2009-05-26 05:54:41.984743606 +0000
@@ -179,6 +179,10 @@
PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
#PROFILE_TASK= $(srcdir)/Lib/test/regrtest.py
@@ -551,31 +524,30 @@
diff -Naur a/Modules/Setup.config.in b/Modules/Setup.config.in
--- a/Modules/Setup.config.in 2008-05-25 13:05:15.000000000 +0000
-+++ b/Modules/Setup.config.in 2009-03-01 13:19:43.208433760 +0000
-@@ -9,5 +9,20 @@
- # The signal module
- @USE_SIGNAL_MODULE at signal signalmodule.c
++++ b/Modules/Setup.config.in 2009-05-26 05:56:34.996744011 +0000
+@@ -3,11 +3,19 @@
+ # The purpose of this file is to conditionally enable certain modules
+ # based on configure-time options.
+# init system calls(posix/nt/...) for INITFUNC (used by makesetup)
+ at INITSYS@ posixmodule.c
+
-+# On win32 host(mingw build in MSYS environment) show that site.py
-+# fail to load if some modules are not build-in:
+ # Threading
+ @USE_THREAD_MODULE at _thread _threadmodule.c
+
+ # The signal module
+ @USE_SIGNAL_MODULE at signal signalmodule.c
+
+ at BUILDIN_WIN32_MODULE@_functools _functoolsmodule.c # Tools for working with functions and callable objects
-+ at BUILDIN_WIN32_MODULE@_collections _collectionsmodule.c
-+ at BUILDIN_WIN32_MODULE@time timemodule.c
+ at BUILDIN_WIN32_MODULE@operator operator.c # operator.add() and similar goodies
+ at BUILDIN_WIN32_MODULE@_locale _localemodule.c # -lintl
+ at BUILDIN_WIN32_MODULE@winreg ../PC/winreg.c
-+ at BUILDIN_WIN32_MODULE@msvcrt ../PC/msvcrtmodule.c
-+ at BUILDIN_WIN32_MODULE@_subprocess ../PC/_subprocess.c
+
-+
# The rest of the modules previously listed in this file are built
# by the setup.py script in Python 2.1 and later.
diff -Naur a/Modules/Setup.dist b/Modules/Setup.dist
--- a/Modules/Setup.dist 2008-11-27 09:53:28.000000000 +0000
-+++ b/Modules/Setup.dist 2009-03-01 04:37:28.000000000 +0000
++++ b/Modules/Setup.dist 2009-05-26 05:54:42.032743768 +0000
@@ -105,9 +105,10 @@
# This only contains the minimal set of modules required to run the
# setup.py script in the root of the Python source tree.
@@ -591,7 +563,7 @@
_codecs _codecsmodule.c # access to the builtin codecs and codec registry
diff -Naur a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
--- a/Modules/_ctypes/_ctypes.c 2009-02-02 20:41:29.000000000 +0000
-+++ b/Modules/_ctypes/_ctypes.c 2009-03-01 04:37:29.000000000 +0000
++++ b/Modules/_ctypes/_ctypes.c 2009-05-26 05:54:42.048743116 +0000
@@ -3029,14 +3029,32 @@
funcname -> _funcname@<n>
where n is 0, 4, 8, 12, ..., 128
@@ -625,9 +597,173 @@
}
return NULL;
#endif
+diff -Naur a/Modules/_ctypes/libffi_msvc/win32.S b/Modules/_ctypes/libffi_msvc/win32.S
+--- a/Modules/_ctypes/libffi_msvc/win32.S 2006-05-27 19:21:47.000000000 +0000
++++ b/Modules/_ctypes/libffi_msvc/win32.S 2009-05-26 05:54:42.060746519 +0000
+@@ -36,6 +36,160 @@
+
+ # This assumes we are using gas.
+ .balign 16
++.globl _ffi_call_x86
++
++_ffi_call_x86:
++ pushl %ebp
++ movl %esp,%ebp
++
++ #THe: save previous %esi, and store the current stack pointer in %esi
++ pushl %esi
++ movl %esp,%esi
++
++ # Make room for all of the new args.
++ movl 16(%ebp),%ecx
++ subl %ecx,%esp
++
++ movl %esp,%eax
++
++ # Place all of the ffi_prep_args in position
++ pushl 12(%ebp)
++ pushl %eax
++ call *8(%ebp)
++
++ # Return stack to previous state and call the function
++ addl $8,%esp
++
++ # FIXME: Align the stack to a 128-bit boundary to avoid
++ # potential performance hits.
++
++ call *28(%ebp)
++
++ # Load ecif->cif->abi
++#masm# mov ecx, [ebp + 12]
++ movl 12(%ebp),%ecx
++#masm# mov ecx, [ecx]ecif.cif
++ movl (%ecx),%ecx
++#masm# mov ecx, [ecx]ecif.cif.abi
++ movl (%ecx),%ecx
++#masm# cmp ecx, FFI_STDCALL
++ cmpl $2,%ecx
++ je noclean
++
++ # STDCALL: Remove the space we pushed for the args
++ movl 16(%ebp),%ecx
++ addl %ecx,%esp
++
++ # CDECL: Caller has already cleaned the stack
++noclean:
++ # Check that esp has the same value as before!
++ sub %esp,%esi # calculate stack pointer difference
++
++ # Load %ecx with the return type code
++ movl 20(%ebp),%ecx
++
++ # If the return value pointer is NULL, assume no return value.
++ cmpl $0,24(%ebp)
++ jne retint
++
++ # Even if there is no space for the return value, we are
++ # obliged to handle floating-point values.
++ cmpl $FFI_TYPE_FLOAT,%ecx
++ jne noretval
++ fstp %st(0)
++
++ jmp epilogue
++
++retint:
++ cmpl $FFI_TYPE_INT,%ecx
++ jne retfloat
++ # Load %ecx with the pointer to storage for the return value
++ movl 24(%ebp),%ecx
++ movl %eax,0(%ecx)
++ jmp epilogue
++
++retfloat:
++ cmpl $FFI_TYPE_FLOAT,%ecx
++ jne retdouble
++ # Load %ecx with the pointer to storage for the return value
++ movl 24(%ebp),%ecx
++ fstps (%ecx)
++ jmp epilogue
++
++retdouble:
++ cmpl $FFI_TYPE_DOUBLE,%ecx
++ jne retlongdouble
++ # Load %ecx with the pointer to storage for the return value
++ movl 24(%ebp),%ecx
++ fstpl (%ecx)
++ jmp epilogue
++
++retlongdouble:
++ cmpl $FFI_TYPE_LONGDOUBLE,%ecx
++ jne retint64
++ # Load %ecx with the pointer to storage for the return value
++ movl 24(%ebp),%ecx
++ fstpt (%ecx)
++ jmp epilogue
++
++retint64:
++ cmpl $FFI_TYPE_SINT64,%ecx
++ jne retstruct
++ # Load %ecx with the pointer to storage for the return value
++ movl 24(%ebp),%ecx
++ movl %eax,0(%ecx)
++ movl %edx,4(%ecx)
++
++retstruct:
++ # Nothing to do!
++
++noretval:
++epilogue:
++ movl %esi,%eax # return the stack pointer detlta in %eax
++ popl %esi # restore previous %esi
++ movl %ebp,%esp
++ popl %ebp
++ ret
++
++.ffi_call_x86_end:
++/* -----------------------------------------------------------------------
++ win32.S - Copyright (c) 1996, 1998, 2001, 2002 Red Hat, Inc.
++ Copyright (c) 2001 John Beniton
++ Copyright (c) 2002 Ranjit Mathew
++
++
++ X86 Foreign Function Interface
++
++ Permission is hereby granted, free of charge, to any person obtaining
++ a copy of this software and associated documentation files (the
++ ``Software''), to deal in the Software without restriction, including
++ without limitation the rights to use, copy, modify, merge, publish,
++ distribute, sublicense, and/or sell copies of the Software, and to
++ permit persons to whom the Software is furnished to do so, subject to
++ the following conditions:
++
++ The above copyright notice and this permission notice shall be included
++ in all copies or substantial portions of the Software.
++
++ THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
++ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR
++ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
++ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ OTHER DEALINGS IN THE SOFTWARE.
++ ----------------------------------------------------------------------- */
++
++#define LIBFFI_ASM
++#include <fficonfig.h>
++#include <ffi.h>
++
++.text
++
++.globl ffi_prep_args
++
++ # This assumes we are using gas.
++ .balign 16
+ .globl _ffi_call_SYSV
+
+ _ffi_call_SYSV:
diff -Naur a/Modules/_fileio.c b/Modules/_fileio.c
--- a/Modules/_fileio.c 2009-02-02 20:41:29.000000000 +0000
-+++ b/Modules/_fileio.c 2009-03-01 04:37:33.000000000 +0000
++++ b/Modules/_fileio.c 2009-05-26 05:54:42.084745778 +0000
@@ -22,7 +22,9 @@
#ifdef MS_WINDOWS
@@ -640,7 +776,7 @@
#endif
diff -Naur a/Modules/_localemodule.c b/Modules/_localemodule.c
--- a/Modules/_localemodule.c 2009-02-01 10:41:18.000000000 +0000
-+++ b/Modules/_localemodule.c 2009-03-01 04:37:34.000000000 +0000
++++ b/Modules/_localemodule.c 2009-05-26 05:54:42.108745307 +0000
@@ -10,6 +10,13 @@
******************************************************************/
@@ -657,7 +793,7 @@
#include <locale.h>
diff -Naur a/Modules/cmathmodule.c b/Modules/cmathmodule.c
--- a/Modules/cmathmodule.c 2008-07-16 03:43:04.000000000 +0000
-+++ b/Modules/cmathmodule.c 2009-03-01 04:37:33.000000000 +0000
++++ b/Modules/cmathmodule.c 2009-05-26 05:54:42.076746183 +0000
@@ -55,6 +55,21 @@
static Py_complex c_tanh(Py_complex);
static PyObject * math_error(void);
@@ -682,7 +818,7 @@
/* special_type takes a double and returns an integer code indicating
diff -Naur a/Modules/getaddrinfo.c b/Modules/getaddrinfo.c
--- a/Modules/getaddrinfo.c 2007-02-27 19:06:23.000000000 +0000
-+++ b/Modules/getaddrinfo.c 2009-03-01 04:37:29.000000000 +0000
++++ b/Modules/getaddrinfo.c 2009-05-26 05:54:42.044745250 +0000
@@ -232,6 +232,9 @@
return YES;
}
@@ -695,7 +831,7 @@
const struct addrinfo *hints, struct addrinfo **res)
diff -Naur a/Modules/getnameinfo.c b/Modules/getnameinfo.c
--- a/Modules/getnameinfo.c 2007-02-27 19:06:23.000000000 +0000
-+++ b/Modules/getnameinfo.c 2009-03-01 04:37:28.000000000 +0000
++++ b/Modules/getnameinfo.c 2009-05-26 05:54:42.024745703 +0000
@@ -48,6 +48,14 @@
#include "addrinfo.h"
#endif
@@ -713,7 +849,7 @@
#define NO 0
diff -Naur a/Modules/mathmodule.c b/Modules/mathmodule.c
--- a/Modules/mathmodule.c 2008-12-21 00:55:55.000000000 +0000
-+++ b/Modules/mathmodule.c 2009-03-01 04:37:33.000000000 +0000
++++ b/Modules/mathmodule.c 2009-05-26 05:54:42.092745112 +0000
@@ -60,6 +60,15 @@
extern double copysign(double, double);
#endif
@@ -732,7 +868,7 @@
* true (1), but may return false (0) without setting up an exception.
diff -Naur a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c 2008-12-29 18:23:24.000000000 +0000
-+++ b/Modules/posixmodule.c 2009-03-01 04:40:25.000000000 +0000
++++ b/Modules/posixmodule.c 2009-05-26 06:04:07.244743481 +0000
@@ -128,6 +128,16 @@
#define HAVE_CWAIT 1
#define HAVE_FSYNC 1
@@ -759,7 +895,15 @@
#ifdef HAVE_DIRECT_H
#include <direct.h>
#endif
-@@ -338,7 +348,7 @@
+@@ -263,6 +273,7 @@
+ #include <process.h>
+ #endif
+ #include "osdefs.h"
++#include <malloc.h>
+ #include <windows.h>
+ #include <shellapi.h> /* for ShellExecute() */
+ #endif /* _MSC_VER */
+@@ -338,7 +349,7 @@
*/
#include <crt_externs.h>
static char **environ;
@@ -768,7 +912,7 @@
extern char **environ;
#endif /* !_MSC_VER */
-@@ -6618,6 +6628,13 @@
+@@ -6618,6 +6629,13 @@
#endif
#ifdef MS_WINDOWS
@@ -782,7 +926,7 @@
PyDoc_STRVAR(win32_urandom__doc__,
"urandom(n) -> str\n\n\
-@@ -7340,7 +7357,7 @@
+@@ -7340,7 +7358,7 @@
}
@@ -791,21 +935,9 @@
#define INITFUNC PyInit_nt
#define MODNAME "nt"
-diff -Naur a/Modules/python.c b/Modules/python.c
---- a/Modules/python.c 2008-10-19 14:15:00.000000000 +0000
-+++ b/Modules/python.c 2009-03-01 10:54:30.736930752 +0000
-@@ -7,7 +7,7 @@
- #include <floatingpoint.h>
- #endif
-
--#ifdef MS_WINDOWS
-+#if 0
- int
- wmain(int argc, wchar_t **argv)
- {
diff -Naur a/Modules/selectmodule.c b/Modules/selectmodule.c
--- a/Modules/selectmodule.c 2009-02-02 20:41:29.000000000 +0000
-+++ b/Modules/selectmodule.c 2009-03-01 04:37:29.000000000 +0000
++++ b/Modules/selectmodule.c 2009-05-26 05:54:42.032743768 +0000
@@ -108,9 +108,10 @@
v = PyObject_AsFileDescriptor( o );
if (v == -1) goto finally;
@@ -840,7 +972,7 @@
"filedescriptor out of range returned in select()");
diff -Naur a/Modules/socketmodule.c b/Modules/socketmodule.c
--- a/Modules/socketmodule.c 2009-02-06 02:50:18.000000000 +0000
-+++ b/Modules/socketmodule.c 2009-03-01 04:37:34.000000000 +0000
++++ b/Modules/socketmodule.c 2009-05-26 05:54:42.100744827 +0000
@@ -90,6 +90,15 @@
#endif
@@ -910,14 +1042,15 @@
#define gai_strerror fake_gai_strerror
#define freeaddrinfo fake_freeaddrinfo
#include "getaddrinfo.c"
-@@ -2681,7 +2729,21 @@
+@@ -2681,7 +2729,22 @@
Shut down the reading side of the socket (flag == SHUT_RD), the writing side\n\
of the socket (flag == SHUT_WR), or both ends (flag == SHUT_RDWR).");
+#ifndef SIO_RCVALL
+#ifdef __MINGW32__
-+/* defined in mstcpip.h, also note "Separate SDKs" required for w2k */
-+/* TODO: to test on w2k */
++/* MSDN: SIO_RCVALL defined on w2k and later */
++/* note "Separate SDKs" required for w2k */
++/* 0x98000001 = _WSAIOW(IOC_VENDOR,1) */
+# define SIO_RCVALL 0x98000001
+# define RCVALL_OFF 0
+# define RCVALL_ON 1
@@ -932,40 +1065,11 @@
static PyObject*
sock_ioctl(PySocketSockObject *s, PyObject *arg)
{
-diff -Naur a/Objects/fileobject.c b/Objects/fileobject.c
---- a/Objects/fileobject.c 2009-02-02 20:41:29.000000000 +0000
-+++ b/Objects/fileobject.c 2009-03-01 05:20:50.000000000 +0000
-@@ -13,6 +13,22 @@
- #define FUNLOCKFILE(f)
- #endif
-
-+#ifdef MS_WINDOWS
-+#if !defined(__MINGW32__)
-+/* avoid 'warning: "fileno" redefined' */
-+#define fileno _fileno
-+#endif
-+/* can simulate truncate with Win32 API functions; see file_truncate */
-+#ifndef HAVE_FTRUNCATE
-+/* NOTE: autotool based build check and set it
-+ FIXME: why isn't defined in PC/pyconfig.h ?
-+ */
-+#define HAVE_FTRUNCATE
-+#endif
-+#define WIN32_LEAN_AND_MEAN
-+#include <windows.h>
-+#endif
-+
- /* Newline flags */
- #define NEWLINE_UNKNOWN 0 /* No newline seen, yet */
- #define NEWLINE_CR 1 /* \r newline seen */
diff -Naur a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c
--- a/PC/msvcrtmodule.c 2008-11-30 22:46:23.000000000 +0000
-+++ b/PC/msvcrtmodule.c 2009-03-01 13:04:57.105141936 +0000
-@@ -21,9 +21,33 @@
- #include <io.h>
- #include <conio.h>
- #include <sys/locking.h>
--#include <crtdbg.h>
++++ b/PC/msvcrtmodule.c 2009-05-26 05:54:33.112743785 +0000
+@@ -24,6 +24,31 @@
+ #include <crtdbg.h>
#include <windows.h>
+#if defined(__MINGW32__)
@@ -996,7 +1100,7 @@
#ifdef _MSC_VER
#if _MSC_VER >= 1500
#include <crtassem.h>
-@@ -260,6 +284,7 @@
+@@ -260,6 +285,7 @@
if (!PyArg_ParseTuple(args, "u:ungetwch", &ch))
return NULL;
@@ -1006,7 +1110,7 @@
Py_INCREF(Py_None);
diff -Naur a/PC/winreg.c b/PC/winreg.c
--- a/PC/winreg.c 2009-02-02 20:41:29.000000000 +0000
-+++ b/PC/winreg.c 2009-03-01 04:37:25.000000000 +0000
++++ b/PC/winreg.c 2009-05-26 05:54:33.112743785 +0000
@@ -16,6 +16,18 @@
#include "structmember.h"
#include "windows.h"
@@ -1028,7 +1132,7 @@
static BOOL PyHKEY_Close(PyObject *obHandle);
diff -Naur a/Python/dynload_win.c b/Python/dynload_win.c
--- a/Python/dynload_win.c 2009-01-27 23:50:56.000000000 +0000
-+++ b/Python/dynload_win.c 2009-03-01 04:37:26.000000000 +0000
++++ b/Python/dynload_win.c 2009-05-26 05:54:41.976746802 +0000
@@ -11,9 +11,11 @@
#include "importdl.h"
#include <windows.h>
@@ -1071,7 +1175,7 @@
/* restore old error mode settings */
diff -Naur a/Python/fileblocks.c b/Python/fileblocks.c
--- a/Python/fileblocks.c 1970-01-01 00:00:00.000000000 +0000
-+++ b/Python/fileblocks.c 2009-03-01 04:37:26.000000000 +0000
++++ b/Python/fileblocks.c 2009-05-26 05:54:41.976746802 +0000
@@ -0,0 +1,17 @@
+/*
+-- Macro: AC_STRUCT_ST_BLOCKS
@@ -1090,647 +1194,10 @@
+ this file is never empty. */
+typedef int textutils_fileblocks_unused;
+#endif
-diff -Naur a/Python/import.c b/Python/import.c
---- a/Python/import.c 2009-02-02 20:41:29.000000000 +0000
-+++ b/Python/import.c 2009-03-01 06:38:20.798516552 +0000
-@@ -23,9 +23,11 @@
- #endif
-
- #ifdef MS_WINDOWS
-+#ifndef __MINGW32__
- /* for stat.st_mode */
- typedef unsigned short mode_t;
- #endif
-+#endif
-
- extern time_t PyOS_GetLastModificationTime(char *, FILE *);
- /* In getmtime.c */
-diff -Naur a/Python/pythonrun.c b/Python/pythonrun.c
---- a/Python/pythonrun.c 2009-01-26 22:03:09.000000000 +0000
-+++ b/Python/pythonrun.c 2009-03-01 06:39:17.371916088 +0000
-@@ -35,8 +35,10 @@
- #ifdef MS_WINDOWS
- #undef BYTE
- #include "windows.h"
-+#ifndef __MINGW32__
- #define PATH_MAX MAXPATHLEN
- #endif
-+#endif
-
- #ifndef Py_REF_DEBUG
- #define PRINT_TOTAL_REFS()
-diff -Naur a/configure b/configure
---- a/configure 2009-01-05 19:53:36.000000000 +0000
-+++ b/configure 2009-03-01 06:56:29.070074128 +0000
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 68280 .
-+# From configure.in Revision: 68442 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.61 for python 3.0.
- #
-@@ -669,6 +669,7 @@
- FRAMEWORKALTINSTALLLAST
- FRAMEWORKUNIXTOOLSPREFIX
- MACHDEP
-+INITSYS
- SGI_ABI
- CONFIGURE_MACOSX_DEPLOYMENT_TARGET
- EXPORT_MACOSX_DEPLOYMENT_TARGET
-@@ -717,6 +718,7 @@
- USE_THREAD_MODULE
- LDLAST
- THREADOBJ
-+BUILDIN_WIN32_MODULE
- DLINCLDIR
- DYNLOADFILE
- MACHDEP_OBJS
-@@ -730,6 +732,9 @@
- LIBM
- LIBC
- THREADHEADERS
-+PYMOD_BUILDOPT
-+PYTHON_OBJS_FROZENMAIN
-+MODULE_GETPATH
- SRCDIRS
- LTLIBOBJS'
- ac_subst_files=''
-@@ -1811,7 +1816,14 @@
- mv confdefs.h.new confdefs.h
-
-
-+case $host in
-+ *-*-mingw*)
-+ VERSION=`echo 3.0 | sed -e 's|\.||g'`
-+ ;;
-+ *)
- VERSION=3.0
-+ ;;
-+esac
-
-
- SOVERSION=1.0
-@@ -2034,6 +2046,15 @@
- echo $ECHO_N "checking MACHDEP... $ECHO_C" >&6; }
- if test -z "$MACHDEP"
- then
-+ case $host in
-+ *-*-mingw*)
-+ ac_sys_system=ignore
-+ MACHDEP=win
-+ ;;
-+ esac
-+fi
-+if test -z "$MACHDEP"
-+then
- ac_sys_system=`uname -s`
- if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
- -o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
-@@ -2056,6 +2077,19 @@
- esac
- fi
-
-+{ echo "$as_me:$LINENO: checking for init system calls" >&5
-+echo $ECHO_N "checking for init system calls... $ECHO_C" >&6; }
-+
-+case $host in
-+ # FIXME: May configure lack detection for os2 host system ?
-+ #?#*-*-os2*) INITSYS=os2;;
-+ *-*-mingw*) INITSYS=nt;;
-+ *) INITSYS=posix;;
-+esac
-+{ echo "$as_me:$LINENO: result: $INITSYS" >&5
-+echo "${ECHO_T}$INITSYS" >&6; }
-+
-+
- # Some systems cannot stand _XOPEN_SOURCE being defined at all; they
- # disable features if it is defined, without any means to access these
- # features as extensions. For these systems, we skip the definition of
-@@ -2228,7 +2262,7 @@
- if test "${with_gcc+set}" = set; then
- withval=$with_gcc;
- case $withval in
-- no) CC=cc
-+ no) CC=${CC:-cc}
- without_gcc=yes;;
- yes) CC=gcc
- without_gcc=no;;
-@@ -3949,6 +3983,10 @@
- *)
- enable_shared="no";;
- esac
-+ case $host in
-+ *-*-mingw*)
-+ enable_shared="yes";;
-+ esac
- fi
- { echo "$as_me:$LINENO: result: $enable_shared" >&5
- echo "${ECHO_T}$enable_shared" >&6; }
-@@ -4092,6 +4130,12 @@
- ;;
-
- esac
-+ case $host in
-+ *-*-mingw*)
-+ LDLIBRARY='libpython$(VERSION).dll.a'
-+ DLLLIBRARY='libpython$(VERSION).dll'
-+ ;;
-+ esac
- else # shared is disabled
- case $ac_sys_system in
- CYGWIN*)
-@@ -4099,6 +4143,10 @@
- LDLIBRARY='libpython$(VERSION).dll.a'
- ;;
- esac
-+ case $host in
-+ *-*-mingw*)
-+ LDLIBRARY='libpython$(VERSION).a';;
-+ esac
- fi
-
- { echo "$as_me:$LINENO: result: $LDLIBRARY" >&5
-@@ -4446,6 +4494,27 @@
- echo "${ECHO_T}no" >&6; }
- fi
-
-+# FIXME: We define BUILDEXEEXT and LDLIBRARY above but:
-+# For debug versions MSVC build prepend suffix by '_d'.
-+# If we support this convention we may modify distutils(TODO).
-+# To support different build directories is good "--with-pydebug"
-+# to be earlier in the script(why i wrote this?).
-+if test "x$Py_DEBUG" = xtrue; then
-+ case $host in
-+ # Since Makefile.pre.in may isn't suitable for now we will not
-+ # change LDLIBRARY.
-+ *-*-mingw*)
-+ BUILDEXEEXT=_d$BUILDEXEEXT
-+ if test x$enable_shared = xyes; then
-+ #LDLIBRARY='libpython$(VERSION)_d.dll.a'
-+ DLLLIBRARY='libpython$(VERSION)_d.dll'
-+ else # shared is disabled
-+ #LDLIBRARY='libpython$(VERSION)_d.dll.a';;
-+ :
-+ fi
-+ ;;
-+ esac
-+fi
-
- # XXX Shouldn't the code above that fiddles with BASECFLAGS and OPT be
- # merged with this chunk of code?
-@@ -4462,6 +4531,8 @@
-
- # tweak OPT based on compiler and platform, only if the user didn't set
- # it on the command line
-+# NOTE: If user set OPT at this point script ignore all previously set
-+# options (not important - BeOS is depricated for python 2.6+).
-
- if test -z "$OPT"
- then
-@@ -4584,6 +4655,10 @@
- alpha*)
- BASECFLAGS="$BASECFLAGS -mieee"
- ;;
-+ *-*-mingw*)
-+ #MSVC compatable storage layout for bitfields in structures
-+ BASECFLAGS="$BASECFLAGS -mms-bitfields"
-+ ;;
- esac
-
- case $ac_sys_system in
-@@ -4669,7 +4744,9 @@
- esac
-
- if test "$Py_DEBUG" = 'true'; then
-- :
-+ case $host in
-+ *-*-mingw*) OPT="-D_DEBUG $OPT";;
-+ esac
- else
- OPT="-DNDEBUG $OPT"
- fi
-@@ -5185,6 +5262,65 @@
- echo "${ECHO_T}$ac_cv_pthread" >&6; }
- fi
-
-+if test "x$ac_cv_kpthread" = xno && \
-+ test "x$ac_cv_kthread" = xno && \
-+ test "x$ac_cv_pthread" = xno && \
-+ test "x$ac_cv_pthread_is_default" = xno
-+then
-+ { echo "$as_me:$LINENO: checking for NT threads" >&5
-+echo $ECHO_N "checking for NT threads... $ECHO_C" >&6; }
-+ if test "${ac_cv_ntthread+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+_beginthread(0, 0, 0);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_ntthread=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_cv_ntthread=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+
-+ { echo "$as_me:$LINENO: result: $ac_cv_ntthread" >&5
-+echo "${ECHO_T}$ac_cv_ntthread" >&6; }
-+fi
-+
- # If we have set a CC compiler flag for thread support then
- # check if it works for CXX, too.
- ac_cv_cxx_thread=no
-@@ -5206,6 +5342,9 @@
- then
- CXX="$CXX -pthread"
- ac_cv_cxx_thread=yes
-+elif test "x$ac_cv_ntthread" = xyes
-+then
-+ ac_cv_cxx_thread=always
- fi
-
- if test $ac_cv_cxx_thread = yes
-@@ -5525,6 +5664,7 @@
-
-
-
-+
- for ac_header in asm/types.h conio.h curses.h direct.h dlfcn.h errno.h \
- fcntl.h grp.h \
- ieeefp.h io.h langinfo.h libintl.h ncurses.h poll.h process.h pthread.h \
-@@ -5536,7 +5676,7 @@
- sys/termio.h sys/time.h \
- sys/times.h sys/types.h sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
- sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
--bluetooth/bluetooth.h linux/tipc.h
-+bluetooth/bluetooth.h linux/tipc.h winsock2.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-@@ -12906,6 +13046,16 @@
- CYGWIN*) SO=.dll;;
- *) SO=.so;;
- esac
-+ case $host in
-+ *-*-mingw*)
-+ #NOTE: see _PyImport_DynLoadFiletab in dynload_win.c
-+ if test "x$Py_DEBUG" = xtrue; then
-+ SO=_d.pyd
-+ else
-+ SO=.pyd
-+ fi
-+ ;;
-+ esac
- else
- # this might also be a termcap variable, see #610332
- echo
-@@ -13032,6 +13182,11 @@
- atheos*) LDSHARED="gcc -shared";;
- *) LDSHARED="ld";;
- esac
-+ case $host in
-+ *-*-mingw*)
-+ LDSHARED='$(CC) -shared -Wl,--enable-auto-image-base'
-+ ;;
-+ esac
- fi
- { echo "$as_me:$LINENO: result: $LDSHARED" >&5
- echo "${ECHO_T}$LDSHARED" >&6; }
-@@ -13133,6 +13288,12 @@
- # when running test_compile.py.
- LINKFORSHARED='-Wl,-E -N 2048K';;
- esac
-+ case $host in
-+ *-*-mingw*)
-+ if test x$enable_shared = xyes; then
-+ LINKFORSHARED='-Wl,--out-implib=$(LDLIBRARY)'
-+ fi;;
-+ esac
- fi
- { echo "$as_me:$LINENO: result: $LINKFORSHARED" >&5
- echo "${ECHO_T}$LINKFORSHARED" >&6; }
-@@ -13151,6 +13312,12 @@
- *)
- CFLAGSFORSHARED='$(CCSHARED)'
- esac
-+ case $host in
-+ *-*-mingw*)
-+ # TODO mingw may needs CCSHARED when building extension DLLs
-+ # but not when building the interpreter DLL.
-+ CFLAGSFORSHARED='';;
-+ esac
- fi
- { echo "$as_me:$LINENO: result: $CFLAGSFORSHARED" >&5
- echo "${ECHO_T}$CFLAGSFORSHARED" >&6; }
-@@ -13830,6 +13997,19 @@
-
- posix_threads=yes
- THREADOBJ="Python/thread.o"
-+elif test "x$ac_cv_ntthread" = xyes
-+then
-+ cat >>confdefs.h <<\_ACEOF
-+#define WITH_THREAD 1
-+_ACEOF
-+
-+ posix_threads=no
-+ THREADOBJ="Python/thread.o"
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define NT_THREADS 1
-+_ACEOF
-+
- else
- if test ! -z "$with_threads" -a -d "$with_threads"
- then LDFLAGS="$LDFLAGS -L$with_threads"
-@@ -15155,6 +15335,18 @@
- fi
-
-
-+
-+BUILDIN_WIN32_MODULE='#'
-+case $host in
-+ *-*-mingw*)
-+ # On win32 host(mingw build MSYS environment) site.py fail to load
-+ # if _functools is not build-in by reason of dependency:
-+ # setup->site->locale->functools&operator
-+ BUILDIN_WIN32_MODULE=
-+ ;;
-+esac
-+
-+
- # Check for enable-ipv6
-
-
-@@ -15763,6 +15955,14 @@
- fi
- ;;
- esac
-+ case $host in
-+ *-*-mingw*)
-+ # FIXME: it is good to use portable "$OBJEXT" instead "o" but
-+ # python build isn't yet ready to use it (see Makefile.pre.in)
-+ #DYNLOADFILE="dynload_win.$OBJEXT"
-+ DYNLOADFILE="dynload_win.o"
-+ ;;
-+ esac
- fi
- { echo "$as_me:$LINENO: result: $DYNLOADFILE" >&5
- echo "${ECHO_T}$DYNLOADFILE" >&6; }
-@@ -15780,6 +15980,11 @@
-
- { echo "$as_me:$LINENO: checking MACHDEP_OBJS" >&5
- echo $ECHO_N "checking MACHDEP_OBJS... $ECHO_C" >&6; }
-+case $host in
-+ *-*-mingw*)
-+ extra_machdep_objs="PC/dl_nt.o PC/getpathp.o PC/import_nt.o"
-+ ;;
-+esac
- if test -z "$MACHDEP_OBJS"
- then
- MACHDEP_OBJS=$extra_machdep_objs
-@@ -15881,7 +16086,7 @@
- mremap nice pathconf pause plock poll pthread_init \
- putenv readlink realpath \
- select setegid seteuid setgid \
-- setlocale setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \
-+ setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \
- sigaction siginterrupt sigrelse strftime strlcpy \
- sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \
- truncate uname unsetenv utimes waitpid wait3 wait4 wcscoll wcsxfrm _getpty
-@@ -15978,6 +16183,7 @@
- done
-
-
-+
- # For some functions, having a definition is not sufficient, since
- # we want to take their address.
- { echo "$as_me:$LINENO: checking for chroot" >&5
-@@ -18653,9 +18859,19 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
--{ echo "$as_me:$LINENO: result: no" >&5
-+case $host in
-+ #FIXME: mingw define getaddinfo if WINVER >= 0x501, i.e. XP or greater.
-+ #TODO: mingw require additional check.
-+ #*-*-mingw*)
-+ # AC_MSG_RESULT([yes])
-+ # buggygetaddrinfo=no
-+ # ;;
-+ *)
-+ { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
--buggygetaddrinfo=yes
-+ buggygetaddrinfo=yes
-+ ;;
-+esac
-
- fi
-
-@@ -19894,7 +20110,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--# include <netdb.h>
-+#ifdef HAVE_WINSOCK2_H
-+# include <ws2tcpip.h>
-+#else
-+# include <netdb.h>
-+#endif
- int
- main ()
- {
-@@ -19953,8 +20173,15 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--# include <sys/types.h>
--# include <sys/socket.h>
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#ifdef HAVE_SYS_SOCKET_H
-+#include <sys/socket.h>
-+#endif
-+#ifdef HAVE_WINSOCK2_H
-+#include <winsock2.h>
-+#endif
- int
- main ()
- {
-@@ -21157,6 +21384,9 @@
- Darwin) ;;
- *) LIBM=-lm
- esac
-+case $host in
-+ *-*-mingw*) LIBM=;;
-+esac
- { echo "$as_me:$LINENO: checking for --with-libm=STRING" >&5
- echo $ECHO_N "checking for --with-libm=STRING... $ECHO_C" >&6; }
-
-@@ -21279,6 +21509,12 @@
-
- fi
-
-+case $host in
-+ *-*-mingw*)
-+ # Some MSVC runtimes don't preserve zero sign.
-+ # On mingw host we will use always replacemnt function.
-+ ac_cv_tanh_preserves_zero_sign=no;;
-+esac
- { echo "$as_me:$LINENO: result: $ac_cv_tanh_preserves_zero_sign" >&5
- echo "${ECHO_T}$ac_cv_tanh_preserves_zero_sign" >&6; }
- if test "$ac_cv_tanh_preserves_zero_sign" = yes
-@@ -22029,7 +22265,10 @@
- else
-
- if test "$cross_compiling" = yes; then
-- ac_cv_wchar_t_signed=yes
-+ case $host in
-+ *-*-mingw*) ac_cv_wchar_t_signed=no;;
-+ *) ac_cv_wchar_t_signed=yes;;
-+ esac
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -24229,8 +24468,37 @@
- THREADHEADERS="$THREADHEADERS \$(srcdir)/$h"
- done
-
-+# FIXME: in cross-compilation env. (mingw on linux) how to select correct compiler ?
-+# The current py-code will created modules with .so suffix and environment
-+# variable setting SO=$(SO) don't help
-+# see output of: python setup.py build --help-compiler
-+
-+case $host in
-+ *-*-mingw*) PYMOD_BUILDOPT="--compiler mingw32";;
-+esac
-+
-+# Python interpreter main program for frozen scripts
-+
-+PYTHON_OBJS_FROZENMAIN="Python/frozenmain.o"
-+# MODULE_GETPATH - default sys.path calculations
-+
-+MODULE_GETPATH=Modules/getpath.o
-+case $host in
-+ *-*-mingw*)
-+ CPPFLAGS="-I\$(srcdir)/Python -I\$(srcdir)/PC $CPPFLAGS"
-+
-+ # FIXME: why windows builds don't use PC/frozen_dllmain.o ?
-+ PYTHON_OBJS_FROZENMAIN=""
-+ # default sys.path calculations for windows platforms
-+ MODULE_GETPATH=PC/getpathp.o
-+ ;;
-+esac
-+
-
- SRCDIRS="Parser Grammar Objects Python Modules Mac"
-+case $host in
-+ *-*-mingw*) SRCDIRS="$SRCDIRS PC";;
-+esac
- { echo "$as_me:$LINENO: checking for build directories" >&5
- echo $ECHO_N "checking for build directories... $ECHO_C" >&6; }
- for dir in $SRCDIRS; do
-@@ -24918,6 +25186,7 @@
- FRAMEWORKALTINSTALLLAST!$FRAMEWORKALTINSTALLLAST$ac_delim
- FRAMEWORKUNIXTOOLSPREFIX!$FRAMEWORKUNIXTOOLSPREFIX$ac_delim
- MACHDEP!$MACHDEP$ac_delim
-+INITSYS!$INITSYS$ac_delim
- SGI_ABI!$SGI_ABI$ac_delim
- CONFIGURE_MACOSX_DEPLOYMENT_TARGET!$CONFIGURE_MACOSX_DEPLOYMENT_TARGET$ac_delim
- EXPORT_MACOSX_DEPLOYMENT_TARGET!$EXPORT_MACOSX_DEPLOYMENT_TARGET$ac_delim
-@@ -24961,7 +25230,6 @@
- LINKFORSHARED!$LINKFORSHARED$ac_delim
- CFLAGSFORSHARED!$CFLAGSFORSHARED$ac_delim
- SHLIBS!$SHLIBS$ac_delim
--USE_SIGNAL_MODULE!$USE_SIGNAL_MODULE$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -25003,10 +25271,12 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-+USE_SIGNAL_MODULE!$USE_SIGNAL_MODULE$ac_delim
- SIGNAL_OBJS!$SIGNAL_OBJS$ac_delim
- USE_THREAD_MODULE!$USE_THREAD_MODULE$ac_delim
- LDLAST!$LDLAST$ac_delim
- THREADOBJ!$THREADOBJ$ac_delim
-+BUILDIN_WIN32_MODULE!$BUILDIN_WIN32_MODULE$ac_delim
- DLINCLDIR!$DLINCLDIR$ac_delim
- DYNLOADFILE!$DYNLOADFILE$ac_delim
- MACHDEP_OBJS!$MACHDEP_OBJS$ac_delim
-@@ -25020,11 +25290,14 @@
- LIBM!$LIBM$ac_delim
- LIBC!$LIBC$ac_delim
- THREADHEADERS!$THREADHEADERS$ac_delim
-+PYMOD_BUILDOPT!$PYMOD_BUILDOPT$ac_delim
-+PYTHON_OBJS_FROZENMAIN!$PYTHON_OBJS_FROZENMAIN$ac_delim
-+MODULE_GETPATH!$MODULE_GETPATH$ac_delim
- SRCDIRS!$SRCDIRS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 24; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -Naur a/configure.in b/configure.in
--- a/configure.in 2009-01-09 04:17:34.000000000 +0000
-+++ b/configure.in 2009-03-01 06:56:36.479947656 +0000
-@@ -34,7 +34,15 @@
- mv confdefs.h.new confdefs.h
-
- AC_SUBST(VERSION)
-+case $host in
-+ *-*-mingw*)
-+ dnl To be compatible with MSVC build.
-+VERSION=`echo PYTHON_VERSION | sed -e 's|\.||g'`
-+ ;;
-+ *)
- VERSION=PYTHON_VERSION
-+ ;;
-+esac
-
- AC_SUBST(SOVERSION)
- SOVERSION=1.0
-@@ -214,6 +222,22 @@
++++ b/configure.in 2009-05-26 05:54:42.004744459 +0000
+@@ -214,6 +214,22 @@
AC_MSG_CHECKING(MACHDEP)
if test -z "$MACHDEP"
then
@@ -1753,25 +1220,7 @@
ac_sys_system=`uname -s`
if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
-@@ -235,6 +259,17 @@
- '') MACHDEP="unknown";;
- esac
- fi
-+
-+AC_MSG_CHECKING([for init system calls])
-+AC_SUBST(INITSYS)
-+case $host in
-+ # FIXME: May configure lack detection for os2 host system ?
-+ #?#*-*-os2*) INITSYS=os2;;
-+ *-*-mingw*) INITSYS=nt;;
-+ *) INITSYS=posix;;
-+esac
-+AC_MSG_RESULT([$INITSYS])
-+
-
- # Some systems cannot stand _XOPEN_SOURCE being defined at all; they
- # disable features if it is defined, without any means to access these
-@@ -607,6 +642,10 @@
+@@ -607,6 +623,10 @@
*)
enable_shared="no";;
esac
@@ -1782,7 +1231,7 @@
fi
AC_MSG_RESULT($enable_shared)
-@@ -700,6 +739,14 @@
+@@ -700,6 +720,14 @@
;;
esac
@@ -1797,7 +1246,7 @@
else # shared is disabled
case $ac_sys_system in
CYGWIN*)
-@@ -707,6 +754,10 @@
+@@ -707,6 +735,10 @@
LDLIBRARY='libpython$(VERSION).dll.a'
;;
esac
@@ -1808,7 +1257,7 @@
fi
AC_MSG_RESULT($LDLIBRARY)
-@@ -744,6 +795,8 @@
+@@ -744,6 +776,8 @@
esac
fi
@@ -1817,7 +1266,7 @@
# Check for --with-pydebug
AC_MSG_CHECKING(for --with-pydebug)
AC_ARG_WITH(pydebug,
-@@ -758,6 +811,29 @@
+@@ -758,6 +792,29 @@
else AC_MSG_RESULT(no); Py_DEBUG='false'
fi],
[AC_MSG_RESULT(no)])
@@ -1847,7 +1296,7 @@
# XXX Shouldn't the code above that fiddles with BASECFLAGS and OPT be
# merged with this chunk of code?
-@@ -774,6 +850,8 @@
+@@ -774,6 +831,8 @@
# tweak OPT based on compiler and platform, only if the user didn't set
# it on the command line
@@ -1856,7 +1305,7 @@
AC_SUBST(OPT)
if test -z "$OPT"
then
-@@ -854,6 +932,10 @@
+@@ -854,6 +913,10 @@
alpha*)
BASECFLAGS="$BASECFLAGS -mieee"
;;
@@ -1867,7 +1316,7 @@
esac
case $ac_sys_system in
-@@ -936,8 +1018,15 @@
+@@ -936,8 +999,15 @@
;;
esac
@@ -1884,7 +1333,7 @@
else
OPT="-DNDEBUG $OPT"
fi
-@@ -1132,6 +1221,20 @@
+@@ -1132,6 +1202,20 @@
AC_MSG_RESULT($ac_cv_pthread)
fi
@@ -1905,7 +1354,7 @@
# If we have set a CC compiler flag for thread support then
# check if it works for CXX, too.
ac_cv_cxx_thread=no
-@@ -1152,6 +1255,9 @@
+@@ -1152,6 +1236,9 @@
then
CXX="$CXX -pthread"
ac_cv_cxx_thread=yes
@@ -1915,7 +1364,7 @@
fi
if test $ac_cv_cxx_thread = yes
-@@ -1193,7 +1299,7 @@
+@@ -1193,7 +1280,7 @@
sys/termio.h sys/time.h \
sys/times.h sys/types.h sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
@@ -1924,7 +1373,7 @@
AC_HEADER_DIRENT
AC_HEADER_MAJOR
-@@ -1520,6 +1626,16 @@
+@@ -1520,6 +1607,16 @@
CYGWIN*) SO=.dll;;
*) SO=.so;;
esac
@@ -1941,7 +1390,7 @@
else
# this might also be a termcap variable, see #610332
echo
-@@ -1640,6 +1756,11 @@
+@@ -1640,6 +1737,11 @@
atheos*) LDSHARED="gcc -shared";;
*) LDSHARED="ld";;
esac
@@ -1953,7 +1402,7 @@
fi
AC_MSG_RESULT($LDSHARED)
BLDSHARED=${BLDSHARED-$LDSHARED}
-@@ -1737,6 +1858,12 @@
+@@ -1737,6 +1839,12 @@
# when running test_compile.py.
LINKFORSHARED='-Wl,-E -N 2048K';;
esac
@@ -1966,7 +1415,7 @@
fi
AC_MSG_RESULT($LINKFORSHARED)
-@@ -1753,6 +1880,12 @@
+@@ -1753,6 +1861,12 @@
*)
CFLAGSFORSHARED='$(CCSHARED)'
esac
@@ -1979,7 +1428,7 @@
fi
AC_MSG_RESULT($CFLAGSFORSHARED)
-@@ -1920,6 +2053,13 @@
+@@ -1920,6 +2034,13 @@
AC_DEFINE(WITH_THREAD)
posix_threads=yes
THREADOBJ="Python/thread.o"
@@ -1993,7 +1442,7 @@
else
if test ! -z "$with_threads" -a -d "$with_threads"
then LDFLAGS="$LDFLAGS -L$with_threads"
-@@ -2079,6 +2219,18 @@
+@@ -2079,6 +2200,18 @@
fi
@@ -2012,7 +1461,7 @@
# Check for enable-ipv6
AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
AC_MSG_CHECKING([if --enable-ipv6 is specified])
-@@ -2345,6 +2497,14 @@
+@@ -2345,6 +2478,14 @@
fi
;;
esac
@@ -2027,7 +1476,7 @@
fi
AC_MSG_RESULT($DYNLOADFILE)
if test "$DYNLOADFILE" != "dynload_stub.o"
-@@ -2357,6 +2517,11 @@
+@@ -2357,6 +2498,11 @@
AC_SUBST(MACHDEP_OBJS)
AC_MSG_CHECKING(MACHDEP_OBJS)
@@ -2039,13 +1488,7 @@
if test -z "$MACHDEP_OBJS"
then
MACHDEP_OBJS=$extra_machdep_objs
-@@ -2374,11 +2539,22 @@
- mremap nice pathconf pause plock poll pthread_init \
- putenv readlink realpath \
- select setegid seteuid setgid \
-- setlocale setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \
-+ setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \
- sigaction siginterrupt sigrelse strftime strlcpy \
+@@ -2379,6 +2525,17 @@
sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \
truncate uname unsetenv utimes waitpid wait3 wait4 wcscoll wcsxfrm _getpty)
@@ -2063,7 +1506,7 @@
# For some functions, having a definition is not sufficient, since
# we want to take their address.
AC_MSG_CHECKING(for chroot)
-@@ -2759,8 +2935,18 @@
+@@ -2759,8 +2916,18 @@
buggygetaddrinfo=yes,
AC_MSG_RESULT(buggy)
buggygetaddrinfo=yes)], [
@@ -2084,7 +1527,7 @@
])
if test "$buggygetaddrinfo" = "yes"; then
-@@ -2812,20 +2998,31 @@
+@@ -2812,20 +2979,31 @@
AC_MSG_CHECKING(for addrinfo)
AC_CACHE_VAL(ac_cv_struct_addrinfo,
AC_TRY_COMPILE([
@@ -2120,18 +1563,7 @@
[struct sockaddr_storage s],
ac_cv_struct_sockaddr_storage=yes,
ac_cv_struct_sockaddr_storage=no))
-@@ -3019,6 +3216,10 @@
- Darwin) ;;
- *) LIBM=-lm
- esac
-+dnl new style to set libraries for host system
-+case $host in
-+ *-*-mingw*) LIBM=;;
-+esac
- AC_MSG_CHECKING(for --with-libm=STRING)
- AC_ARG_WITH(libm,
- AC_HELP_STRING(--with-libm=STRING, math library),
-@@ -3075,6 +3276,12 @@
+@@ -3075,6 +3253,12 @@
ac_cv_tanh_preserves_zero_sign=yes,
ac_cv_tanh_preserves_zero_sign=no,
ac_cv_tanh_preserves_zero_sign=no)])
@@ -2144,7 +1576,7 @@
AC_MSG_RESULT($ac_cv_tanh_preserves_zero_sign)
if test "$ac_cv_tanh_preserves_zero_sign" = yes
then
-@@ -3129,7 +3336,10 @@
+@@ -3129,7 +3313,10 @@
],
ac_cv_wchar_t_signed=yes,
ac_cv_wchar_t_signed=no,
@@ -2156,7 +1588,7 @@
AC_MSG_RESULT($ac_cv_wchar_t_signed)
fi
-@@ -3628,8 +3838,39 @@
+@@ -3628,8 +3815,39 @@
THREADHEADERS="$THREADHEADERS \$(srcdir)/$h"
done
@@ -2198,7 +1630,7 @@
if test ! -d $dir; then
diff -Naur a/pyconfig.h.in b/pyconfig.h.in
--- a/pyconfig.h.in 2008-09-07 06:24:49.000000000 +0000
-+++ b/pyconfig.h.in 2009-03-01 08:51:03.668976240 +0000
++++ b/pyconfig.h.in 2009-05-26 05:54:42.016744217 +0000
@@ -28,7 +28,7 @@
/* Define to 1 if you have the `acosh' function. */
#undef HAVE_ACOSH
@@ -2208,104 +1640,17 @@
#undef HAVE_ADDRINFO
/* Define to 1 if you have the `alarm' function. */
-@@ -58,6 +58,10 @@
- /* Define to 1 if you have the <bluetooth.h> header file. */
- #undef HAVE_BLUETOOTH_H
+@@ -804,6 +804,9 @@
+ wide chars that would be converted */
+ #undef HAVE_BROKEN_MBSTOWCS
-+/* Define if mbstowcs(NULL, "text", 0) does not return the number of wide
-+ chars that would be converted. */
-+#undef HAVE_BROKEN_MBSTOWCS
-+
- /* Define if nice() returns success/failure instead of the new priority. */
- #undef HAVE_BROKEN_NICE
-
-@@ -122,8 +126,11 @@
- /* Define if we have /dev/ptc. */
- #undef HAVE_DEV_PTC
-
-+/* disable openpty always */
-+#if 0
- /* Define if we have /dev/ptmx. */
- #undef HAVE_DEV_PTMX
-+#endif
-
- /* Define to 1 if you have the <direct.h> header file. */
- #undef HAVE_DIRECT_H
-@@ -180,8 +187,11 @@
- /* Define to 1 if you have the `fork' function. */
- #undef HAVE_FORK
-
-+/* disable forkpty always */
-+#if 0
- /* Define to 1 if you have the `forkpty' function. */
- #undef HAVE_FORKPTY
-+#endif
-
- /* Define to 1 if you have the `fpathconf' function. */
- #undef HAVE_FPATHCONF
-@@ -357,7 +367,7 @@
- /* Define to 1 if you have the <libintl.h> header file. */
- #undef HAVE_LIBINTL_H
-
--/* Define to 1 if you have the `readline' library (-lreadline). */
-+/* Define if you have the readline library (-lreadline). */
- #undef HAVE_LIBREADLINE
-
- /* Define to 1 if you have the `resolv' library (-lresolv). */
-@@ -420,8 +430,11 @@
- /* Define to 1 if you have the `nice' function. */
- #undef HAVE_NICE
-
-+/* disable openpty always */
-+#if 0
- /* Define to 1 if you have the `openpty' function. */
- #undef HAVE_OPENPTY
-+#endif
-
- /* Define if compiling using MacOS X 10.5 SDK or later. */
- #undef HAVE_OSX105_SDK
-@@ -447,6 +460,8 @@
- /* Define if your compiler supports function prototype */
- #undef HAVE_PROTOTYPES
-
-+/* disable pthreads, pty always */
-+#if 0
- /* Define if you have GNU PTH threads. */
- #undef HAVE_PTH
-
-@@ -464,6 +479,7 @@
-
- /* Define to 1 if you have the <pty.h> header file. */
- #undef HAVE_PTY_H
-+#endif /* force disable */
-
- /* Define to 1 if you have the `putenv' function. */
- #undef HAVE_PUTENV
-@@ -800,9 +816,8 @@
- /* Define to 1 if you have the `wcsxfrm' function. */
- #undef HAVE_WCSXFRM
-
--/* Define if mbstowcs(NULL, "text", 0) does not return the number of
-- wide chars that would be converted */
--#undef HAVE_BROKEN_MBSTOWCS
+/* Define to 1 if you have the <winsock2.h> header file. */
+#undef HAVE_WINSOCK2_H
-
++
/* Define if tzset() actually switches the local timezone in a meaningful way.
*/
-@@ -811,8 +826,11 @@
- /* Define if the zlib library has inflateCopy */
- #undef HAVE_ZLIB_COPY
-
-+/* disable getpty always */
-+#if 0
- /* Define to 1 if you have the `_getpty' function. */
- #undef HAVE__GETPTY
-+#endif
-
- /* Define if you are using Mach cthreads directly under /include */
- #undef HURD_C_THREADS
-@@ -831,6 +849,9 @@
+ #undef HAVE_WORKING_TZSET
+@@ -831,6 +834,9 @@
/* Define if mvwdelch in curses.h is an expression. */
#undef MVWDELCH_IS_EXPRESSION
@@ -2317,7 +1662,7 @@
diff -Naur a/setup.py b/setup.py
--- a/setup.py 2009-02-10 16:25:06.000000000 +0000
-+++ b/setup.py 2009-03-01 04:46:38.000000000 +0000
++++ b/setup.py 2009-05-26 06:15:23.676744253 +0000
@@ -115,7 +115,7 @@
# with Modules/ and adding Python's include directory to the path.
(srcdir,) = sysconfig.get_config_vars('srcdir')
@@ -2407,7 +1752,16 @@
for env_var, arg_name, dir_list in (
('LDFLAGS', '-R', self.compiler.runtime_library_dirs),
('LDFLAGS', '-L', self.compiler.library_dirs),
-@@ -388,6 +438,7 @@
+@@ -348,6 +398,8 @@
+ add_dir_to_list(dir_list, directory)
+
+ if os.path.normpath(sys.prefix) != '/usr':
++ # NOTE: revision 25103:[ #420565 ] add search in sys.prefix
++ # before current source tree !?!?!?! No comment!
+ add_dir_to_list(self.compiler.library_dirs,
+ sysconfig.get_config_var("LIBDIR"))
+ add_dir_to_list(self.compiler.include_dirs,
+@@ -388,6 +440,7 @@
# NOTE: using shlex.split would technically be more correct, but
# also gives a bootstrap problem. Let's hope nobody uses directories
# with whitespace in the name to store libraries.
@@ -2415,7 +1769,7 @@
cflags, ldflags = sysconfig.get_config_vars(
'CFLAGS', 'LDFLAGS')
for item in cflags.split():
-@@ -400,7 +451,7 @@
+@@ -400,7 +453,7 @@
# Check for MacOS X, which doesn't need libm.a at all
math_libs = ['m']
@@ -2424,21 +1778,25 @@
math_libs = []
# XXX Omitted modules: gl, pure, dl, SGI-specific modules
-@@ -438,9 +489,11 @@
+@@ -438,9 +491,15 @@
# heapq
exts.append( Extension("_heapq", ["_heapqmodule.c"]) )
# operator.add() and similar goodies
- exts.append( Extension('operator', ['operator.c']) )
++ # On win32 host(mingw build in MSYS environment) show that site.py
++ # fail to load if some modules are not build-in:
+ if platform not in ['mingw', 'win32']:
+ exts.append( Extension('operator', ['operator.c']) )
# _functools
- exts.append( Extension("_functools", ["_functoolsmodule.c"]) )
++ # On win32 host(mingw build in MSYS environment) show that site.py
++ # fail to load if some modules are not build-in:
+ if platform not in ['mingw', 'win32']:
+ exts.append( Extension("_functools", ["_functoolsmodule.c"]) )
# C-optimized pickle replacement
exts.append( Extension("_pickle", ["_pickle.c"]) )
# atexit
-@@ -467,7 +520,10 @@
+@@ -467,7 +526,10 @@
locale_extra_link_args = []
@@ -2450,7 +1808,7 @@
libraries=locale_libs,
extra_link_args=locale_extra_link_args) )
-@@ -476,8 +532,11 @@
+@@ -476,8 +538,11 @@
# supported...)
# fcntl(2) and ioctl(2)
@@ -2464,7 +1822,7 @@
# pwd(3)
exts.append( Extension('pwd', ['pwdmodule.c']) )
# grp(3)
-@@ -492,7 +551,12 @@
+@@ -492,7 +557,12 @@
missing.extend(['pwd', 'grp', 'spwd'])
# select(2); not on ancient System V
@@ -2478,7 +1836,7 @@
# Fred Drake's interface to the Python parser
exts.append( Extension('parser', ['parsermodule.c']) )
-@@ -504,7 +568,7 @@
+@@ -504,7 +574,7 @@
missing.append('mmap')
# Lance Ellinghaus's syslog module
@@ -2487,7 +1845,7 @@
# syslog daemon interface
exts.append( Extension('syslog', ['syslogmodule.c']) )
else:
-@@ -526,6 +590,11 @@
+@@ -526,6 +596,11 @@
# readline
do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
@@ -2499,7 +1857,7 @@
if platform == 'darwin': # and os.uname()[2] < '9.':
# MacOSX 10.4 has a broken readline. Don't try to build
# the readline module unless the user has installed a fixed
-@@ -535,7 +604,7 @@
+@@ -535,7 +610,7 @@
if find_file('readline/rlconf.h', inc_dirs, []) is None:
do_readline = False
if do_readline:
@@ -2508,7 +1866,7 @@
# In every directory on the search path search for a dynamic
# library and then a static library, instead of first looking
# for dynamic libraries on the entire path.
-@@ -565,7 +634,7 @@
+@@ -565,7 +640,7 @@
else:
missing.append('readline')
@@ -2517,7 +1875,7 @@
# crypt module.
if self.compiler.find_library_file(lib_dirs, 'crypt'):
-@@ -580,7 +649,12 @@
+@@ -580,7 +655,12 @@
exts.append( Extension('_csv', ['_csv.c']) )
# socket(2)
@@ -2530,7 +1888,7 @@
depends = ['socketmodule.h']) )
# Detect SSL support for the socket module (via _ssl)
search_for_ssl_incs_in = [
-@@ -602,10 +676,13 @@
+@@ -602,10 +682,13 @@
if (ssl_incs is not None and
ssl_libs is not None):
@@ -2545,37 +1903,7 @@
depends = ['socketmodule.h']), )
else:
missing.append('_ssl')
-@@ -658,6 +735,29 @@
- exts.append( Extension('_md5', ['md5module.c']) )
- exts.append( Extension('_sha1', ['sha1module.c']) )
-
-+ # Modules with some Windows dependencies:
-+ if platform in ['mingw', 'win32']:
-+ srcdir = sysconfig.get_config_var('srcdir')
-+ pc_srcdir = os.path.abspath(os.path.join(srcdir, 'PC'))
-+
-+ exts.append( Extension('msvcrt', [os.path.join(pc_srcdir, p)
-+ for p in ['msvcrtmodule.c']]) )
-+
-+ exts.append( Extension('_msi', [os.path.join(pc_srcdir, p)
-+ for p in ['_msi.c']]) )
-+
-+ exts.append( Extension('_subprocess', [os.path.join(pc_srcdir, p)
-+ for p in ['_subprocess.c']]) )
-+
-+ # On win32 host(mingw build in MSYS environment) show that site.py
-+ # fail to load if some modules are not build-in:
-+ #exts.append( Extension('winreg', [os.path.join(pc_srcdir, p)
-+ # for p in ['winreg.c']]) )
-+
-+ exts.append( Extension('winsound', [os.path.join(pc_srcdir, p)
-+ for p in ['winsound.c']],
-+ libraries=['winmm']) )
-+
- # Modules that provide persistent dictionary-like semantics. You will
- # probably want to arrange for at least one of them to be available on
- # your machine, though none are defined by default because of library
-@@ -747,13 +847,14 @@
+@@ -747,13 +830,14 @@
'_sqlite/util.c', ]
sqlite_defines = []
@@ -2592,25 +1920,16 @@
# In every directory on the search path search for a dynamic
# library and then a static library, instead of first looking
# for dynamic libraries on the entiry path.
-@@ -775,7 +876,7 @@
- missing.append('_sqlite3')
-
- # The standard Unix dbm module:
-- if platform not in ['cygwin']:
-+ if platform not in ['cygwin', 'mingw', 'win32']:
- if find_file("ndbm.h", inc_dirs, []) is not None:
- # Some systems have -lndbm, others don't
- if self.compiler.find_library_file(lib_dirs, 'ndbm'):
-@@ -818,7 +919,7 @@
+@@ -818,7 +902,7 @@
missing.append('_gdbm')
# Unix-only modules
- if platform not in ['mac', 'win32']:
-+ if platform not in ['mac', 'mingw', 'win32']:
++ if platform not in ['mac', 'win32', 'mingw']:
# Steen Lumholt's termios module
exts.append( Extension('termios', ['termios.c']) )
# Jeremy Hylton's rlimit interface
-@@ -843,7 +944,12 @@
+@@ -843,7 +927,12 @@
# Curses support, requiring the System V version of curses, often
# provided by the ncurses library.
panel_library = 'panel'
@@ -2624,7 +1943,7 @@
curses_libs = ['ncursesw']
# Bug 1464056: If _curses.so links with ncursesw,
# _curses_panel.so must link with panelw.
-@@ -906,7 +1012,7 @@
+@@ -906,7 +995,7 @@
break
if version >= version_req:
if (self.compiler.find_library_file(lib_dirs, 'z')):
@@ -2633,7 +1952,7 @@
zlib_extra_link_args = ('-Wl,-search_paths_first',)
else:
zlib_extra_link_args = ()
-@@ -938,7 +1044,7 @@
+@@ -938,7 +1027,7 @@
# Gustavo Niemeyer's bz2 module.
if (self.compiler.find_library_file(lib_dirs, 'bz2')):
@@ -2642,25 +1961,40 @@
bz2_extra_link_args = ('-Wl,-search_paths_first',)
else:
bz2_extra_link_args = ()
-@@ -1000,7 +1106,7 @@
+@@ -1000,9 +1089,31 @@
# _fileio -- supposedly cross platform
exts.append(Extension('_fileio', ['_fileio.c']))
# Richard Oudkerk's multiprocessing module
- if platform == 'win32': # Windows
-+ if platform in ['mingw', 'win32']: # Windows
++
++ # Modules with some Windows dependencies:
++ if platform in ['mingw', 'win32']:
macros = dict()
libraries = ['ws2_32']
++ srcdir = sysconfig.get_config_var('srcdir')
++ pc_srcdir = os.path.abspath(os.path.join(srcdir, 'PC'))
++
++ exts.append( Extension('msvcrt', [os.path.join(pc_srcdir, p)
++ for p in ['msvcrtmodule.c']]) )
++
++ exts.append( Extension('_msi', [os.path.join(pc_srcdir, p)
++ for p in ['_msi.c']]) )
++
++ exts.append( Extension('_subprocess', [os.path.join(pc_srcdir, p)
++ for p in ['_subprocess.c']]) )
++
++ # On win32 host(mingw build in MSYS environment) show that site.py
++ # fail to load if some modules are not build-in:
++ #exts.append( Extension('_winreg', [os.path.join(pc_srcdir, p)
++ # for p in ['_winreg.c']]) )
++
++ exts.append( Extension('winsound', [os.path.join(pc_srcdir, p)
++ for p in ['winsound.c']],
++ libraries=['winmm']) )
-@@ -1048,7 +1154,7 @@
- )
- libraries = ['rt']
-
-- if platform == 'win32':
-+ if platform in ['mingw', 'win32']:
- multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
- '_multiprocessing/semaphore.c',
- '_multiprocessing/pipe_connection.c',
-@@ -1192,7 +1298,7 @@
+ elif platform == 'darwin': # Mac OSX
+ macros = dict(
+@@ -1192,7 +1303,7 @@
# Check for the include files on Debian and {Free,Open}BSD, where
# they're put in /usr/include/{tcl,tk}X.Y
dotversion = version
@@ -2669,7 +2003,7 @@
# OpenBSD and FreeBSD use Tcl/Tk library names like libtcl83.a,
# but the include subdirs are named like .../include/tcl8.3.
dotversion = dotversion[:-1] + '.' + dotversion[-1]
-@@ -1221,6 +1327,9 @@
+@@ -1221,6 +1332,9 @@
if platform == 'sunos5':
include_dirs.append('/usr/openwin/include')
added_lib_dirs.append('/usr/openwin/lib')
@@ -2679,7 +2013,7 @@
elif os.path.exists('/usr/X11R6/include'):
include_dirs.append('/usr/X11R6/include')
added_lib_dirs.append('/usr/X11R6/lib64')
-@@ -1256,8 +1365,8 @@
+@@ -1256,8 +1370,8 @@
if platform in ['aix3', 'aix4']:
libs.append('ld')
@@ -2690,7 +2024,7 @@
libs.append('X11')
ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
-@@ -1308,8 +1417,32 @@
+@@ -1308,8 +1422,32 @@
return True
def configure_ctypes(self, ext):
@@ -2724,7 +2058,7 @@
return self.configure_ctypes_darwin(ext)
(srcdir,) = sysconfig.get_config_vars('srcdir')
-@@ -1373,14 +1506,15 @@
+@@ -1373,14 +1511,15 @@
'_ctypes/malloc_closure.c']
depends = ['_ctypes/ctypes.h']
@@ -2742,7 +2076,7 @@
# XXX This shouldn't be necessary; it appears that some
# of the assembler code is non-PIC (i.e. it has relocations
# when it shouldn't. The proper fix would be to rewrite
-@@ -1391,7 +1525,7 @@
+@@ -1391,7 +1530,7 @@
# finding some -z option for the Sun compiler.
extra_link_args.append('-mimpure-text')
@@ -2751,7 +2085,7 @@
extra_link_args.append('-fPIC')
ext = Extension('_ctypes',
-@@ -1401,14 +1535,19 @@
+@@ -1401,14 +1540,19 @@
libraries=[],
sources=sources,
depends=depends)
Modified: torvm/trunk/build/win32/src/torvm-w32/torvm.c
===================================================================
--- torvm/trunk/build/win32/src/torvm-w32/torvm.c 2009-05-31 21:30:32 UTC (rev 19604)
+++ torvm/trunk/build/win32/src/torvm-w32/torvm.c 2009-05-31 23:12:42 UTC (rev 19605)
@@ -2119,10 +2119,8 @@
fatal ("Unable to prepare process environment.");
}
- if (clean) {
- uninstalltap();
+ if (clean)
goto shutdown;
- }
dispmsg("Tor VM is starting. Please be patient.");
if (!vmnop) {
More information about the tor-commits
mailing list