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

1 files changed, 18 insertions, 2 deletions

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