summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-12-06 12:01:35 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-12-06 12:01:35 +0000
commitaa467290637b8d7ac2401d2b89f13ac5c04eef2f (patch)
tree8b1299175b65878b02de19c0532e5c39e8fdc433 /conf
parent7acfd26c06a4d910fda1f246fa21cb0610c7cf4c (diff)
parent8a4cbfe4e291a9785b09d788b999be2abf3af4cf (diff)
merge of 1836da10f903d9ee68a7255b7a5d899128f4f43c
and d52c3796ab80d51e4749743886263398c84dffac
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/openslug-packages.conf2
-rw-r--r--conf/distro/unslung.conf15
2 files changed, 10 insertions, 7 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index ea126d9032..0c743ef64f 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -58,6 +58,7 @@ ${PKGDIR}/packages/glibc/*.bb \
${PKGDIR}/packages/gnu-config/*.bb \
${PKGDIR}/packages/gphoto2/*.bb \
${PKGDIR}/packages/grep/*.bb \
+${PKGDIR}/packages/groff/*.bb \
${PKGDIR}/packages/gtk-doc/*.bb \
${PKGDIR}/packages/gzip/*.bb \
${PKGDIR}/packages/hal/*.bb \
@@ -84,6 +85,7 @@ ${PKGDIR}/packages/libdvb/*.bb \
${PKGDIR}/packages/libexif/*.bb \
${PKGDIR}/packages/libgphoto2/*.bb \
${PKGDIR}/packages/libgsm/*.bb \
+${PKGDIR}/packages/libiconv/*.bb \
${PKGDIR}/packages/libid3tag/*.bb \
${PKGDIR}/packages/liblockfile/*.bb \
${PKGDIR}/packages/libmad/*.bb \
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 22b041f521..1777135a0d 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -3,11 +3,11 @@
#@DESCRIPTION: Unslung Linux Distribution for the NSLU2
DISTRO_NAME = "Unslung"
-DISTRO_VERSION = "5.6-beta"
+DISTRO_VERSION = "6.2-alpha"
DISTRO_TYPE = "beta"
FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"
-FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"
+FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/native/stable"
FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/stable"
# pull in the frozen list of bbfiles
@@ -57,8 +57,9 @@ 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"
+PREFERRED_PROVIDER_virtual/kernel ?= "unslung-kernel"
+PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r63"
+PREFERRED_VERSION_unslung-rootfs ?= "2.3r63"
+PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
+PREFERRED_VERSION_nslu2-linksys-libs ?= "2.3r63"
+PREFERRED_VERSION_nslu2-linksys-ramdisk ?= "2.3r63"