Merge http://nslu2-linux.bkbits.net/packages

into handhelds.org:/home/kergoth/code/packages

2004/10/13 06:35:50-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/10/13 00:18:03+09:30 (none)!rwhitby
Merged in SECTION changes to nslu2 files

2004/10/13 00:13:58+09:30 (none)!rwhitby
Merge

2004/10/09 22:38:19-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/10/10 14:51:40+09:30 (none)!rwhitby
Created separate unslung-standard-image, unslung-ext3flash-image and unslung-vfatdisk2-image packages, each of which uses the corresponding nslu2 kernel.

2004/10/08 06:14:59-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/10/07 15:16:32-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/10/07 02:20:57-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/10/06 16:12:22-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/10/06 09:11:13+09:30 (none)!rwhitby
Added default and required definitions of TARGET_OS and TARGET_FPU to the Unslung and OpenSlug ditros

2004/10/05 02:41:44-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/10/04 21:26:48-04:00 rant-central.com!CodeWhacker
Stretch the ramdisk back up to 10M, the max size the kernel is set up for.

2004/10/03 23:34:21-04:00 rant-central.com!CodeWhacker
Add the modules needed to mount disks.

2004/09/30 23:03:04-04:00 rant-central.com!CodeWhacker
Reset ramdisk size to 8M.

2004/09/29 14:31:35-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/09/29 21:27:18+09:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into home.(none):/home/openembedded/packages

2004/09/29 21:25:14+09:30 (none)!rwhitby
Commented out the calls to AM_PATH_PROG_WITH_TEST.  I have no idea whether this is the correct fix or not, but it is enough to get wget building again.

2004/09/29 02:51:24-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/09/29 07:04:16+09:30 (none)!rwhitby
Merge bk://nslu2-linux.bkbits.net/packages
into home.(none):/home/openembedded/packages

2004/09/28 14:31:42-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/09/28 18:22:38+09:30 (none)!rwhitby
Merge bk://nslu2-linux.bkbits.net/packages
into home.(none):/home/openembedded/packages

2004/09/28 08:41:19+09:30 (none)!rwhitby
Merge http://openembedded.bkbits.net/packages
into home.(none):/home/openembedded/packages

2004/09/27 16:19:13-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/09/28 00:08:45+09:30 (none)!rwhitby
Updated to unslung 2.2-alpha - unsling works, ipkg update works - need to work on base-files, sysvinit, update-rc.d, etc. now

2004/09/27 23:49:20+09:30 (none)!rwhitby
Back to where we where before splicing.  Now we should splice by adding ipkgs.

2004/09/27 23:19:44+09:30 (none)!rwhitby
Modifed a whole lot of unslung stuff to conform with the discussion with Kergoth.

2004/09/27 23:10:42+09:30 (none)!rwhitby
Added packages to recreate the nslu2 linksys firmware from scratch.

2004/09/27 22:08:57+09:30 (none)!rwhitby
Added /bin/tinylogin to the device table for the stock linksys nslu2 ramdisk

2004/09/27 22:01:08+09:30 (none)!rwhitby
Device table for the stock linksys nslu2 ramdisk

2004/09/27 21:46:23+09:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into home.(none):/home/openembedded/packages

2004/09/27 21:45:41+09:30 (none)!rwhitby
Device table for the stock linksys nslu2 ramdisk

2004/09/26 16:03:29-04:00 rant-central.com!roy
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into rant-central.com:/home/roy/workspace/NSLU2/oe/packages

2004/09/26 16:01:26-04:00 rant-central.com!roy
Added the patch from http://groups.yahoo.com/group/nslu2-linux/message/1735 to address the ~60 sec hang during boot.

2004/09/27 00:28:15+09:30 (none)!rwhitby
Fixed some Unslung 2.1 errors

2004/09/27 00:04:13+09:30 (none)!rwhitby
Unslung 2.1: Faked out enough of sysvinit to allow dropbear to be installed

2004/09/26 20:21:39+09:30 (none)!rwhitby
Finalised a set of libc6 libraries which don't seem to cause any problems.

2004/09/26 12:51:18+09:30 (none)!rwhitby
Commented out the libc6 files - one of them is making it fail.

2004/09/26 10:16:44+09:30 (none)!rwhitby
Spliced in the rest of libc6, libgcc1, sed and wget

2004/09/26 08:08:35+09:30 (none)!rwhitby
nslu2-unslung-ramdisk now stashes the half-built ramdisk in nslu2-binries between do_compile and do_rootfs.

2004/09/25 15:17:05-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/09/25 14:17:26-04:00 rant-central.com!roy
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into rant-central.com:/home/roy/workspace/NSLU2/oe/packages

2004/09/25 14:13:49-04:00 rant-central.com!roy
Adds the USB networking modules to the openslug kernel build

2004/09/25 14:11:27-04:00 rant-central.com!roy
Adds export of 2 pci symbols the USB networking modules (and probably others) need.

2004/09/25 21:54:09+09:30 (none)!rwhitby
Unslung 2.0-alpha can now unsling disks and install old-style ipkgs from our Unslung 1.x repository.

