summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-05-04 14:42:02 +0000
committerRod Whitby <rod@whitby.id.au>2005-05-04 14:42:02 +0000
commit7b7590ca7af5f4b68365dbc4315b333e44d3493c (patch)
treea1ef9371b3d888d705fe3ba9fa8aec0e2a5ec835 /conf/distro
parent32076690a4804afae16f07d26f18d2ac9a030a6a (diff)
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded 2005/05/04 14:41:13+00:00 (none)!rwhitby Unslung/OpenSlug: Removed all trace of switchbox BKrev: 4278df3aX1WDF_UNmDjNP7ReUMoQxg
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/switchbox.conf17
-rw-r--r--conf/distro/unslung.conf9
2 files changed, 1 insertions, 25 deletions
diff --git a/conf/distro/switchbox.conf b/conf/distro/switchbox.conf
deleted file mode 100644
index 6cde69946b..0000000000
--- a/conf/distro/switchbox.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#@TYPE: Distribution
-#@NAME: SwitchBox
-#@DESCRIPTION: SwitchBox Linux Distribution for the NSLU2
-
-TARGET_FPU = "soft"
-TARGET_OS = "linux-uclibc"
-
-INHERIT += " package_ipk debian"
-
-IMAGE_FSTYPE = "ext2.gz"
-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 -D ${SWITCHBOX_DEVICE_TABLE}"
-
-USE_NLS = "no"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 31e781bb0f..f947f97589 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -7,7 +7,7 @@ FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/unslung/native"
FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/oe"
DISTRO_NAME = "Unslung"
-DISTRO_VERSION = "4.13-alpha"
+DISTRO_VERSION = "4.18-alpha"
DISTRO_TYPE = "beta"
TARGET_FPU = "soft"
@@ -19,13 +19,6 @@ IMAGE_FSTYPE = "jffs2"
UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}"
EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${UNSLUNG_DEVICE_TABLE}"
-# NSLU2_BUILD_RAMDISK_FIRMWARE = 1
-# IMAGE_FSTYPES = "ext2.gz jffs2"
-# EXTRA_IMAGECMD_ext2.gz = "-f ${UNSLUNG_DEVICE_TABLE}"
-
-EXTRA_IMAGEDEPENDS += 'unslung-switchbox-payload'
-NSLU2_SLUGIMAGE_ARGS = -l payload.tar.gz
-
UNSLUNG_EXTRA_DEPENDS ?= ""
UNSLUNG_EXTRA_RDEPENDS ?= "\
kernel-module-usbnet \