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

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

2004/11/15 17:37:03-05:00 giantshoulder.com!g2
Change ROOTFS_SIZE to the smallest value (mod 128) that works 3840

2004/11/16 07:33:28+10:30 (none)!rwhitby
Initial jffs2 support in unslung-image

2004/11/14 23:08:14+10:30 (none)!rwhitby
Unslung switchbox now works somewhat

2004/11/13 20:02:57-08:00 (none)!jacques
added linuxrc to URI and forced static build

2004/11/14 13:20:09+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into home.(none):/home/openembedded/packages

2004/11/14 13:19:56+10:30 (none)!rwhitby
Stripped more features from switchbox

2004/11/13 18:33:34-08:00 (none)!jacques
added linuxrc and linuxrc install to switchbox (linuxrc is just a copy of the unslung-ramdisk one ATM)

2004/11/13 17:10:58-08:00 (none)!jacques
initial very minimal switchbox bb config

2004/11/14 11:32:22+10:30 (none)!rwhitby
Added switchbox - a minimal busybox for switching between root device options in /linuxrc on an NSLU2 device

2004/11/14 08:26:40+10:30 (none)!rwhitby
Removed JFFS from unslung-able kernel - JFFS2 does not require it.

2004/11/13 22:40:16+10:30 (none)!rwhitby
Added support for more flash partitions, and JFFS2 filesystems.

2004/11/12 00:28:05-08:00 bkbits.net!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into bkbits.net:/repos/n/nslu2-linux/packages

2004/11/11 22:31:58+10:30 (none)!rwhitby
Enabled CONFIG_MTD_REDBOOT_PARTS in unslung-able-kernel's defconfig

2004/11/11 00:42:41-08:00 bkbits.net!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into bkbits.net:/repos/n/nslu2-linux/packages

2004/11/11 00:38:58+10:30 (none)!rwhitby
Unslung: fixed slugbug#24 - If /.ext3flash exists, then /dev/sda1 is remounted with the noatime option between the running of quotacheck (which is what turns off the noatime option) and the running of quotaon.

2004/11/09 22:37:05+10:30 (none)!rwhitby
Added ext3flash functionality to startup scripts, keyed on the existence of a /.ext3flash file.  Also updated the README.

2004/11/08 22:40:38+10:30 (none)!rwhitby
Enabled devfs in the Unslung-able kernel (but did not enable auto mounting)

2004/11/07 19:35:32-05:00 uottawa.ca!stephane
Reverted SCL I2C pin to default of 6 after pushing my local change by accident.

2004/11/07 19:14:08-05:00 uottawa.ca!stephane
Merge nslu2-linux@nslu2-linux.bkbits.net:packages
into gauss.mathstat.uottawa.ca:/local/nslu2/openslug/packages

2004/11/07 18:11:11-05:00 uottawa.ca!stephane
First stab at integrating kernel 2.6.9 into OE for NSLU2.

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

2004/11/07 09:15:34+10:30 (none)!rwhitby
Bumped package and Unslung version, in preparation for Unslung public beta

2004/11/06 12:48:04-08:00 bkbits.net!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages
into bkbits.net:/repos/n/nslu2-linux/packages

2004/11/06 23:24:13+10:30 (none)!rwhitby
Now copied README to unslung disk

2004/11/06 22:32:31+10:30 (none)!rwhitby
Unslung 2.11-beta release candidate

2004/11/06 22:05:40+10:30 (none)!rwhitby
Removed ext3flash, ext1vfat2, and vfatdisk2 variants.  The ext3flash-on-disk1 functionality has been added to the stock firmware, and the vfatdisk2 variant never worked properly anyway.

2004/11/06 16:07:27+10:30 (none)!rwhitby
Added ext3flash-on-disk1.patch, and included it in all unslung kernels

2004/11/06 09:01:17+10:30 (none)!rwhitby
Made unsling remove /bin/wget on upgraded unslung disks