2004/09/25 20:57:34+09:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into home.(none):/home/openembedded/packages

2004/09/25 20:56:52+09:30 (none)!rwhitby
Spliced gcc lib and sed and minimal ipkg stuff

2004/09/24 18:44:21-07:00 bitkeeper.com!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into hostme.bitkeeper.com:/repos/n/nslu2-linux/packages

2004/09/25 01:02:41+09:30 (none)!rwhitby
Updated nslu2-unslung-ramdisk with next milestone - a rootfs built from ipks, some of which needs to be spliced into the ramdisk.

2004/09/24 22:54:57+09:30 (none)!rwhitby
Modified rootfs_ipk so that it would allow an empty IPKG_INSTALL (useful for building a rootfs up from scratch).

2004/09/24 22:39:08+09:30 (none)!rwhitby
Initial attempt at including a rootfs built from ipkgs

2004/09/24 22:35:13+09:30 (none)!rwhitby
Initial attempt at including a rootfs built from ipkgs

2004/09/24 08:04:37+09:30 (none)!rwhitby
Added a default kernel specification to unslung

BKrev: 416d97aarDhCyN_CmtJHZ0d3uwZiAQ

29 files changed, 1436 insertions, 74 deletions

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 7152ede857..b3cc686a1c 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,3 +1,4 @@
+CodeWhacker@rant-central.com
 CoreDump@handhelds.org
 CoreDump@mhcln01.hentges.local
 a0868066@lta0868066.ent.ti.com
