diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-12-07 13:16:46 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-12-07 13:16:46 +0000 |
| commit | 01adcdc32700965baeaca4b1a3fbb1ca1ab36956 (patch) | |
| tree | ac91cf1aabb173391f4c02bc10bf215483d995e3 /conf | |
| parent | e68bb9efd673d8f233d510cdcce6568e3c735557 (diff) | |
| parent | d22a25d432f1ff77cf4576dda8806ecb05c4bd71 (diff) | |
merge of 0693fb46494db1408733d460818b696a6d089cc6
and 635857df6c3fb5ea52e288d7b847d28c28cbbdf7
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/openslug-packages.conf | 2 | ||||
| -rw-r--r-- | conf/distro/unslung.conf | 15 |
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" |