summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-11-19 22:08:54 +0000
committerChris Larson <clarson@kergoth.com>2004-11-19 22:08:54 +0000
commit59fd4d418a6c940c5eab9e3a6b47ed4566312116 (patch)
treec9ced18f0b6b857b41d8eb4ed2b7c738138576ee /conf/distro
parent44b173fc64ac7e67ab17cb727f0a4de0e02f7e78 (diff)
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
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/openslug.conf17
-rw-r--r--conf/distro/unslung.conf2
2 files changed, 14 insertions, 5 deletions
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}"