diff --git a/base-files/base-files_3.0.14.oe b/base-files/base-files_3.0.14.oe
index 12452c482b..6f81eea17d 100644
--- a/base-files/base-files_3.0.14.oe
+++ b/base-files/base-files_3.0.14.oe
@@ -136,3 +136,14 @@ do_install_append_ramses () {
 PACKAGES = "${PN}-doc ${PN}"
 FILES_${PN} = "/"
 FILES_${PN}-doc = "/usr/share/doc /usr/share/common-licenses"
+
+
+# Unslung distribution specific packages follow ...
+
+PACKAGES_unslung = ${PN}-unslung
+PACKAGE_ARCH_${PN}-unslung = "nslu2"
+MAINTAINER_${PN}-unslung = "NSLU2 Linux <www.nslu2-linux.org>"
+RDEPENDS_${PN}-unslung = "nslu2-linksys-ramdisk"
+RPROVIDES_${PN}-unslung = "${PN}"
+
+FILES_${PN}-unslung = ""
diff --git a/classes/nslu2_flashimg.oeclass b/classes/nslu2_flashimg.oeclass
index f6170b9b73..ed8bbf7e59 100644
--- a/classes/nslu2_flashimg.oeclass
+++ b/classes/nslu2_flashimg.oeclass
@@ -4,12 +4,11 @@ nslu2_pack_image () {
 			${STAGING_LIBDIR}/nslu2-binaries/Trailer \
 			${STAGING_LIBDIR}/nslu2-binaries/SysConf \
 			${DEPLOY_DIR_IMAGE}/slug/
-	install -m 0644 ${STAGING_KERNEL_DIR}/zImage ${DEPLOY_DIR_IMAGE}/slug/vmlinuz
+	install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-${IMAGE_BASENAME} ${DEPLOY_DIR_IMAGE}/slug/vmlinuz
 	install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/slug/ramdisk.gz
 	cd ${DEPLOY_DIR_IMAGE}/slug
 	slugtool pack ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.img
-	rm -f ${DEPLOY_DIR_IMAGE}/zImage* ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz
-	rm -rf ${DEPLOY_DIR_IMAGE}/slug
+	rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/slug
 }
 
 EXTRA_IMAGEDEPENDS += 'slugtool-native nslu2-firmware-binary'
diff --git a/classes/rootfs_ipk.oeclass b/classes/rootfs_ipk.oeclass
index 96f060449b..772984cc2f 100644
--- a/classes/rootfs_ipk.oeclass
+++ b/classes/rootfs_ipk.oeclass
@@ -50,7 +50,9 @@ EOF
 		fi
 	done
 	ipkg-cl ${IPKG_ARGS} update
-	ipkg-cl ${IPKG_ARGS} install ${IPKG_INSTALL}
+	if [ ! -z "${IPKG_INSTALL}" ]; then
+		ipkg-cl ${IPKG_ARGS} install ${IPKG_INSTALL}
+	fi
 
 	export D=${IMAGE_ROOTFS}
 	export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index e69de29bb2..af00ac8ec5 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -0,0 +1,20 @@
+#@TYPE: Distribution
+#@NAME: OpenSlug
+#@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2
+
+TARGET_FPU ?= "soft"
+TARGET_OS ?= "linux-uclibc"
+
+INHERIT += " package_ipk debian nslu2_flashimg"
+
+IMAGE_FSTYPE = "ext2.gz"
+
+BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel module-init-tools"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usbnet kernel-module-usbserial  \
+kernel-module-usbcore kernel-module-usb-storage  kernel-module-uhci-hcd \
+kernel-module-pegasus  kernel-module-p8022 kernel-module-kaweth \
+kernel-module-ehci-hcd \
+kernel-module-scsi-mod kernel-module-sd-mod kernel-module-ext3 kernel-module-jbd \
+module-init-tools"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "nslu2-openslug"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index e69de29bb2..ceaf1108fc 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -0,0 +1,20 @@
+#@TYPE: Distribution
+#@NAME: Unslung
+#@DESCRIPTION: Unslung Linux Distribution for the NSLU2
+
+TARGET_FPU = "soft"
+TARGET_OS = "linux"
+
+INHERIT += " package_ipk nslu2_flashimg"
+
+IMAGE_FSTYPE = "ext2.gz"
+
+BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel"
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ax8817x kernel-module-catc \
+kernel-module-cdcether kernel-module-kaweth kernel-module-pegasus \
+kernel-module-rtl8150 kernel-module-usbnet kernel-module-mii"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "nslu2-unslung-kernel-standard"
+
+PREFERRED_VERSION_glibc ?= "2.2.5"
+PREFERRED_VERSION_glibc-initial ?= "2.2.5"
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index e69de29bb2..4d3bd326de 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: Linksys NSLU2
+#@DESCRIPTION: Machine configuration for the Linksys NSLU2 product
+
+TARGET_ARCH = "armeb"
+IPKG_ARCHS = "all ${TARGET_ARCH} armv5te ${MACHINE}"
+PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
+
+IMAGE_ROOTFS_SIZE_ext2 = "10240"
+IMAGE_ROOTFS_SIZE_ext2.gz = "10240"
+
+include tune-xscale.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
+KERNEL_CONSOLE = "ttyS0,115200n8"
+USE_VT = "0"
diff --git a/files/device_table-nslu2.txt b/files/device_table-nslu2.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/files/device_table-nslu2.txt
diff --git a/files/device_table-unslung.txt b/files/device_table-unslung.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/files/device_table-unslung.txt
diff --git a/glibc/glibc_2.2.5.oe b/glibc/glibc_2.2.5.oe
index 9388293fc5..a868afaac9 100644
--- a/glibc/glibc_2.2.5.oe
+++ b/glibc/glibc_2.2.5.oe
@@ -242,3 +242,21 @@ do_stage() {
 }
 
 include glibc-package.oeclass
+
+
+# Unslung distribution specific packages follow ...
+
+PACKAGES_unslung = libc6-unslung
+PACKAGE_ARCH_libc6-unslung = "nslu2"
+MAINTAINER_libc6-unslung = "NSLU2 Linux <www.nslu2-linux.org>"
+RDEPENDS_libc6-unslung = "nslu2-linksys-ramdisk"
+RPROVIDES_libc6-unslung = "libc6"
+
+FILES_libc6-unslung = "/lib/librt*"
+
+# For some reason, ldconfig segfaults on nslu2.
+# FILES_libc6-unslung += " /sbin/ldconfig"
+
+# For some reason, libnss_compat causes segmentation faults on nslu2.
+# FILES_libc6-unslung += " /lib/libnss_compat*"
+
diff --git a/linux/nslu2-linksys_2.4.22.oe b/linux/nslu2-linksys_2.4.22.oe
index e7685e7121..1aca13cd04 100644
--- a/linux/nslu2-linksys_2.4.22.oe
+++ b/linux/nslu2-linksys_2.4.22.oe
@@ -23,6 +23,7 @@ inherit kernel
 
 ARCH = "arm"
 KERNEL_IMAGETYPE = "zImage"
+KERNEL_SUFFIX ?= "linksys"
 CMDLINE_CONSOLE ?= "ttyS0,115200"
 CMDLINE_ROOT = "root=/dev/ram0 initrd=0x01000000,10M mem=32M@0x00000000"
 CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_ROOT}"
