summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-12-09 01:08:42 +0000
committerChris Larson <clarson@kergoth.com>2004-12-09 01:08:42 +0000
commit542d7821374d6d02d672bfd9f7139338030d645e (patch)
treecb5eef91b6996e0c2ade9ddc74aed922edeadbf3 /conf/distro
parent45a347c0ad9b95345d817f027c7865670e83fb35 (diff)
Merge
2004/12/07 19:17:51-08:00 (none)!jacques module-init-tools: fixes recent packaging improvements change which broke -cross build 2004/12/07 13:43:37-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/packages into bkbits.net:/repos/n/nslu2-linux/packages 2004/12/07 22:55:16+10:30 (none)!rwhitby Made the Unslung README even more clear about not plugging in a disk before telnetting into the NSLU2. 2004/12/05 22:58:32+10:30 (none)!rwhitby Bumped the package revisions 2004/12/05 22:55:34+10:30 (none)!rwhitby Fixed the download locations after our wiki hosting change, and also robustified the slugimage calls 2004/12/04 17:26:29+10:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages into home.(none):/home/openembedded/packages 2004/12/04 17:25:56+10:30 (none)!rwhitby Added code to nslu2-specific packages to restrict builds to the right MACHINE and DISTRO. Also added default CVSDATE lines for packages that go out of date every day (the ones which should use a CVS tag instead of a just getting the latest from CVS). 2004/12/04 01:03:46-05:00 giantshoulder.com!g2 Merge 2004/12/04 00:49:06-05:00 giantshoulder.com!g2 Add READLINK_FOLLOW patch support for OpenSlug 2004/12/03 14:29:09-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/packages into bkbits.net:/repos/n/nslu2-linux/packages 2004/12/01 16:42:04-08:00 (none)!jacques change default libc to glibc, remove modutils-related packages 2004/11/30 23:09:55+10:30 (none)!rwhitby Network-enabled switchbox, including telnetd support. 2004/11/30 00:05:33+10:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages into home.(none):/home/openembedded/packages 2004/11/30 00:04:32+10:30 (none)!rwhitby Changed nslu2-linksys-firmware from using slugtool to using slugimage 2004/11/29 04:17:28-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/packages into bkbits.net:/repos/n/nslu2-linux/packages 2004/11/28 16:24:59+10:30 (none)!rwhitby Unslung README changes (thanks to [g2] for the review). 2004/11/28 10:01:17+10:30 (none)!rwhitby SlugImage now uses a CVS tag for selection 2004/11/26 21:05:04+10:30 (none)!rwhitby Enabled mounting of external drives earlier in the Unslung boot process, so that the rc, rc.sysinit, and rc.1 scripts can be diverted by external diversion scripts on an attached drive. 2004/11/25 23:46:02+10:30 (none)!rwhitby Added external diversion script support to Unslung and bumped version to 3.7-alpha 2004/11/25 08:37:51+10:30 (none)!rwhitby Mounted original /dev and /var as /foo.state for Unslung jffs2 version (so that changes can be made to the persistent state that is copied to the ramdisk on boot). 2004/11/24 13:45:45-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/packages into bkbits.net:/repos/n/nslu2-linux/packages 2004/11/23 02:26:52-08:00 (none)!jacques Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages into home.(none):/home/packages/oe/nslu2/packages 2004/11/23 02:26:02-08:00 (none)!jacques openslug.conf: made TARGET_OS and USE_NLS over-ridable in local.conf 2004/11/23 00:58:29-08:00 bkbits.net!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages-devel into bkbits.net:/repos/n/nslu2-linux/packages 2004/11/22 21:23:46-05:00 uottawa.ca!stephane Updated nslu2-io.c with kas11's latest version which adds ioctls for buzzer control. 2004/11/22 23:40:31+10:30 (none)!rwhitby Added awk to Unslung slingbox 2004/11/21 22:30:39+10:30 (none)!rwhitby Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages into home.(none):/home/openembedded/packages 2004/11/21 22:30:00+10:30 (none)!rwhitby Split unslung.patch into many separate managed patches. Added a patch to reinitialise /etc/mtab on boot. Bumped version to 3.5-alpha. 2004/11/21 02:31:40-08:00 (none)!jacques added USE_NLS = "no" to openslug.conf as this fixes problems with 'date', 'top', and possibly other apps. 2004/11/21 14:58:05+10:30 (none)!rwhitby Changed ipkg.conf and slingbox in Unslung to better support ipkg-link requirements. 2004/11/21 09:34:41+10:30 (none)!rwhitby Removed support for the unslung ramdisk.img - all scenarios can be covered by the flashdisk.img with jffs2 support 2004/11/20 12:36:25-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 03:54:51-10:00 (none)!dyoung added AFP support 2004/11/20 22:59:57+10:30 (none)!rwhitby Unslung's insling script now saves the root disk ipkg database is the target disk already has one. 2004/11/20 22:37:43+10:30 (none)!rwhitby More error checking for Unslung's insling script 2004/11/20 22:03:30+10:30 (none)!rwhitby Made Unslung's insling script more robust. 2004/11/20 20:55:36+10:30 (none)!rwhitby Licensed slugimage as BSD. 2004/11/20 20:55:16+10:30 (none)!rwhitby Created unslung-packages. 2004/11/20 20:54:38+10:30 (none)!rwhitby Added insling, resling and ipkg-link to Unslung. 2004/11/19 19:14:26-08:00 bkbits.net!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages-devel into bkbits.net:/repos/n/nslu2-linux/packages 2004/11/19 13:43:55-08:00 bkbits.net!nslu2-linux.adm Merge bk://openembedded.bkbits.net/packages-devel into bkbits.net:/repos/n/nslu2-linux/packages BKrev: 41b7a59az4WBwdMLxUhV0hW59RtFjQ
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/openslug.conf11
-rw-r--r--conf/distro/switchbox.conf6
-rw-r--r--conf/distro/unslung.conf6
3 files changed, 11 insertions, 12 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index b063a528e2..57abf79f94 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -3,7 +3,9 @@
#@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2
TARGET_FPU ?= "soft"
-TARGET_OS = "linux-uclibc"
+TARGET_OS ?= "linux"
+
+USE_NLS ?= "no"
INHERIT += " package_ipk debian nslu2_flashimg"
@@ -20,12 +22,7 @@ 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"
+OPENSLUG_EXTRA_INSTALL += "${OPENSLUG_EXTRA_RDEPENDS}"
BOOTSTRAP_EXTRA_DEPENDS += "${OPENSLUG_EXTRA_DEPENDS}"
BOOTSTRAP_EXTRA_RDEPENDS += "${OPENSLUG_EXTRA_RDEPENDS}"
diff --git a/conf/distro/switchbox.conf b/conf/distro/switchbox.conf
index 3b29502143..d9bdd061f3 100644
--- a/conf/distro/switchbox.conf
+++ b/conf/distro/switchbox.conf
@@ -8,10 +8,10 @@ TARGET_OS = "linux-uclibc"
INHERIT += " package_ipk debian"
IMAGE_FSTYPE = "ext2.gz"
-IMAGE_ROOTFS_SIZE_ext2 = "1024"
-IMAGE_ROOTFS_SIZE_ext2.gz = "1024"
+IMAGE_ROOTFS_SIZE_ext2 = "2048"
+IMAGE_ROOTFS_SIZE_ext2.gz = "2048"
SWITCHBOX_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}"
-EXTRA_IMAGECMD_ext2.gz = "-f ${SWITCHBOX_DEVICE_TABLE}"
+EXTRA_IMAGECMD_ext2.gz = "-r 0 -f ${SWITCHBOX_DEVICE_TABLE}"
USE_NLS = "no"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index b16df4a831..bf56e116c9 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -2,13 +2,15 @@
#@NAME: Unslung
#@DESCRIPTION: Unslung Linux Distribution for the NSLU2
+FEED_URIS_unslung = "unslung##http://ipkg.nslu2-linux.org/feeds/unslung/unstable"
+
TARGET_FPU = "soft"
TARGET_OS = "linux"
INHERIT += " package_ipk nslu2_flashimg"
IMAGE_FSTYPES = "ext2.gz jffs2"
-NSLU2_BUILD_RAMDISK_FIRMWARE = 1
+# NSLU2_BUILD_RAMDISK_FIRMWARE = 1
UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', 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}"
@@ -21,7 +23,7 @@ UNSLUNG_EXTRA_RDEPENDS += "kernel-module-ax8817x kernel-module-catc \
kernel-module-cdcether kernel-module-kaweth kernel-module-pegasus \
kernel-module-rtl8150 kernel-module-usbnet kernel-module-mii \
kernel-module-md kernel-module-raid0 kernel-module-raid1 kernel-module-raid5 \
-kernel-module-usb-serial"
+kernel-module-usb-serial kernel-module-appletalk kernel-module-ipddp"
UNSLUNG_EXTRA_RRECOMMENDS +=