Merge nslu2-linux@nslu2-linux.bkbits.net:packages

into hyperion.kergoth.com:/home/kergoth/code/packages 2004/11/19 13:40:41-08:00 bkbits.net!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages-devel into bkbits.net:/repos/n/nslu2-linux/packages 2004/11/20 00:53:51+10:30 (none)!rwhitby Removed booting from external disks from switchbox (still exists in unslung ramdisk image). Updated ext3flash functionality for jffs2 support. Removed errant symlink in OE repo. Updated unslung and openslug to use switchbox version 3.3 (which no longer has the 10 second delay). 2004/11/19 05:03:18-08:00 (none)!jacques Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages into home.(none):/home/packages/oe/nslu2/packages 2004/11/19 04:59:56-08:00 (none)!jacques removed dependency of openslug-image on task-bootstrap 2004/11/19 00:35:32-08:00 bkbits.net!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages-devel into bkbits.net:/repos/n/nslu2-linux/packages 2004/11/18 22:52:46+10:30 (none)!rwhitby Forgot to add ixp4xx-csr and ixp425-eth to DEPENDS too. 2004/11/18 22:47:43+10:30 (none)!rwhitby Third try at adding ixp4xx-csr and ixp425-eth to openslug. 2004/11/18 22:42:02+10:30 (none)!rwhitby ixp4xx-csr. 2004/11/18 22:37:35+10:30 (none)!rwhitby Added ixp4xx-csr and ixp425-eth to openslug. 2004/11/18 21:42:02+10:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages into home.(none):/home/openembedded/packages 2004/11/18 21:41:25+10:30 (none)!rwhitby Added the build timing annoyance patch to ixp4xx-csr. 2004/11/17 23:44:00-08:00 (none)!jacques removed hdparm because it does not build 2004/11/17 23:11:47-08:00 (none)!jacques updated openslug-specific busybox defconfig 2004/11/17 22:08:07-08:00 (none)!jacques fixed bugs in ixp4xx-csr and ixp425-eth builds 2004/11/17 21:37:36-08:00 (none)!jacques added openslug-specific busybox defconfig 2004/11/17 19:02:44-08:00 (none)!jacques turned down jffs2 logging level (to 0) 2004/11/17 18:17:26-08:00 (none)!jacques don't attempt to install ext2.gz ramdisk if NSLU2_BUILD_RAMDISK_FIRMWARE is not true 2004/11/18 10:56:25+10:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages into home.(none):/home/openembedded/packages 2004/11/18 10:55:51+10:30 (none)!rwhitby Obsoleted openslug ramdisk image in favour of a flashdisk image. 2004/11/17 15:25:04-08:00 (none)!jacques added -f to cp in do_stage to overwrite read-only files on subsequent builds 2004/11/18 08:22:26+10:30 (none)!rwhitby Changed openslug kernel root device back to /dev/ram0 until we work out how to switch it the right way for the flashdisk firmware. BKrev: 419e6ef6Cp7JjJfWEZ29tcJDuVKyMw
author: Chris Larson <clarson@kergoth.com> 2004-11-19 22:08:54 +0000
committer: Chris Larson <clarson@kergoth.com> 2004-11-19 22:08:54 +0000
commit: 59fd4d418a6c940c5eab9e3a6b47ed4566312116 (patch)
tree: c9ced18f0b6b857b41d8eb4ed2b7c738138576ee
parent: 44b173fc64ac7e67ab17cb727f0a4de0e02f7e78 (diff)
16 files changed, 1721 insertions, 52 deletions
diff --git a/busybox/busybox-1.00/openslug/defconfig b/busybox/busybox-1.00/openslug/defconfig
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/busybox/busybox-1.00/openslug/defconfig
diff --git a/busybox/switchbox-1.00/linuxrc b/busybox/switchbox-1.00/linuxrc
index 70ad6855b6..858bac7258 100644
--- a/busybox/switchbox-1.00/linuxrc
+++ b/busybox/switchbox-1.00/linuxrc
@@ -5,36 +5,6 @@ mounted=
 /bin/mount -t proc proc /proc
 /bin/echo "0x0100" > /proc/sys/kernel/real-root-dev
 
-/bin/sleep 10
-
-if [ -z "$mounted" ] && /bin/mount -rt ext3 /dev/sda2 /mnt/tmpmnt ; then
-
-    if  [ -x /mnt/tmpmnt/bin/init ] &&
-	[ -d /mnt/tmpmnt/unslung ] && [ -r /mnt/tmpmnt/.unslung ] ; then
-	/bin/echo "Root filesystem will be mounted from /dev/sda2 ..."
-	/bin/echo "Firmware Version: `/bin/cat /mnt/tmpmnt/.unslung`"
-	mounted=/mnt/tmpmnt
-	/bin/echo "0x0802" > /proc/sys/kernel/real-root-dev
-	[ -r $mounted/unslung/rc.linuxrc ] && . $mounted/unslung/rc.linuxrc
-    fi
-
-    /bin/umount /mnt/tmpmnt
-fi
-
-if [ -z "$mounted" ] && /bin/mount -rt ext3 /dev/sdb2 /mnt/tmpmnt ; then
-
-    if  [ -x /mnt/tmpmnt/bin/init ] &&
-	[ -d /mnt/tmpmnt/unslung ] && [ -r /mnt/tmpmnt/.unslung ] ; then
-	/bin/echo "Root filesystem will be mounted from /dev/sdb2 ..."
-	/bin/echo "Firmware Version: `/bin/cat /mnt/tmpmnt/.unslung`"
-	mounted=/mnt/tmpmnt
-	/bin/echo "0x0812" > /proc/sys/kernel/real-root-dev
-	[ -r $mounted/unslung/rc.linuxrc ] && . $mounted/unslung/rc.linuxrc
-    fi
-
-    /bin/umount /mnt/tmpmnt
-fi
-
 if [ -z "$mounted" ] && /bin/mount -rt jffs2 /dev/mtdblock4 /mnt/tmpmnt ; then
 
     if  [ -x /mnt/tmpmnt/sbin/init -o -x /mnt/tmpmnt/bin/init ] ; then