@@ -36,7 +37,7 @@ do_configure_prepend() {
 
 do_deploy() {
         install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}.bin-${DATETIME}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/linux/nslu2-openslug-2.6.7/arm-timer.patch b/linux/nslu2-openslug-2.6.7/arm-timer.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/nslu2-openslug-2.6.7/arm-timer.patch
diff --git a/linux/nslu2-openslug-2.6.7/defconfig b/linux/nslu2-openslug-2.6.7/defconfig
index e69de29bb2..74450c16b6 100644
--- a/linux/nslu2-openslug-2.6.7/defconfig
+++ b/linux/nslu2-openslug-2.6.7/defconfig
@@ -0,0 +1,1096 @@
+#
+# Automatically generated make config: don't edit
+#
+CONFIG_ARM=y
+CONFIG_MMU=y
+CONFIG_UID16=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_STANDALONE=y
+CONFIG_BROKEN_ON_SMP=y
+
+#
+# General setup
+#
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_HOTPLUG=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_EMBEDDED=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_ADIFCC is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_CAMELOT is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_IOP3XX is not set
+CONFIG_ARCH_IXP4XX=y
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_VERSATILE_PB is not set
+CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
+
+#
+# Intel IXP4xx Implementation Options
+#
+
+#
+# IXP4xx Platforms
+#
+# CONFIG_ARCH_AVILA is not set
+# CONFIG_ARCH_ADI_COYOTE is not set
+CONFIG_ARCH_IXDP425=y
+CONFIG_ARCH_IXCDP1100=y
+# CONFIG_ARCH_PRPMC1100 is not set
+CONFIG_ARCH_IXDP4XX=y
+
+#
+# IXP4xx Options
+#
+CONFIG_IXP4XX_INDIRECT_PCI=y
+CONFIG_DMABOUNCE=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_XSCALE=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5T=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_MINICACHE=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_THUMB is not set
+CONFIG_CPU_BIG_ENDIAN=y
+CONFIG_XSCALE_PMU=y
+
+#
+# General setup
+#
+CONFIG_PCI=y
+# CONFIG_ZBOOT_ROM is not set
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_PCI_LEGACY_PROC=y
+# CONFIG_PCI_NAMES is not set
+
+#
+# PCMCIA/CardBus support
+#
+# CONFIG_PCMCIA is not set
+
+#
+# At least one math emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Generic Driver Options
+#
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+CONFIG_PM=y
+# CONFIG_PREEMPT is not set
+CONFIG_APM=y
+# CONFIG_ARTHUR is not set
+CONFIG_CMDLINE="root=/dev/ram0 initrd=0x01000000,10M mem=32M@0x00000000 console=ttyS0,115200n8"
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_REDBOOT_PARTS=y
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_IXP4XX=y
+# CONFIG_MTD_EDB7312 is not set
+# CONFIG_MTD_PCI is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLKMTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_CARMEL is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=10240
+CONFIG_BLK_DEV_INITRD=y
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Networking support
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=m
+CONFIG_PACKET_MMAP=y
+CONFIG_NETLINK_DEV=m
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_FWMARK=y
+CONFIG_IP_ROUTE_NAT=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_TOS=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+
+#
+# IP: Virtual Server Configuration
+#
+CONFIG_IP_VS=m
+CONFIG_IP_VS_DEBUG=y
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+# CONFIG_IP_VS_PROTO_TCP is not set
+# CONFIG_IP_VS_PROTO_UDP is not set
+# CONFIG_IP_VS_PROTO_ESP is not set
+# CONFIG_IP_VS_PROTO_AH is not set
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+# CONFIG_IP_VS_SED is not set
+# CONFIG_IP_VS_NQ is not set
+
+#
+# IPVS application helper
+#
+# CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_IP_NF_CONNTRACK is not set
+# CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
+# CONFIG_IP_NF_COMPAT_IPFWADM is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=y
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_FASTROUTE is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+# CONFIG_NET_SCH_HFSC is not set
+CONFIG_NET_SCH_CSZ=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+# CONFIG_NET_SCH_DELAY is not set
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_QOS=y
+CONFIG_NET_ESTIMATOR=y
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_POLICE=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_ETHERTAP is not set
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_NET_VENDOR_3COM is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_VIA_RHINE is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+CONFIG_NET_RADIO=y
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+# CONFIG_AIRO is not set
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+
+#
+# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
+#
+# CONFIG_PRISM54 is not set
+CONFIG_NET_WIRELESS=y
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transport Attributes
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_MEGARAID is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_ISP is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA2XXX=m
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
+# CONFIG_SCSI_QLA6322 is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input I/O drivers
+#
+# CONFIG_GAMEPORT is not set
+CONFIG_SOUND_GAMEPORT=y
+# CONFIG_SERIO is not set
+# CONFIG_SERIO_I8042 is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=2
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_QIC02_TAPE is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_IXP4XX_WATCHDOG=y
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+# CONFIG_NVRAM is not set
+# CONFIG_RTC is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_FTAPE is not set
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Algorithms
+#
+CONFIG_I2C_ALGOBIT=y
+# CONFIG_I2C_ALGOPCF is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_ISA is not set
+CONFIG_I2C_IXP4XX=y
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_SCx200_ACB is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+
+#
+# Hardware Sensors Chip support
+#
+CONFIG_I2C_SENSOR=y
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+
+#
+# Other I2C Chip support
+#
+CONFIG_SENSORS_EEPROM=y
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+# CONFIG_EXT2_FS_SECURITY is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_FAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_SYSFS=y
+# CONFIG_DEVFS_FS is not set
+# CONFIG_DEVPTS_FS_XATTR is not set
+CONFIG_TMPFS=y
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=1
+# CONFIG_JFFS2_FS_NAND is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+# CONFIG_EXPORTFS is not set
+CONFIG_SUNRPC=m
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_NEC98_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Graphics support
+#
+# CONFIG_FB is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# Misc devices
+#
+
+#
+# USB support
+#
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_UHCI_HCD=m
+# CONFIG_USB_SL811HS is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_BLUETOOTH_TTY is not set
+# CONFIG_USB_ACM is not set
+CONFIG_USB_PRINTER=m
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_HP8200e is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+
+#
+# USB Human Interface Devices (HID)
+#
+# CONFIG_USB_HID is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_MTOUCH is not set
+# CONFIG_USB_EGALAX is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+# CONFIG_USB_DABUSB is not set
+
+#
+# Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network adaptors
+#
+# CONFIG_USB_CATC is not set
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+# CONFIG_USB_RTL8150 is not set
+CONFIG_USB_USBNET=m
+
+#
+# USB Host-to-Host Cables
+#
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_GENESYS=y
+CONFIG_USB_NET1080=y
+CONFIG_USB_PL2301=y
+
+#
+# Intelligent USB Devices/Gadgets
+#
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_ZAURUS=y
+CONFIG_USB_CDCETHER=y
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_AX8817X=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_BELKIN=m
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_TIGL is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# Kernel hacking
+#
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_USER is not set
+# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SLAB is not set
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_WAITQ is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_ERRORS=y
+CONFIG_DEBUG_LL=y
+# CONFIG_DEBUG_ICEDCC is not set
+
+#
+# Security options
+#
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
diff --git a/linux/nslu2-openslug-2.6.7/ipx4xx-pci.patch b/linux/nslu2-openslug-2.6.7/ipx4xx-pci.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/nslu2-openslug-2.6.7/ipx4xx-pci.patch
diff --git a/linux/nslu2-openslug_2.6.7.oe b/linux/nslu2-openslug_2.6.7.oe
index 7b2074b1bd..9da953f26f 100644
--- a/linux/nslu2-openslug_2.6.7.oe
+++ b/linux/nslu2-openslug_2.6.7.oe
@@ -6,6 +6,8 @@ PR = "r1"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.7.tar.bz2 \
 	   file://arm-Makefile.patch;patch=1 \
+	   file://ipx4xx-pci.patch;patch=1 \
+	   file://arm-timer.patch;patch=1 \
            file://defconfig"
 S = "${WORKDIR}/linux-2.6.7"
 
diff --git a/linux/nslu2-unslung-kernel-ext3flash_2.3r25.oe b/linux/nslu2-unslung-kernel-ext3flash_2.3r25.oe
index bf4cac3aad..29c0cd517a 100644
--- a/linux/nslu2-unslung-kernel-ext3flash_2.3r25.oe
+++ b/linux/nslu2-unslung-kernel-ext3flash_2.3r25.oe
@@ -1,4 +1,7 @@
 SECTION = "kernel"
+
+KERNEL_SUFFIX = "unslung-ext3flash"
+
 include nslu2-linksys_2.4.22.oe
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/nslu2-unslung-kernel-${PV}', '${FILE_DIRNAME}/nslu2-linksys-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
diff --git a/linux/nslu2-unslung-kernel-standard_2.3r25.oe b/linux/nslu2-unslung-kernel-standard_2.3r25.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/nslu2-unslung-kernel-standard_2.3r25.oe
diff --git a/linux/nslu2-unslung-kernel-vfatdisk2_2.3r25.oe b/linux/nslu2-unslung-kernel-vfatdisk2_2.3r25.oe
index 2b11c5b473..0845690885 100644
--- a/linux/nslu2-unslung-kernel-vfatdisk2_2.3r25.oe
+++ b/linux/nslu2-unslung-kernel-vfatdisk2_2.3r25.oe
@@ -1,4 +1,7 @@
 SECTION = "kernel"
+
+KERNEL_SUFFIX = "unslung-vfatdisk2"
+
 include nslu2-linksys_2.4.22.oe
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/nslu2-unslung-kernel-${PV}', '${FILE_DIRNAME}/nslu2-linksys-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
diff --git a/linux/nslu2-unslung-kernel_2.3r25.oe b/linux/nslu2-unslung-kernel_2.3r25.oe
deleted file mode 100644
index 2f591b9269..0000000000
--- a/linux/nslu2-unslung-kernel_2.3r25.oe
+++ /dev/null
@@ -1,7 +0,0 @@
-SECTION = "kernel"
-include nslu2-linksys_2.4.22.oe
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/nslu2-unslung-kernel-${PV}', '${FILE_DIRNAME}/nslu2-linksys-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-SRC_URI += " file://unslung-kernel.patch;patch=1"
-CMDLINE_ROOT = "root=/dev/slug initrd=0x01000000,10M mem=32M@0x00000000"
diff --git a/meta/nslu2-image.oe b/meta/nslu2-image.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/nslu2-image.oe
diff --git a/meta/unslung-ext3flash-image.oe b/meta/unslung-ext3flash-image.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/unslung-ext3flash-image.oe
diff --git a/meta/unslung-image-base.oe b/meta/unslung-image-base.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/unslung-image-base.oe
diff --git a/meta/unslung-image.oe b/meta/unslung-image.oe
index e69de29bb2..dc51ef35e6 100644
--- a/meta/unslung-image.oe
+++ b/meta/unslung-image.oe
@@ -0,0 +1 @@
+DEPENDS = "unslung-standard-image unslung-ext3flash-image unslung-vfatdisk2-image"
diff --git a/meta/unslung-standard-image.oe b/meta/unslung-standard-image.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/unslung-standard-image.oe
diff --git a/meta/unslung-vfatdisk2-image.oe b/meta/unslung-vfatdisk2-image.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/unslung-vfatdisk2-image.oe
diff --git a/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r25.oe b/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r25.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r25.oe
diff --git a/nslu2-binary-only/nslu2-unslung-ramdisk/ipkg.conf b/nslu2-binary-only/nslu2-unslung-ramdisk/ipkg.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/nslu2-binary-only/nslu2-unslung-ramdisk/ipkg.conf
diff --git a/nslu2-binary-only/nslu2-unslung-ramdisk_2.3r25.oe b/nslu2-binary-only/nslu2-unslung-ramdisk_2.3r25.oe
index 13b98e49c2..68cebf19a1 100644
--- a/nslu2-binary-only/nslu2-unslung-ramdisk_2.3r25.oe
+++ b/nslu2-binary-only/nslu2-unslung-ramdisk_2.3r25.oe
@@ -1,22 +1,23 @@
 SECTION = "base"
-DEPENDS = "nslu2-firmware-binary e2tools-native"
-PACKAGES = ""
-INHIBIT_DEFAULT_DEPS = "1"
-PR = "r1"
 
-UNSLUNG_VERSION = 1.11-beta
-SUFFIX = 
+PR = "r5"
 
-SRC_URI = "file://linuxrc \
+UNSLUNG_VERSION = 2.3-alpha
+UNSLUNG_SUFFIX = 
+
+SRC_URI = "http://www.nslu2-linux.org/nslu2-linksys-ramdisk-2.3r25.tar.bz2 \
+	   file://linuxrc \
 	   file://rc.unslung \
 	   file://unsling \
-	   file://unslung.patch"
-S = "${WORKDIR}"
+	   file://unslung.patch \
+	   file://ipkg.conf"
+S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r25"
 
+ROOT_NEW_DIRS = "/opt"
 ROOT_NEW_FILES = ".unslung linuxrc"
 SBIN_NEW_FILES = "unsling"
 ETC_PATCHED_FILES = "passwd rc"
-ETC_NEW_FILES = "profile"
+ETC_NEW_FILES = "profile ipkg.conf"
 RC_PATCHED_FILES = "rc.1 rc.crond rc.halt rc.local rc.modules \
 		    rc.network rc.quickset rc.quota rc.reboot \
 		    rc.reset_usrgrpshare rc.rstimezone rc.samba \
@@ -24,58 +25,19 @@ RC_PATCHED_FILES = "rc.1 rc.crond rc.halt rc.local rc.modules \
 RC_NEW_FILES = "rc.unslung"
 HTML_PATCHED_FILES = "home.htm"
 LOCAL_PATCHED_FILES = "passwd"
-ROOT_NEW_DIRS = "opt"
 
 do_compile () {
-	rm -f ${STAGING_LIBDIR}/nslu2-binaries/ramdisk-unslung.gz
-	cp ${STAGING_LIBDIR}/nslu2-binaries/ramdisk.gz .
-	gunzip -f ramdisk.gz
-	rm -rf sources
-	mkdir sources
-	cp linuxrc sources/linuxrc
-	mkdir sources/sbin
-	cp unsling sources/sbin/unsling
-	mkdir -p sources/etc
-	for f in ${ETC_PATCHED_FILES}; do
-		e2cp -v ramdisk:/etc/$f sources/etc/$f || die "failed to copy $f"
-	done
-	mkdir -p sources/etc/rc.d
-	cp rc.unslung sources/etc/rc.d/rc.unslung
-	for f in ${RC_PATCHED_FILES}; do
-		e2cp -v ramdisk:/etc/rc.d/$f sources/etc/rc.d/$f || die "failed to copy $f"
-	done
-	mkdir -p sources/home/httpd/html
-	for f in ${HTML_PATCHED_FILES}; do
-		e2cp -v ramdisk:/home/httpd/html/$f sources/home/httpd/html/$f || die "failed to copy $f"
-	done
-	mkdir -p sources/usr/local
-	for f in ${LOCAL_PATCHED_FILES}; do
-		e2cp -v ramdisk:/usr/local/$f sources/usr/local/$f || die "failed to copy $f"
-	done
-	sed -e s/X.Y/${UNSLUNG_VERSION}${SUFFIX}/ unslung.patch | patch -d sources -p3
-	sed -i -e s/@version#/@version#-uNSLUng-${UNSLUNG_VERSION}${SUFFIX}/ sources/home/httpd/html/home.htm
-	for f in ${ROOT_NEW_DIRS}; do
-		e2mkdir -v -O 0 -G 0 -P 755 ramdisk:/$f || die "failed to create $f"
-	done
-	for f in ${ROOT_NEW_FILES}; do
-		e2cp -v -O 0 -G 0 -P 755 sources/$f ramdisk:/$f || die "failed to copy $f"
-	done
-	for f in ${SBIN_NEW_FILES}; do
-		e2cp -v -O 0 -G 0 -P 755 sources/sbin/$f ramdisk:/sbin/$f || die "failed to copy $f"
-	done
-	for f in ${ETC_PATCHED_FILES} ${ETC_NEW_FILES}; do
-		e2cp -v -O 0 -G 0 -P 755 sources/etc/$f ramdisk:/etc/$f || die "failed to copy $f"
-	done
-	for f in ${RC_PATCHED_FILES} ${RC_NEW_FILES}; do
-		e2cp -v -O 0 -G 0 -P 755 sources/etc/rc.d/$f ramdisk:/etc/rc.d/$f || die "failed to copy $f"
-	done
-	for f in ${HTML_PATCHED_FILES}; do
-		e2cp -v -O 0 -G 0 -P 644 sources/home/httpd/html/$f ramdisk:/home/httpd/html/$f || die "failed to copy $f"
-	done
-	for f in ${LOCAL_PATCHED_FILES}; do
-		e2cp -v -O 0 -G 0 -P 644 sources/usr/local/$f ramdisk:/usr/local/$f || die "failed to copy $f"
-	done
-	rm -rf sources
-	gzip -f ramdisk
-	cp ramdisk.gz ${STAGING_LIBDIR}/nslu2-binaries/ramdisk-unslung.gz
+	cp ${WORKDIR}/linuxrc ${S}/linuxrc
+	cp ${WORKDIR}/unsling ${S}/sbin/unsling
+	cp ${WORKDIR}/ipkg.conf ${S}/etc/ipkg.conf
+	cp ${WORKDIR}/rc.unslung ${S}/etc/rc.d/rc.unslung
+	sed -e s/X.Y/${UNSLUNG_VERSION}${UNSLUNG_SUFFIX}/ ${WORKDIR}/unslung.patch | patch -d ${S} -p3
+	sed -i -e s/@version#/@version#-uNSLUng-${UNSLUNG_VERSION}${UNSLUNG_SUFFIX}/ ${S}/home/httpd/html/home.htm
+}
+
+do_install () {
+	( cd ${S} ; tar cvf - . ) | ( cd ${D} ; tar xvf - )
 }
+
+PACKAGES = "${PN}"
+FILES_${PN} = "/"
diff --git a/wget/wget-1.9.1/m4macros.patch b/wget/wget-1.9.1/m4macros.patch
index e69de29bb2..7b25d213b9 100644
--- a/wget/wget-1.9.1/m4macros.patch
+++ b/wget/wget-1.9.1/m4macros.patch
@@ -0,0 +1,214 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- wget-1.9.1/aclocal.m4~m4macros.patch
++++ wget-1.9.1/aclocal.m4
+@@ -2,6 +2,7 @@
+ dnl Check for `struct utimbuf'.
+ dnl
+ 
++AH_TEMPLATE([HAVE_STRUCT_UTIMBUF], [Define if we have struct utimbuf])
+ AC_DEFUN([WGET_STRUCT_UTIMBUF],
+ [AC_MSG_CHECKING([for struct utimbuf])
+ if test x"$ac_cv_header_utime_h" = xyes; then
+@@ -21,6 +22,7 @@
+ dnl it.  If socklen_t exists, we use it, else if accept() accepts
+ dnl size_t *, we use that, else we use int.
+ 
++AH_TEMPLATE([socklen_t], [Set to the appropriate type to use for socklen_t])
+ AC_DEFUN([WGET_SOCKLEN_T], [
+   AC_MSG_CHECKING(for socklen_t)
+   AC_TRY_COMPILE([
+@@ -50,6 +52,7 @@
+ dnl even on those because Apache installs its own fnmatch.h to
+ dnl /usr/local/include (!), which GCC uses before /usr/include.
+ 
++AH_TEMPLATE([HAVE_WORKING_FNMATCH_H], [Define if we have a working fnmatch.h])
+ AC_DEFUN([WGET_FNMATCH], [
+   AC_MSG_CHECKING([for working fnmatch.h])
+   AC_COMPILE_IFELSE([#include <fnmatch.h>
+@@ -61,87 +64,6 @@
+   ])
+ ])
+ 
+-dnl
+-dnl ansi2knr support: check whether C prototypes are available.
+-dnl
+-
+-AC_DEFUN(AM_C_PROTOTYPES,
+-[AC_REQUIRE([AM_PROG_CC_STDC])
+-AC_BEFORE([$0], [AC_C_INLINE])
+-AC_MSG_CHECKING([for function prototypes])
+-if test "$am_cv_prog_cc_stdc" != no; then
+-  AC_MSG_RESULT(yes)
+-  AC_DEFINE(PROTOTYPES)
+-  U= ANSI2KNR=
+-else
+-  AC_MSG_RESULT(no)
+-  U=_ ANSI2KNR=./ansi2knr
+-  # Ensure some checks needed by ansi2knr itself.
+-  AC_HEADER_STDC
+-  AC_CHECK_HEADERS(string.h)
+-fi
+-AC_SUBST(U)dnl
+-AC_SUBST(ANSI2KNR)dnl
+-])
+-
+-
+-# serial 1
+-
+-# @defmac AC_PROG_CC_STDC
+-# @maindex PROG_CC_STDC
+-# @ovindex CC
+-# If the C compiler in not in ANSI C mode by default, try to add an option
+-# to output variable @code{CC} to make it so.  This macro tries various
+-# options that select ANSI C on some system or another.  It considers the
+-# compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and
+-# handles function prototypes correctly.
+-#
+-# If you use this macro, you should check after calling it whether the C
+-# compiler has been set to accept ANSI C; if not, the shell variable
+-# @code{am_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
+-# code in ANSI C, you can make an un-ANSIfied copy of it by using the
+-# program @code{ansi2knr}, which comes with Ghostscript.
+-# @end defmac
+-
+-AC_DEFUN(AM_PROG_CC_STDC,
+-[AC_REQUIRE([AC_PROG_CC])
+-AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C])
+-AC_CACHE_VAL(am_cv_prog_cc_stdc,
+-[am_cv_prog_cc_stdc=no
+-ac_save_CC="$CC"
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX			-qlanglvl=ansi
+-# Ultrix and OSF/1	-std1
+-# HP-UX			-Aa -D_HPUX_SOURCE
+-for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE"
+-do
+-  CC="$ac_save_CC $ac_arg"
+-  AC_TRY_COMPILE(
+-[#if !defined(__STDC__)
+-choke me
+-#endif
+-/* DYNIX/ptx V4.1.3 can't compile sys/stat.h with -Xc -D__EXTENSIONS__. */
+-#ifdef _SEQUENT_
+-# include <sys/types.h>
+-# include <sys/stat.h>
+-#endif
+-], [
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};],
+-[am_cv_prog_cc_stdc="$ac_arg"; break])
+-done
+-CC="$ac_save_CC"
+-])
+-AC_MSG_RESULT($am_cv_prog_cc_stdc)
+-case "x$am_cv_prog_cc_stdc" in
+-  x|xno) ;;
+-  *) CC="$CC $am_cv_prog_cc_stdc" ;;
+-esac
+-])
+-
+-
+ dnl ************************************************************
+ dnl START OF IPv6 AUTOCONFIGURATION SUPPORT MACROS
+ dnl ************************************************************
+@@ -294,7 +216,8 @@
+ 
+ # This code originates from Ulrich Drepper's AM_WITH_NLS.
+ 
+-AC_DEFUN(WGET_WITH_NLS,
++AH_TEMPLATE([HAVE_NLS], [Define to enable Native Language Support])
++AC_DEFUN([WGET_WITH_NLS],
+   [AC_MSG_CHECKING([whether NLS is requested])
+     dnl Default is enabled NLS
+     AC_ARG_ENABLE(nls,
+@@ -308,12 +231,12 @@
+ 
+     if test x"$HAVE_NLS" = xyes; then
+       AC_MSG_RESULT([language catalogs: $ALL_LINGUAS])
+-      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+-	[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
+-      AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+-      AC_SUBST(MSGFMT)
+-      AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
++#      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
++#	[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
++#      AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
++#	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
++#      AC_SUBST(MSGFMT)
++#      AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+       CATOBJEXT=.gmo
+       INSTOBJEXT=.mo
+       DATADIRNAME=share
+@@ -387,7 +310,7 @@
+ dnl This is not strictly an Autoconf macro, because it is run from
+ dnl within `config.status' rather than from within configure.  This
+ dnl is why special rules must be applied for it.
+-AC_DEFUN(WGET_PROCESS_PO,
++AC_DEFUN([WGET_PROCESS_PO],
+   [
+    dnl I wonder what the following several lines do...
+    if test "x$srcdir" != "x."; then
+@@ -409,56 +332,3 @@
+    echo "creating po/Makefile"
+    sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+   ])
+-
+-# Search path for a program which passes the given test.
+-# Ulrich Drepper <drepper@cygnus.com>, 1996.
+-#
+-# This file may be copied and used freely without restrictions.  It
+-# can be used in projects which are not available under the GNU Public
+-# License but which still want to provide support for the GNU gettext
+-# functionality.  Please note that the actual code is *not* freely
+-# available.
+-
+-# serial 1
+-
+-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+-AC_DEFUN(AM_PATH_PROG_WITH_TEST,
+-[# Extract the first word of "$2", so it can be a program name with args.
+-set dummy $2; ac_word=[$]2
+-AC_MSG_CHECKING([for $ac_word])
+-AC_CACHE_VAL(ac_cv_path_$1,
+-[case "[$]$1" in
+-  /*)
+-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      if [$3]; then
+-	ac_cv_path_$1="$ac_dir/$ac_word"
+-	break
+-      fi
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-dnl If no 4th arg is given, leave the cache variable unset,
+-dnl so AC_PATH_PROGS will keep looking.
+-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+-])dnl
+-  ;;
+-esac])dnl
+-$1="$ac_cv_path_$1"
+-if test -n "[$]$1"; then
+-  AC_MSG_RESULT([$]$1)
+-else
+-  AC_MSG_RESULT(no)
+-fi
+-AC_SUBST($1)dnl
+-])
+-
+-# Include libtool code.
+-
+-builtin(include, libtool.m4)dnl