summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/openslug.conf2
-rw-r--r--conf/distro/ucslugc.conf2
-rw-r--r--conf/distro/unslung.conf10
3 files changed, 10 insertions, 4 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"