@@ -47,13 +17,11 @@ if [ -z "$mounted" ] && /bin/mount -rt jffs2 /dev/mtdblock4 /mnt/tmpmnt ; then
 fi
 
 if [ -z "$mounted" ] ; then
-    if  [ -x /mnt/tmpmnt/bin/init ] &&
-	[ -d /mnt/tmpmnt/unslung ] && [ -r /mnt/tmpmnt/.unslung ] ; then
+
+    if  [ -x /mnt/tmpmnt/sbin/init -o -x /mnt/tmpmnt/bin/init ] ; then
 	/bin/echo "Root filesystem will be mounted from /dev/ram0 ..."
-	/bin/echo "Firmware Version: `/bin/cat /.unslung`"
 	mounted=/mnt/tmpmnt
 	/bin/echo "0x0100" > /proc/sys/kernel/real-root-dev
-	[ -r $mounted/unslung/rc.linuxrc ] && . $mounted/unslung/rc.linuxrc
     fi
 fi
 
diff --git a/busybox/switchbox_1.00.oe b/busybox/switchbox_1.00.oe
index 2536e46eef..42b82d8a9d 100644
--- a/busybox/switchbox_1.00.oe
+++ b/busybox/switchbox_1.00.oe
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://defconfig \
diff --git a/classes/nslu2_flashimg.oeclass b/classes/nslu2_flashimg.oeclass
index 8bca7ebf64..b71531a7f8 100644
--- a/classes/nslu2_flashimg.oeclass
+++ b/classes/nslu2_flashimg.oeclass
@@ -6,10 +6,14 @@ nslu2_pack_image () {
 			${STAGING_LIBDIR}/nslu2-binaries/switchbox.ext2.gz \
 			${DEPLOY_DIR_IMAGE}/slug/
 	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.ext2.gz
+	if [ "${NSLU2_BUILD_RAMDISK_FIRMWARE}" == "1" ] ; then
+	  install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/slug/ramdisk.ext2.gz
+	fi
 	install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2
 	cd ${DEPLOY_DIR_IMAGE}/slug
-	slugimage -p -r Ramdisk:ramdisk.ext2.gz -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ramdisk.img
+	if [ "${NSLU2_BUILD_RAMDISK_FIRMWARE}" == "1" ] ; then
+	  slugimage -p -r Ramdisk:ramdisk.ext2.gz -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ramdisk.img
+	fi
 	slugimage -p -r Ramdisk:switchbox.ext2.gz,Flashdisk:flashdisk.jffs2 -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img
 	rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2
 	rm -rf ${DEPLOY_DIR_IMAGE}/slug
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 78a6975b66..f49eba243f 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -7,19 +7,28 @@ TARGET_OS = "linux-uclibc"
 
 INHERIT += " package_ipk debian nslu2_flashimg"
 
-IMAGE_FSTYPES = "ext2.gz jffs2"
+IMAGE_FSTYPES = "jffs2"
 
 OPENSLUG_DEVICE_TABLE = "${@oe.which(oe.data.getVar('OEPATH', d, 1), 'files/device_table-nslu2.txt')}"
-EXTRA_IMAGECMD_ext2.gz = "-f ${OPENSLUG_DEVICE_TABLE}"
 EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DEVICE_TABLE}"
 
-BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel module-init-tools"
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usbnet kernel-module-usbserial  \
+OPENSLUG_EXTRA_DEPENDS  += "virtual/kernel module-init-tools"
+OPENSLUG_EXTRA_RDEPENDS += "kernel-module-usbnet kernel-module-usbserial  \
 kernel-module-usbcore kernel-module-usb-storage  kernel-module-ohci-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"
 
+OPENSLUG_EXTRA_INSTALL += "kernel-module-usbnet kernel-module-usbserial  \
+kernel-module-usbcore kernel-module-usb-storage  kernel-module-ohci-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"
+
+BOOTSTRAP_EXTRA_DEPENDS  += "${OPENSLUG_EXTRA_DEPENDS}"
+BOOTSTRAP_EXTRA_RDEPENDS += "${OPENSLUG_EXTRA_RDEPENDS}"
+
 PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index b005eb398f..dc06b61c68 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -8,7 +8,7 @@ TARGET_OS = "linux"
 INHERIT += " package_ipk nslu2_flashimg"
 
 IMAGE_FSTYPES = "ext2.gz jffs2"
-
+NSLU2_BUILD_RAMDISK_FIRMWARE = 1
 UNSLUNG_DEVICE_TABLE = "${@oe.which(oe.data.getVar('OEPATH', d, 1), 'files/device_table-unslung.txt')}"
 EXTRA_IMAGECMD_ext2.gz = "-f ${UNSLUNG_DEVICE_TABLE}"
 EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${UNSLUNG_DEVICE_TABLE}"
diff --git a/ixp425-eth/ixp425-eth_1.1.oe b/ixp425-eth/ixp425-eth_1.1.oe
index 0342e86b13..9cf39daa87 100644
--- a/ixp425-eth/ixp425-eth_1.1.oe
+++ b/ixp425-eth/ixp425-eth_1.1.oe
@@ -24,7 +24,6 @@ do_ixp425_c_patch_unpack () {
 	install -m 0644 ${DL_DIR}/ixp425_eth.c.patch ${WORKDIR}/
 }
 