2004/11/06 08:35:03+10:30 (none)!rwhitby
Removed the ipkg info from the local feed (used in building the Unslung ramdisk) from the Unslung image.

2004/11/05 23:49:31+10:30 (none)!rwhitby
Added ext1vfat2 variant

2004/11/05 16:11:01+10:30 (none)!rwhitby
Made all unslung variants use the -standard variant as a base, instead of the pseudo -base variant.

2004/11/05 00:21:59+10:30 (none)!rwhitby
Fixed the nslu2-linux-kernel kernel-suffix

2004/11/05 00:07:21+10:30 (none)!rwhitby
Reverted linksys-kernel defconfig to original

2004/11/04 23:22:44+10:30 (none)!rwhitby
Fixed the typo in unslung-image.oe

2004/11/04 23:17:52+10:30 (none)!rwhitby
Renamed all unslung files to a more consistent naming scheme

2004/11/04 20:15:58+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into home.(none):/home/openembedded/packages

2004/11/04 13:54:46+10:30 (none)!rwhitby
Split nslu2-unslung-libs out of nslu2-unslung-ramdisk (and it's variants) so that we don't confuse the shlibs code.  Also stopped the patcher dross being copied into the ramdisks.

2004/11/04 11:33:44+10:30 (none)!rwhitby
Added RPROVIDES to Unslung ramdisk variants

2004/11/03 10:54:13-10:00 (none)!dereky
unslung.conf:
  Added RAID kernel modules.

2004/11/04 01:37:37+10:30 (none)!rwhitby
Moved the unslung-specific patches from the linksys directory to the unslung directory

2004/11/04 01:20:23+10:30 (none)!rwhitby
Added UNSLUNG_{KERNEL,RAMDISK}_EXTRA_SRC_URI to unslung kernel and ramdisk

2004/11/04 00:16:05+10:30 (none)!rwhitby
Added the limit1gb variant, and took that functionality out of the standard variant

2004/11/04 00:11:54+10:30 (none)!rwhitby
Moved 1Gb limit stuff into a separate variant

2004/11/04 00:11:23+10:30 (none)!rwhitby
Moved 1Gb limit stuff into a separate variant

2004/11/04 00:10:57+10:30 (none)!rwhitby
Moved 1Gb limit stuff into a separate variant

2004/11/03 23:48:38+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into home.(none):/home/openembedded/packages

2004/11/03 23:47:57+10:30 (none)!rwhitby
Reorganisation of Unslung kernel variants

2004/11/03 21:21:44+11:00 black.lan!peteru
Version up for libusb.

2004/11/03 16:58:02+11:00 black.lan!peteru
Change order of include so that SRC_URI is not clobbered when building varianted ramdisk images.
Move the mount of usbdevfs to a more suitable location.

2004/11/03 15:51:08+11:00 black.lan!peteru
Ensure that the image contains ramdisk files from Linksys.

2004/11/03 13:36:38+10:30 (none)!rwhitby
Added UNSLUNG_EXTRA_{DEPENDS,RDEPENDS,RRECOMMENDS}

2004/11/03 11:24:21+10:30 (none)!rwhitby
Missed unslung-image-vfatdisk2

2004/11/03 11:20:26+10:30 (none)!rwhitby
Fixed Unslung ramdisk FILESPATH

2004/11/03 10:57:38+11:00 black.lan!peteru
Merge nslu2-linux@nslu2-linux.bkbits.net:packages
into black.lan:/home/slug/bk/packages

2004/11/03 10:57:07+11:00 black.lan!peteru
Updated with missing changes.

2004/11/02 17:37:54-06:00 handhelds.org!kergoth
Merge nslu2-linux@nslu2-linux.bkbits.net:packages
into handhelds.org:/home/kergoth/code/packages-nslu2

2004/11/03 10:11:25+10:30 (none)!rwhitby
Fixed UNSLUNG-SUFFIX in the ramdisk variants

2004/11/02 17:37:35-06:00 handhelds.org!kergoth
Make the CIA post-outgoing trigger obey a BK_SILENT variable, to supress notifications when doing syncs.

2004/11/03 10:36:21+11:00 black.lan!peteru
Added missing changes to support variants.

BKrev: 419957569UY_WhtfFG7t7k9gaKf8xQ

10 files changed, 42 insertions, 50 deletions

diff --git a/meta/nslu2-image.oe b/meta/nslu2-linksys-image.oe
index e69de29bb2..e69de29bb2 100644
--- a/meta/nslu2-image.oe
+++ b/meta/nslu2-linksys-image.oe
diff --git a/meta/unslung-able-image.oe b/meta/unslung-able-image.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/unslung-able-image.oe
diff --git a/meta/unslung-image-able.oe b/meta/unslung-image-able.oe
deleted file mode 100644
index 45655028c1..0000000000
--- a/meta/unslung-image-able.oe
+++ /dev/null
@@ -1,5 +0,0 @@
-IMAGE_BASENAME = "unslung-able"
-
-DEPENDS = "nslu2-unslung-kernel-able nslu2-unslung-ramdisk-able ${UNSLUNG_BASE_PACKAGES}"
-
-include unslung-image-base.oe
diff --git a/meta/unslung-image-base.oe b/meta/unslung-image-base.oe
deleted file mode 100644
index 294b0453ef..0000000000
--- a/meta/unslung-image-base.oe
+++ /dev/null
@@ -1,29 +0,0 @@
-IMAGE_LINGUAS = ""
-USE_DEVFS = "1"
-
-UNSLUNG_BASE_PACKAGES = "slingbox ipkg wget"
-
-IPKG_INSTALL = "${UNSLUNG_BASE_PACKAGES}"
-
-DEPENDS ?= "virtual/kernel nslu2-unslung-ramdisk ${UNSLUNG_BASE_PACKAGES}"
-IMAGE_BASENAME ?= "unslung"
-
-UNSLUNG_DEVICE_TABLE = "${@oe.which(oe.data.getVar('OEPATH', d, 1), 'files/device_table-unslung.txt')}"
-EXTRA_IMAGECMD_ext2.gz = "-f ${UNSLUNG_DEVICE_TABLE}"
-
-IMAGE_PREPROCESS_COMMAND += "unslung_clean_image; "
-		
-inherit image_ipk
-
-# Note that anything in this function must be repeatable without having to rebuild the rootfs
-unslung_clean_image () {
-
-	# Remove all traces of the ipkg stuff we did to get this rootfs
-	rm -rf ${IMAGE_ROOTFS}/usr/lib/ipkg
-	if [ -f ${IMAGE_ROOTFS}/usr/bin/ipkg-cl ]; then
-	  rm -f ${IMAGE_ROOTFS}/usr/bin/ipkg
-	  mv ${IMAGE_ROOTFS}/usr/bin/ipkg-cl ${IMAGE_ROOTFS}/usr/bin/ipkg
-	fi
-	rm -f ${IMAGE_ROOTFS}/usr/bin/update-alternatives
-
-}
diff --git a/meta/unslung-image-ext3flash.oe b/meta/unslung-image-ext3flash.oe
deleted file mode 100644
index acbcd0a6b2..0000000000
--- a/meta/unslung-image-ext3flash.oe
+++ /dev/null
@@ -1,5 +0,0 @@
-IMAGE_BASENAME = "unslung-ext3flash"
-
-DEPENDS = "nslu2-unslung-kernel-ext3flash nslu2-unslung-ramdisk-ext3flash ${UNSLUNG_BASE_PACKAGES}"
-
-include unslung-image-base.oe
diff --git a/meta/unslung-image-standard.oe b/meta/unslung-image-standard.oe
deleted file mode 100644
index b75632b254..0000000000
--- a/meta/unslung-image-standard.oe
+++ /dev/null
@@ -1,5 +0,0 @@
-IMAGE_BASENAME = "unslung-standard"
-
-DEPENDS = "nslu2-unslung-kernel-standard nslu2-unslung-ramdisk-standard ${UNSLUNG_BASE_PACKAGES}"
-
-include unslung-image-base.oe
diff --git a/meta/unslung-image-vfatdisk2.oe b/meta/unslung-image-vfatdisk2.oe
deleted file mode 100644
index 11b3badf09..0000000000
--- a/meta/unslung-image-vfatdisk2.oe
+++ /dev/null
@@ -1,5 +0,0 @@
-IMAGE_BASENAME = "unslung-vfatdisk2"
-
-DEPENDS = "nslu2-unslung-kernel-vfatdisk2 nslu2-unslung-ramdisk-vfatdisk2 ${UNSLUNG_BASE_PACKAGES}"
-
-include unslung-image-base.oe
diff --git a/meta/unslung-image.oe b/meta/unslung-image.oe
index c162c99b4d..924dff024d 100644
--- a/meta/unslung-image.oe
+++ b/meta/unslung-image.oe
@@ -1 +1 @@
-DEPENDS = "unslung-image-standard unslung-image-ext3flash unslung-image-vfatdisk2 unslung-image-able"
+DEPENDS = "unslung-switchbox-image unslung-standard-image unslung-able-image"
diff --git a/meta/unslung-standard-image.oe b/meta/unslung-standard-image.oe
new file mode 100644
index 0000000000..6af8c6b97d
--- /dev/null
+++ b/meta/unslung-standard-image.oe
@@ -0,0 +1,41 @@
+PR = "r1"
+
+IMAGE_LINGUAS = ""
+USE_DEVFS = "1"
+
+UNSLUNG_BASE_DEPENDS = "slingbox ipkg wget"
+UNSLUNG_BASE_PACKAGES = "slingbox ipkg wget"
+
+IMAGE_VARIANT ?= "standard"
+
+export IMAGE_BASENAME = "unslung-${IMAGE_VARIANT}"
+
+IPKG_INSTALL = "unslung-${IMAGE_VARIANT}-ramdisk \
+		${UNSLUNG_BASE_PACKAGES} ${UNSLUNG_EXTRA_PACKAGES}"
+
+DEPENDS  = "unslung-${IMAGE_VARIANT}-kernel unslung-${IMAGE_VARIANT}-ramdisk \
+		${UNSLUNG_BASE_DEPENDS} ${UNSLUNG_EXTRA_DEPENDS}"
+
+RDEPENDS = "${UNSLUNG_BASE_PACKAGES} ${UNSLUNG_EXTRA_RDEPENDS}"
+
+RRECOMMENDS = "${UNSLUNG_EXTRA_RRECOMMENDS}"
+
+UNSLUNG_DEVICE_TABLE = "${@oe.which(oe.data.getVar('OEPATH', d, 1), 'files/device_table-unslung.txt')}"
+
+IMAGE_FSTYPES = "ext2.gz jffs2"
+EXTRA_IMAGECMD_ext2.gz = "-f ${UNSLUNG_DEVICE_TABLE}"
+EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000"
+
+IMAGE_PREPROCESS_COMMAND += "unslung_clean_image; "
+		
+inherit image_ipk
+
+# Note that anything in this function must be repeatable without having to rebuild the rootfs
+unslung_clean_image () {
+
+	makedevs -r ${IMAGE_ROOTFS} -D ${UNSLUNG_DEVICE_TABLE}
+
+	# Remove info from the local feed used to build the image
+	rm -rf ${IMAGE_ROOTFS}/usr/lib/ipkg/lists/*
+
+}
diff --git a/meta/unslung-switchbox-image.oe b/meta/unslung-switchbox-image.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/unslung-switchbox-image.oe