From eea951fc35679b928aedc6214274de67c031ce12 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 23 Feb 2005 12:43:28 +0000 Subject: Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded into home.(none):/home/slug/openembedded 2005/02/23 23:12:51+10:30 (none)!rwhitby OpenSlug-1.3-alpha: Now supports booting from an external disk BKrev: 421c7a70mLQYTzytyCEmYeuG3qS5Bw --- conf/distro/switchbox.conf | 2 +- conf/machine/nslu2.conf | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/switchbox.conf b/conf/distro/switchbox.conf index c3013cf858..6cde69946b 100644 --- a/conf/distro/switchbox.conf +++ b/conf/distro/switchbox.conf @@ -12,6 +12,6 @@ IMAGE_ROOTFS_SIZE_ext2 = "1024" IMAGE_ROOTFS_SIZE_ext2.gz = "1024" SWITCHBOX_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}" -EXTRA_IMAGECMD_ext2.gz = "-r 0 -i 512 -f ${SWITCHBOX_DEVICE_TABLE}" +EXTRA_IMAGECMD_ext2.gz = "-r 0 -i 512 -D ${SWITCHBOX_DEVICE_TABLE}" USE_NLS = "no" diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index dc2b08f4fe..9fe31196f5 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -19,4 +19,5 @@ CVSDATE_gnu-config-native ?= "20050221" CVSDATE_ipkg-utils-native ?= "20050221" CVSDATE_ipkg-link ?= "20050221" CVSDATE_uclibc ?= "20050221" -CVSDATE_genext2fs ?= "20050221" \ No newline at end of file +CVSDATE_genext2fs ?= "20050221" +CVSDATE_genext2fs-native ?= "20050221" \ No newline at end of file -- cgit v1.2.3