-#addtask ixp425_c_patch_unpack after do_unpack before do_patch
 addtask ixp425_c_patch_unpack after do_unpack before do_pre_patch
 
 do_pre_patch () {
@@ -44,5 +43,5 @@ do_compile () {
 
 do_install () {
 	install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net
-	install -m 0644 ixp425_eth.o ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/
+	install -m 0644 ixp425_eth.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/
 }
diff --git a/ixp4xx/ixp4xx-csr/build-timing-annoyance.patch b/ixp4xx/ixp4xx-csr/build-timing-annoyance.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/ixp4xx/ixp4xx-csr/build-timing-annoyance.patch
diff --git a/ixp4xx/ixp4xx-csr_1.4.oe b/ixp4xx/ixp4xx-csr_1.4.oe
index 4a9295e516..accb992520 100644
--- a/ixp4xx/ixp4xx-csr_1.4.oe
+++ b/ixp4xx/ixp4xx-csr_1.4.oe
@@ -4,7 +4,8 @@ LICENSE = "${PN}"
 LICENSE_HOMEPAGE = "http://www.intel.com/design/network/swsup/ixp400AccessLibrary-1_4.htm"
 SRC_URI = "http://www.intel.com/design/network/swsup/ixp400AccessLibrary-1_4.zip \
 	   http://www.wnk.at/ixp400_accesslib_kernel26/data/patch_accesslib_kernel26_20040811.diff;patch=1 \
-	   file://badpaths.patch;patch=1"
+	   file://badpaths.patch;patch=1 \
+	   file://build-timing-annoyance.patch;patch=1"
 S = "${WORKDIR}/ixp400_xscale_sw"
 PR = "r1"
 
@@ -14,6 +15,7 @@ inherit module
 
 #LINUX_MACH_CFLAGS := -D__LINUX_ARM_ARCH__=5 -mcpu=xscale -mtune=xscale
 CFLAGS = "-fno-common -D__KERNEL__ -DMODULE -D__linux -DCPU=33 -DXSCALE=33 \
+	  -D__LINUX_ARM_ARCH__=5 \
 	  -I${S}/src/linux -I${S}/src/include \
 	  ${BUILD_OPTIMIZATION} \
 	  -I${STAGING_KERNEL_DIR}/include"
@@ -34,7 +36,7 @@ do_compile () {
 do_stage () {
 	install -d ${STAGING_INCDIR}/linux/ixp4xx-csr
 	install -m 0644 src/include/*.h ${STAGING_INCDIR}/linux/ixp4xx-csr/
-	cp -r --dereference src/linux/* ${STAGING_INCDIR}/linux/ixp4xx-csr/
+	cp -rf --dereference src/linux/* ${STAGING_INCDIR}/linux/ixp4xx-csr/
 }
 
 do_install () {
diff --git a/linux/openslug-kernel-2.6.9/defconfig b/linux/openslug-kernel-2.6.9/defconfig
index e69de29bb2..8bbf20ebfb 100644
--- a/linux/openslug-kernel-2.6.9/defconfig
+++ b/linux/openslug-kernel-2.6.9/defconfig
@@ -0,0 +1,1098 @@
+#
+# 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
+CONFIG_ARCH_NSLU2=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_X1205=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=0
+# 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/meta/openslug-image.oe b/meta/openslug-image.oe
index 36cadd84a4..a11eca136a 100644
--- a/meta/openslug-image.oe
+++ b/meta/openslug-image.oe
@@ -1,10 +1,26 @@
+PR = "r1"
+
 IMAGE_BASENAME = "openslug"
 
 IMAGE_LINGUAS = ""
 USE_DEVFS = "1"
 
-IPKG_INSTALL = "task-bootstrap"
+OPENSLUG_HIDDEN_PACKAGES = "ipkg-native ipkg-utils-native fakeroot-native patcher-native virtual/armeb-linux-uclibc-gcc \
+	virtual/libc makedevs-native mtd-native slugimage-native nslu2-linksys-firmware nslu2-switchbox-firmware "
+
+DEPENDS = "base-files base-passwd-3.5.7 \
+        busybox dropbear hotplug initscripts modutils netbase \
+        sysvinit tinylogin lrzsz portmap \
+        modutils-initscripts ixp4xx-csr ixp425-eth \
+        ipkg-collateral ipkg ipkg-link \
+        ${OPENSLUG_EXTRA_DEPENDS}"
 
-DEPENDS = "task-bootstrap"
+IPKG_INSTALL = "base-files base-passwd \
+        busybox dropbear hotplug initscripts netbase \
+	modutils-depmod modutils-modinfo modutils-initscripts \
+        update-modules sysvinit tinylogin lrzsz portmap \
+        ixp4xx-csr ixp425-eth \
+        ipkg-collateral ipkg ipkg-link \
+        ${OPENSLUG_EXTRA_INSTALL}"
 
 inherit image_ipk
diff --git a/nslu2-binary-only/nslu2-switchbox-firmware.oe b/nslu2-binary-only/nslu2-switchbox-firmware.oe
index 298189ecdb..39f3a0a4b1 100644
--- a/nslu2-binary-only/nslu2-switchbox-firmware.oe
+++ b/nslu2-binary-only/nslu2-switchbox-firmware.oe
@@ -2,9 +2,9 @@ SECTION = "base"
 DEPENDS = ""
 PACKAGES = ""
 INHIBIT_DEFAULT_DEPS = "1"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "http://www.nslu2-linux.org/downloads/switchbox-3.2.tar.gz"
+SRC_URI = "http://www.nslu2-linux.org/downloads/switchbox-3.3.tar.gz"
 S = "${WORKDIR}"
 
 do_compile () {
diff --git a/nslu2-binary-only/unslung-ramdisk-2.3r25/README b/nslu2-binary-only/unslung-ramdisk-2.3r25/README
index e69de29bb2..9ed4211cf4 100644
--- a/nslu2-binary-only/unslung-ramdisk-2.3r25/README
+++ b/nslu2-binary-only/unslung-ramdisk-2.3r25/README
@@ -0,0 +1,249 @@
+UNSLUNG-2.x family release README
+
+Unslung is a replacement firmware image for the NSLU2 which is designed
+to allow you to mount the root filesystem from an external disk,
+without changing the standard product functionality.
+
+This is intended to be a way of distributing and loading new packages
+for the NSLU2, with minimal changes to the standard user interface and
+firmware.
+
+The changes in the UNSLUNG 2.x firmware from the standard Linksys
+2.3R25 can be found at:
+
+	http://www.nslu2-linux.org/wiki/Unslung/UnslungStandard
+
+For more information about the Unslung firmware, including details on
+how to build it from source code yourself, look at:
+
+	http://www.nslu2-linux.org/wiki/Unslung
+
+PRE-INSTALLATION CONSIDERATIONS
+
+1)  It is strongly recommended that you test telnet Redboot access first.
+    See http://www.nslu2-linux.org/wiki/HowTo/TelnetIntoRedBoot
+2)  It is strongly recommended you select a 'virgin' disk for unslinging;
+    that is a disk that empty; or that can be reformatted.  It is
+    absolutely required that the disk is (or has previously been)
+    formatted by the NSLU2.  It is possible to upgrade from Unslung 1.x
+    to Unslung 2.x without reformatting your disk.  The unsling script
+    will not touch anything in /unslung or /opt, so make sure all your
+    file modifications are in those directories, as you were warned
+    in the README for Unslung 1.x :-)
+ 
+INSTALLATION DETAILS
+
+1) Make sure your NSLU2 is working properly.
+2) Flash unslung-standard-2.x.img as you normally would flash new firmware.
+3) Verify your NSLU2 is working normally at this point.
+4) Make sure that you do *not* have a disk plugged in when you reboot to
+   perform the next part of the installation.
+
+'UNSLINGING' DETAILS
+
+0) Note that this only has to be done when you update the firmware.
+   Also note that you should not have a disk plugged in at this stage.
+1) Enable telnet by going to http://192.168.1.77/Management/telnet.cgi, 
+   and press the enable button.
+2) Telnet into the NSLU2 using the username root and password uNSLUng.
+3) Identify which drive you wish you "unsling", and plug it in.
+   Wait a minute or two while the disk is mounted.  If the disk has not
+   been previously formatted on the NSLU2, then now is the time to do
+   that.  Make sure that the drive is recognised in the web interface.
+4) In the telnet session, run "/sbin/unsling" and watch the ramdisk files
+   be copied to your disk. The files from the ramdisk will be copied to
+   the "conf" partition, not the "data" partition.
+5) Note that unsling will not change the password on your disk, so if
+   you had previously changed the password on a disk, then your password
+   will not be changed.
+6) Reboot.
+
+Congratulations, you're now Unslung!  You should have an extra 10M of free
+memory to use for other things.
+
+Make sure you add an entry to the "The Unslung 2.x" table in the Yahoo
+group.  Just use the next free integer for your Unslung number.
+
+If you make no further changes, your NSLU2 will continue to operate
+normally.  But to customize things, you'll be downloading packages and
+adding stuff to the /unslung directory on the new hard drive root
+using diversion scripts.
+
+POST-INSTALLATION DETAILS
+
+Diversion scripts go into /unslung.  You can divert as many or as few 
+scripts as you like.  Simply add the name of the standard rc script 
+into /unslung and it will be run.
+
+For example, I have a script /unslung/rc.local:
+
+#! /bin/sh
+/opt/bin/do_foo
+return 1
+
+That will run at the beginning of the normal /etc/rc.d/rc.local, and then 
+the rest of the factory rc.local will be executed.  If I do NOT want to run
+the factory rc.local, my script would be
+
+#!/bin/sh
+/opt/bin/do_foo
+return 0
+
+That is, if the diversion script returns with something other than 0, it will
+run the rest of the factory script.  
+
+Note that any variable definitions or function declarations are allowed to
+happen before the diversion script is called.  This allows you to use the
+variables and functions defined by the factory script.
+
+PACKAGE INSTALLATION 
+
+1)  Run "ipkg update" on the NSLU2.
+2)  Run "ipkg list" to see the available packages.
+3)  Run "ipkg install <package-name>" to install them.
+4)  Note that if you upgrade an existing 1.11-beta disk, all your
+    downloaded packages will still be on your hard disk and should work as
+    before, but the ipkg system will probably have forgotten what you have
+    downloaded.  You can re-install any you need to by typing
+    "ipk install -force-overwrite <package>".
+
+ADDITIONAL INFORMATION:
+
+1)  If you wish to see the contents of the ramdisk, temporarily make a 
+    directory called /initrd in your new hard drive /, then the ramdisk 
+    will not be dismounted.  You will not see a RAM benefit if you do this,
+    so use with caution.  After you're done looking at the contents of the
+    ramdisk, unmount it and remove the initrd directory for RAM savings on 
+    the next reboot.
+
+2)  The linuxrc is written in such a way that if a known good unslung disk
+    is NOT attached, it will revert to failsafe booting from ramdisk.
+
+3)  There is a version check mechanism which tags your unslung hard disk
+    at a certain firmware version (including the unslung version) and
+    will not boot from it if the versions do not match.  When you flash a
+    new version of unslung, then you must re-run unsling to update the
+    root disk (and that's when you check your diversion scripts to make
+    sure they are still compatible with the new firmware version).
+
+4)  The unsling script will never touch any files under /unslung or /opt,
+    so please store all your additional files there.  However, any existing
+    files that you modify in any other of the standard directories will
+    be overwritten when you next update the firmware and unsling the disk.
+    If you need to modify a file in /etc for example, then write a
+    diversion script which does it on each boot (perhaps by symlinking
+    it to a file in /opt/etc which will not be touched by unsling).
+
+5)  The diversion of startup scripts is done at the lowest granularity,
+    so you can, for instance, just divert the rc.xinetd script if you
+    want, and leave all the others unchanged.
+
+6)  The diversion mechanism allows you to add to, or replace, the Linksys
+    script functionality.
+
+7)  The /sbin/unsling script can take a new version of the Linksys
+    ramdisk, and update your unslung hard disk root filesystem from
+    that.  This makes sure that unslung can take advantage of any new
+    Linksys features.  As noted in item #4, if you have modified any
+    of the files from the Linksys ramdisk, then they will be overwritten.
+    Keep your modifications in /unslung and /opt and they will be safe.
+
+8)  Note that telnet is not enabled by default - there is an openssh
+    package available to replace telnet access with secure shell
+    access.  The rationale behind not enabling it by default is to
+    ensure that an unslung NSLU2 without a hard disk attached has the
+    same network footprint as the standard firmware.
+
+9)  This simple diversion script will enable telnet on boot
+   
+    # /unslung/rc.xinetd 
+    #! /bin/sh
+    echo "telnet  stream  tcp     nowait  root    /usr/sbin/telnetd" > /etc/inetd.conf
+    # Additional lines must append (using >>), ie:
+    # echo "ftp   stream  tcp     nowait  root    /usr/sbin/ftpd -a=passwd" >> /etc/inetd.conf
+    return 1
+
+10) Note that the PATH is set so that downloadable packages do not
+    override the factory executables.  This is so that a package
+    can't break the standard functionality.  You can use a diversion
+    script or a .profile in the /root directory to change the PATH
+    if you would prefer to take the chance and get a different
+    behaviour.
+
+11) The Unslung firmware will automatically execute any scripts
+    which are in /opt/etc/init.d - and this is where any packages
+    put their startup scripts so that they execute on each boot.
+
+CHANGELOG:
+
+1.11:
+
+First public release
+
+1.12:
+
+Added a symlink to slingbox for gzip.  Added flashfs (as simple utility for preserving
+user files across hard disk formats during beta testing).
+
+1.13:
+
+Added LD_LIBRARY_PATH to /etc/profile (only works for telnet and ssh
+access, not for serial or diversion scripts).
+
+1.14:
+
+Added Unslung Doc link to the User Guide page.
+
+2.3:
+
+Moved development to OpenEmbedded.
+
+2.4:
+
+Updated to the latest ipk binary instead of the simple script.
+
+2.5:
+
+Added the real wget (instead of using the busybox version).  This is
+so we can support .netrc files for commercial packages.
+
+2.6:
+
+Fixed the unsling script so it removes conflicting files on an upgrade.
+
+2.7:
+
+Began development of the -able variant.
+
+2.8:
+
+Added the patch for genesys enclosures.
+
+2.9:
+
+Reorganised the various variants into a more consistent scheme.
+
+2.10:
+
+Added the ext3flash-on-disk1 functionality.
+
+2.11:
+
+Added the README to /opt/doc.
+
+2.12:
+
+First public release of 2.x firmware.
+
+3.1:
+
+Added jffs2 functionality.
+
+3.2:
+
+Incorporated switchbox functionality.
+
+3.3:
+
+Added ramdisks for /dev and /var to reduce internal flash writes.
+
diff --git a/nslu2-binary-only/unslung-ramdisk-2.3r25/linuxrc b/nslu2-binary-only/unslung-ramdisk-2.3r25/linuxrc
new file mode 100644
index 0000000000..7e7e477e04
--- /dev/null
+++ b/nslu2-binary-only/unslung-ramdisk-2.3r25/linuxrc
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+/bin/echo "Firmware Version: `/bin/cat /.unslung`"
+
+mounted=
+
+/bin/mount -t proc proc /proc
+/bin/echo "0x0100" > /proc/sys/kernel/real-root-dev
+
+/bin/sleep 10
+
+if [ -z "$mounted" ] && /bin/mount -rt ext3 /dev/sda2 /mnt/tmpmnt ; then
+
+    if  [ -x /mnt/tmpmnt/bin/init ] &&
+	[ -d /mnt/tmpmnt/unslung ] && [ -r /mnt/tmpmnt/.unslung ] &&
+	[ "`/bin/cat /.unslung`" = "`/bin/cat /mnt/tmpmnt/.unslung`" ] ; then
+	/bin/echo "Root filesystem will be mounted from /dev/sda2 ..."
+	mounted=/mnt/tmpmnt
+	/bin/echo "0x0802" > /proc/sys/kernel/real-root-dev
+	[ -r $mounted/unslung/rc.linuxrc ] && . $mounted/unslung/rc.linuxrc
+    fi
+
+    /bin/umount /mnt/tmpmnt
+fi
+
+if [ -z "$mounted" ] && /bin/mount -rt ext3 /dev/sdb2 /mnt/tmpmnt ; then
+
+    if  [ -x /mnt/tmpmnt/bin/init ] &&
+	[ -d /mnt/tmpmnt/unslung ] && [ -r /mnt/tmpmnt/.unslung ] &&
+	[ "`/bin/cat /.unslung`" = "`/bin/cat /mnt/tmpmnt/.unslung`" ] ; then
+	/bin/echo "Root filesystem will be mounted from /dev/sdb2 ..."
+	mounted=/mnt/tmpmnt
+	/bin/echo "0x0812" > /proc/sys/kernel/real-root-dev
+	[ -r $mounted/unslung/rc.linuxrc ] && . $mounted/unslung/rc.linuxrc
+    fi
+
+    /bin/umount /mnt/tmpmnt
+fi
+
+if [ -z "$mounted" ] ; then
+    /bin/echo "Root filesystem will be mounted from /dev/ram0 ..."
+fi
+
+/bin/umount /proc
+
+exit 0
diff --git a/nslu2-binary-only/unslung-ramdisk-2.3r25/unslung.patch b/nslu2-binary-only/unslung-ramdisk-2.3r25/unslung.patch
index e69de29bb2..2dedb1ac46 100644
--- a/nslu2-binary-only/unslung-ramdisk-2.3r25/unslung.patch
+++ b/nslu2-binary-only/unslung-ramdisk-2.3r25/unslung.patch
@@ -0,0 +1,278 @@
+diff -BurN /dev/null/nslu/.unslung /mnt/nslu/.unslung
+--- /dev/null/nslu/.unslung	1970-01-01 09:30:00.000000000 +0930
++++ /mnt/nslu/.unslung	2004-08-30 21:46:35.000000000 +0930
+@@ -0,0 +1 @@
++V2.3R25-uNSLUng-X.Y
+\ No newline at end of file
+diff -BurN /dev/null/nslu/etc/passwd /mnt/nslu/etc/passwd
+--- /dev/null/nslu/etc/passwd	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/passwd	2004-08-30 09:02:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-root:WeeOvKUvbQ6nI:0:0:root:/root:/bin/sh
++root:t1PLUeOinN/eI:0:0:root:/root:/bin/sh
+ bin:x:1:1:bin:/bin:
+ lp:x:4:7:lp:/share/spool:
+ mail:x:8:12:mail:/var/spool/mail:
+diff -BurN /dev/null/nslu/etc/profile /mnt/nslu/etc/profile
+--- /dev/null/nslu/etc/profile	1969-12-31 19:00:00.000000000 -0500
++++ /mnt/nslu/etc/profile	2004-08-30 09:02:51.000000000 -0400
+@@ -0,0 +1,2 @@
++export PATH=$PATH:/opt/bin:/opt/sbin:/opt/usr/bin:/opt/usr/sbin
++export LD_LIBRARY_PATH=/opt/lib
+diff -BurN /dev/null/nslu/etc/rc /mnt/nslu/etc/rc
+--- /dev/null/nslu/etc/rc	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc	2004-09-01 21:47:47.000000000 -0400
+@@ -1,4 +1,7 @@
+ ## Simple beta script to verify csr
++
++if ( [ -f /unslung/rc ] && . /unslung/rc ) ; then return 0 ; fi
++
+ /usr/bin/Set_Led r_blinking &
+ mount -t proc proc /proc
+ mount -o remount,rw /dev/root /
+diff -BurN /dev/null/nslu/etc/rc.d/rc.1 /mnt/nslu/etc/rc.d/rc.1
+--- /dev/null/nslu/etc/rc.d/rc.1	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.1	2004-09-01 21:56:17.000000000 -0400
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+ 
++if ( [ -f /unslung/rc.1 ] && . /unslung/rc.1 ) ; then return 0 ; fi
++
+ #/sbin/ifconfig ixp0 hw ether 00:C0:02:01:01:04
+ /bin/echo  "Starting Set CGI_ds.conf:"; /etc/rc.d/rc.bootbin; check_status
+ 
+@@ -17,6 +19,10 @@
+ /bin/echo  "Starting Crond :"; . /etc/rc.d/rc.crond
+ /bin/echo  "Starting Rest Task :"; . /etc/rc.d/rc.local
+ 
++if [ -f /.unslung ] ; then
++    /bin/echo  "Starting UNSLUNG Packages:"; ( . /etc/rc.d/rc.unslung )
++fi
++
+ /usr/bin/Set_Led ready
+ /usr/bin/Set_Led beep1
+ /bin/echo  "Checking disk status :"; /usr/sbin/CheckDiskFull 2 >/dev/null
+diff -BurN /dev/null/nslu/etc/rc.d/rc.crond /mnt/nslu/etc/rc.d/rc.crond
+--- /dev/null/nslu/etc/rc.d/rc.crond	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.crond	2004-09-01 21:56:37.000000000 -0400
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+ 
++if ( [ -r /unslung/rc.crond ] && . /unslung/rc.crond ) ; then return 0 ; fi
++
+ if [ -n "`pidof crond`" ] ;then
+     /bin/killall crond 2>/dev/null
+ fi
+diff -BurN /dev/null/nslu/etc/rc.d/rc.halt /mnt/nslu/etc/rc.d/rc.halt
+--- /dev/null/nslu/etc/rc.d/rc.halt	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.halt	2004-09-01 21:57:01.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -r /unslung/rc.halt ] && . /unslung/rc.halt ) ; then return 0 ; fi
++
+ /bin/killall -2 upnpd &>/dev/null
+ /bin/killall nmbd &>/dev/null
+ /bin/killall smbd &>/dev/null
+diff -BurN /dev/null/nslu/etc/rc.d/rc.local /mnt/nslu/etc/rc.d/rc.local
+--- /dev/null/nslu/etc/rc.d/rc.local	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.local	2004-09-01 21:57:17.000000000 -0400
+@@ -1,5 +1,9 @@
+ #!/bin/sh
++
+ HOSTNAME=`hostname`
++
++if ( [ -r /unslung/rc.local ] && . /unslung/rc.local ) ; then return 0 ; fi
++
+ /usr/sbin/CheckResetButton 2>/dev/null
+ /usr/sbin/CheckPowerButton 2>/dev/null
+ /usr/sbin/do_umount 2>/dev/null
+diff -BurN /dev/null/nslu/etc/rc.d/rc.modules /mnt/nslu/etc/rc.d/rc.modules
+--- /dev/null/nslu/etc/rc.d/rc.modules	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.modules	2004-09-01 21:57:34.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.modules ] && . /unslung/rc.modules ) ; then return 0 ; fi
++
+ insmod pbuttons  &>/dev/null
+ insmod rbuttons  &>/dev/null
+ insmod x1226-rtc &>/dev/null
+diff -BurN /dev/null/nslu/etc/rc.d/rc.network /mnt/nslu/etc/rc.d/rc.network
+--- /dev/null/nslu/etc/rc.d/rc.network	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.network	2004-09-01 21:57:46.000000000 -0400
+@@ -1,3 +1,6 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.network ] && . /unslung/rc.network ) ; then return 0 ; fi
++
+ /sbin/ifup; #check_status
+ /bin/echo "call rc.network!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+diff -BurN /dev/null/nslu/etc/rc.d/rc.quickset /mnt/nslu/etc/rc.d/rc.quickset
+--- /dev/null/nslu/etc/rc.d/rc.quickset	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.quickset	2004-09-01 21:57:57.000000000 -0400
+@@ -1,3 +1,6 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.quickset ] && . /unslung/rc.quickset ) ; then return 0 ; fi
++
+ /usr/sbin/QuickSet; check_status
+ /usr/sbin/USB_Detect; check_status
+diff -BurN /dev/null/nslu/etc/rc.d/rc.quota /mnt/nslu/etc/rc.d/rc.quota
+--- /dev/null/nslu/etc/rc.d/rc.quota	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.quota	2004-09-01 21:58:08.000000000 -0400
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+ 
++if ( [ -f /unslung/rc.quota ] && . /unslung/rc.quota ) ; then return 0 ; fi
++
+ # Check and turn on disk quota.
+ if [ -x "/usr/bin/quotacheck" ]
+ then
+diff -BurN /dev/null/nslu/etc/rc.d/rc.reboot /mnt/nslu/etc/rc.d/rc.reboot
+--- /dev/null/nslu/etc/rc.d/rc.reboot	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.reboot	2004-09-01 21:58:19.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -r /unslung/rc.reboot ] && . /unslung/rc.reboot ) ; then return 0 ; fi
++
+ /bin/killall -2 upnpd 2>/dev/null
+ sleep 4
+ /sbin/ifdown ixp0
+diff -BurN /dev/null/nslu/etc/rc.d/rc.reset_usrgrpshare /mnt/nslu/etc/rc.d/rc.reset_usrgrpshare
+--- /dev/null/nslu/etc/rc.d/rc.reset_usrgrpshare	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.reset_usrgrpshare	2004-09-01 21:58:36.000000000 -0400
+@@ -1,2 +1,5 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.reset_usrgrpshare ] && . /unslung/rc.reset_usrgrpshare ) ; then return 0 ; fi
++
+ /usr/sbin/reset_ugs;
+diff -BurN /dev/null/nslu/etc/rc.d/rc.rstimezone /mnt/nslu/etc/rc.d/rc.rstimezone
+--- /dev/null/nslu/etc/rc.d/rc.rstimezone	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.rstimezone	2004-09-01 21:58:47.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.rstimezone ] && . /unslung/rc.rstimezone ) ; then return 0 ; fi
++
+ #TIME=`/usr/sbin/hwclock`
+ /usr/sbin/Set_TimeZone >/dev/null
+ #/bin/date -s "$TIME"
+diff -BurN /dev/null/nslu/etc/rc.d/rc.samba /mnt/nslu/etc/rc.d/rc.samba
+--- /dev/null/nslu/etc/rc.d/rc.samba	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.samba	2004-09-01 21:58:57.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.samba ] && . /unslung/rc.samba ) ; then return 0 ; fi
++
+ if [ -n "`pidof smbd`" ] ; then
+     killall smbd 2>/dev/null
+ fi
+diff -BurN /dev/null/nslu/etc/rc.d/rc.sysinit /mnt/nslu/etc/rc.d/rc.sysinit
+--- /dev/null/nslu/etc/rc.d/rc.sysinit	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.sysinit	2004-09-01 21:59:04.000000000 -0400
+@@ -1,7 +1,16 @@
+ #!/bin/sh
++
+ export PATH=/bin:/sbin:/usr/bin:/usr/sbin
++
++if [ -f /.unslung ] ; then
++    export PATH=${PATH}:/opt/bin:/opt/sbin:/opt/usr/bin:/opt/usr/sbin
++fi
++
+ . /etc/rc.d/rc.functions
+ . /etc/sysconfig/network
++
++if ( [ -f /unslung/rc.sysinit ] && . /unslung/rc.sysinit ) ; then return 0 ; fi
++
+ mkdir -p /var/lock/samba >/dev/null
+ /bin/echo  "Creating ramfs for /var/lock/samba:"; mount -t ramfs none /var/lock/samba -o maxsize=64
+ /bin/echo  "Limit the space of log folder:"; mount -t ramfs none /var/log -o maxsize=128
+diff -BurN /dev/null/nslu/etc/rc.d/rc.thttpd /mnt/nslu/etc/rc.d/rc.thttpd
+--- /dev/null/nslu/etc/rc.d/rc.thttpd	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.thttpd	2004-09-01 21:59:13.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.thttpd ] && . /unslung/rc.thttpd ) ; then return 0 ; fi
++
+ if [ -n "`pidof thttpd`" ] ;then
+ 	/bin/killall thttpd 2>/dev/null
+ fi
+diff -BurN /dev/null/nslu/etc/rc.d/rc.xinetd /mnt/nslu/etc/rc.d/rc.xinetd
+--- /dev/null/nslu/etc/rc.d/rc.xinetd	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.xinetd	2004-09-01 21:59:34.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.xinetd ] && . /unslung/rc.xinetd ) ; then return 0 ; fi
++
+ if [ -n "`pidof inetd`" ] ;then
+    killall inetd 2>/dev/null
+ #   killall -9 inetd &>/dev/null
+diff -BurN /dev/null/nslu/usr/local/passwd /mnt/nslu/usr/local/passwd
+--- /dev/null/nslu/usr/local/passwd	2004-07-27 23:37:56.000000000 -0400
++++ /mnt/nslu/usr/local/passwd	2004-08-30 09:02:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-root:WeeOvKUvbQ6nI:0:0:root:/root:/bin/sh
++root:t1PLUeOinN/eI:0:0:root:/root:/bin/sh
+ bin:x:1:1:bin:/bin:
+ lp:x:4:7:lp:/share/spool:
+ mail:x:8:12:mail:/var/spool/mail:
+--- /dev/null/nslu/etc/rc.d/rc.sysinit	2004-11-09 21:45:46.000000000 +1030
++++ /mnt/nslu/etc/rc.d/rc.sysinit	2004-11-09 21:41:47.000000000 +1030
+@@ -12,8 +12,18 @@
+ if ( [ -f /unslung/rc.sysinit ] && . /unslung/rc.sysinit ) ; then return 0 ; fi
+ 
+ mkdir -p /var/lock/samba >/dev/null
+-/bin/echo  "Creating ramfs for /var/lock/samba:"; mount -t ramfs none /var/lock/samba -o maxsize=64
+-/bin/echo  "Limit the space of log folder:"; mount -t ramfs none /var/log -o maxsize=128
++
++/bin/echo "Creating ramfs for /dev:"
++/bin/mount -t ramfs none /mnt/tmpmnt
++/bin/cp -r /dev/* /mnt/tmpmnt/
++/bin/mount -o bind /mnt/tmpmnt /dev
++/bin/umount /mnt/tmpmnt
++/bin/echo "Creating ramfs for /var:"
++/bin/mount -t ramfs none /mnt/tmpmnt
++/bin/cp -r /var/* /mnt/tmpmnt/
++/bin/mount -o bind /mnt/tmpmnt /var
++/bin/umount /mnt/tmpmnt
++
+ mkdir -p /var/log/samba >/dev/null
+ touch /var/log/server.log >/dev/null
+ chmod 755 /var/log/samba >/dev/null
+--- /dev/null/nslu/etc/rc.d/rc.1.orig	2004-11-09 21:45:52.000000000 +1030
++++ /mnt/nslu/etc/rc.d/rc.1	2004-11-09 21:44:27.000000000 +1030
+@@ -5,6 +5,14 @@
+ #/sbin/ifconfig ixp0 hw ether 00:C0:02:01:01:04
+ /bin/echo  "Starting Set CGI_ds.conf:"; /etc/rc.d/rc.bootbin; check_status
+ 
++if ( [ -f /share/hdd/conf/.ext3flash ] ) ; then
++  /bin/echo  "Remounting /dev/sda1 as ext3flash:"
++  /bin/mount -o remount,rw,noatime /dev/sda1
++  /bin/echo  "Remounting /dev/sda2 as ext3flash:"
++  /bin/mount -o remount,rw,noatime /dev/sda2
++  /bin/echo  "Removing swap from ext3flash:"
++  /sbin/swapoff /dev/sda3
++fi
+ 
+ /bin/echo  "Restore time and timezone:"; /etc/rc.d/rc.rstimezone; check_status
+ /bin/echo  "Restore usrgrpshares:"; /etc/rc.d/rc.reset_usrgrpshare; check_status
+--- /dev/null/nslu/etc/rc.d/rc.quota	2004-11-11 00:05:21.000000000 +1030
++++ /mnt/nslu/etc/rc.d/rc.quota	2004-11-11 00:04:52.000000000 +1030
+@@ -10,6 +10,11 @@
+     echo "Done."
+ fi
+ 
++if ( [ -f /share/hdd/conf/.ext3flash ] ) ; then
++    /bin/echo "Remounting /dev/sda1 as ext3flash:"
++    /bin/mount -o remount,rw,noatime /dev/sda1
++fi
++
+ if [ -x "/usr/bin/quotaon" ]
+ then
+     echo "Turning on quota."
diff --git a/nslu2-binary-only/unslung-standard-ramdisk_2.3r25.oe b/nslu2-binary-only/unslung-standard-ramdisk_2.3r25.oe
index b883a0d770..b072d5b83b 100644
--- a/nslu2-binary-only/unslung-standard-ramdisk_2.3r25.oe
+++ b/nslu2-binary-only/unslung-standard-ramdisk_2.3r25.oe
@@ -1,8 +1,8 @@
 SECTION = "base"
 
-PR = "r20"
+PR = "r21"
 
-UNSLUNG_VERSION = "3.2-alpha"
+UNSLUNG_VERSION = "3.3-alpha"
 UNSLUNG_VARIANT ?= "standard"
 
 DEPENDS = "nslu2-linksys-libs"
author	Chris Larson <clarson@kergoth.com>	2004-11-19 22:08:54 +0000
committer	Chris Larson <clarson@kergoth.com>	2004-11-19 22:08:54 +0000
commit	59fd4d418a6c940c5eab9e3a6b47ed4566312116 (patch)
tree	c9ced18f0b6b857b41d8eb4ed2b7c738138576ee
parent	44b173fc64ac7e67ab17cb727f0a4de0e02f7e78 (diff)