diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-08-11 10:12:01 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-11 10:12:01 +0000 |
| commit | 5db530540a094f96b52245c5896ef40009e6db6b (patch) | |
| tree | 1602c06c10520ea48fe30810dee4a710976ba9fd /conf | |
| parent | 98318c22a913b1500564268e3c499dc57cc036e0 (diff) | |
| parent | a126be07197df04761fed6c61d708ff10c8c434c (diff) | |
merge of 0bfafb15be028004cf9117bd99c73c9f7ee1b3c8
and 154b18293551ae7140a0552c72791f095d1f3f69
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/openslug.conf | 2 | ||||
| -rw-r--r-- | conf/distro/ucslugc.conf | 2 | ||||
| -rw-r--r-- | conf/distro/unslung.conf | 10 | ||||
| -rw-r--r-- | conf/machine/nslu2.conf | 5 |
4 files changed, 10 insertions, 9 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 78e3cc0378..b5a580d97b 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -15,7 +15,7 @@ TARGET_OS = "linux" USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" -INHERIT += " package_ipk debian nslu2_flashimg" +INHERIT += " package_ipk debian nslu2-jffs2-image" # NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to # the .bb files for the packages to build - see openslug-packages.conf in this diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index 0376eadd00..39251c5375 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -19,7 +19,7 @@ ARM_INTERWORK = ":thumb-interwork" USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" -INHERIT += " package_ipk debian nslu2_flashimg" +INHERIT += " package_ipk debian nslu2-jffs2-image" # The OVERRIDES are modified here so that 'openslug' overrides are picked up if # present (ucslugc overrides take precedence). diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 75c251f220..06331707fc 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 = "5.5-beta" +DISTRO_VERSION = "5.6-alpha" DISTRO_TYPE = "beta" # pull in the frozen list of bbfiles @@ -19,7 +19,7 @@ TARGET_OS = "linux" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" -INHERIT += " package_ipk nslu2_flashimg" +INHERIT += " package_ipk nslu2-jffs2-image" IMAGE_FSTYPE = "jffs2" UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}" @@ -43,3 +43,9 @@ PREFERRED_VERSION_glibc ?= "2.2.5" PREFERRED_VERSION_glibc-initial ?= "2.2.5" PREFERRED_VERSION_binutils ?= "2.15.94.0.1" PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" + +PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r29" +PREFERRED_VERSION_unslung-rootfs ?= "2.3r29" +PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r29" +PREFERRED_VERSION_nslu2-linksys-libs ?= "2.3r29" +PREFERRED_VERSION_nslu2-linksys-ramdisk ?= "2.3r29" diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index 3a9a9d9730..1616299ae9 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -120,11 +120,6 @@ NSLU2_PACKAGE_ARCH = "${@['thumbv5tb', 'armv5teb'][bb.data.getVar('ARM_INSTRUCTI #------------------------------------------------------------------------------- # Miscellany #------------------------------------------------------------------------------- -# JBowler(20050811): I don't think any of the following are required (now). -PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" -IMAGE_ROOTFS_SIZE_ext2 = "10240" -IMAGE_ROOTFS_SIZE_ext2.gz = "10240" - SERIAL_CONSOLE = "115200 ttyS0" KERNEL_CONSOLE = "ttyS0,115200n8" USE_VT = "0" |