diff options
Diffstat (limited to 'conf/distro')
-rw-r--r-- | conf/distro/angstrom-2007.1.conf | 8 | ||||
-rw-r--r-- | conf/distro/angstrom-2008.1.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/angstrom-2007-preferred-versions.inc | 19 | ||||
-rw-r--r-- | conf/distro/include/moko-autorev.inc | 2 | ||||
-rw-r--r-- | conf/distro/include/sane-srcdates.inc | 1 | ||||
-rw-r--r-- | conf/distro/include/slugos.inc | 2 | ||||
-rw-r--r-- | conf/distro/unslung.conf | 2 |
7 files changed, 17 insertions, 19 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index f36ae8c6fe..380c882c2c 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -6,8 +6,12 @@ #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de> #@-------------------------------------------------------------------- -# The release will the 2007.12 -DISTRO_VERSION = "2007.11RC2.1" +# If you want to use the angstrom 2007.12 release or if +# you want to base you distro on angstrom 2007, switch to +# the org.openembedded.angstrom-2007.12-stable branch +# THIS FILE WILL GO AWAY IN JANUARY 2008!! + +DISTRO_VERSION = "2007.11RC3" DISTRO_REVISION = "51" require conf/distro/include/sane-srcdates.inc diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 85b2916a44..3794a66edb 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -53,7 +53,7 @@ MACHINE_KERNEL_VERSION = "2.6" PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh19" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against PREFERRED_VERSION_linux-libc-headers = "2.6.23" diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index 1b6ed46ac7..97fed90f21 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -174,7 +174,7 @@ PREFERRED_VERSION_classpath-minimal ?= "0.95" PREFERRED_VERSION_classpath-minimal-native ?= "0.95" PREFERRED_VERSION_clearsilver ?= "0.10.3" PREFERRED_VERSION_clish ?= "0.7.1" -PREFERRED_VERSION_cmake-native ?= "2.2.3" +PREFERRED_VERSION_cmake-native ?= "2.4.7" PREFERRED_VERSION_cms92init ?= "0.1" PREFERRED_VERSION_compositeproto ?= "0.4" PREFERRED_VERSION_comprec ?= "0.02" @@ -422,7 +422,7 @@ PREFERRED_VERSION_galago-daemon ?= "0.3.4" PREFERRED_VERSION_galculator ?= "1.2.3" PREFERRED_VERSION_gallery ?= "1.5.5" PREFERRED_VERSION_gamin ?= "0.1.8" -PREFERRED_VERSION_gammu ?= "1.13.0" +PREFERRED_VERSION_gammu ?= "1.17.0" PREFERRED_VERSION_gawk ?= "3.1.4" PREFERRED_VERSION_gawk-native ?= "3.1.4" PREFERRED_VERSION_gcalctool ?= "5.7.32" @@ -709,11 +709,6 @@ PREFERRED_VERSION_imlib ?= "1.9.15" PREFERRED_VERSION_imlib2 ?= "1.4.0.002" PREFERRED_VERSION_imposter ?= "0.3" PREFERRED_VERSION_inetutils ?= "1.4.2" -PREFERRED_VERSION_initramfs-jffs2 ?= "0.1" -PREFERRED_VERSION_initramfs-module-block ?= "0.1" -PREFERRED_VERSION_initramfs-module-loop ?= "0.1" -PREFERRED_VERSION_initramfs-module-nfs ?= "0.1" -PREFERRED_VERSION_initramfs-uniboot ?= "0.2" PREFERRED_VERSION_initscripts ?= "1.0" PREFERRED_VERSION_initscripts-openprotium ?= "1.0" PREFERRED_VERSION_initscripts-slugos ?= "1.0" @@ -1169,7 +1164,6 @@ PREFERRED_VERSION_m4-native ?= "1.4.8" PREFERRED_VERSION_macchanger ?= "1.5.0" PREFERRED_VERSION_madfu ?= "1.2" PREFERRED_VERSION_madplay ?= "0.15.2b" -PREFERRED_VERSION_madwifi-ng ?= "r2518-20070626" PREFERRED_VERSION_mahjongg ?= "1.0.0" PREFERRED_VERSION_mailutils ?= "0.3.1" PREFERRED_VERSION_mailx ?= "8.1.2-0.20050715cvs" @@ -1502,7 +1496,7 @@ PREFERRED_VERSION_python-dbus ?= "0.81.1" PREFERRED_VERSION_python-fam ?= "1.1.1" PREFERRED_VERSION_python-fnorb ?= "1.3" PREFERRED_VERSION_python-fpconst ?= "0.6.0" -PREFERRED_VERSION_python-gammu ?= "0.21" +PREFERRED_VERSION_python-gammu ?= "0.24" PREFERRED_VERSION_python-gmpy ?= "1.0.1" PREFERRED_VERSION_python-gnosis ?= "1.2.2" PREFERRED_VERSION_python-gst ?= "0.10.8" @@ -1622,7 +1616,7 @@ PREFERRED_VERSION_qscintilla ?= "1.65-gpl-1.6" PREFERRED_VERSION_qsvn ?= "0.3.0" PREFERRED_VERSION_qt-x11-free ?= "3.3.7" PREFERRED_VERSION_qt-x11-free-native ?= "3.3.5" -PREFERRED_VERSION_qt4-x11-free ?= "4.3.2" +PREFERRED_VERSION_qt4-x11-free ?= "4.3.3" PREFERRED_VERSION_qtplot ?= "0.2" PREFERRED_VERSION_quagga ?= "0.99.8" PREFERRED_VERSION_quake1 ?= "0.0.1" @@ -1660,6 +1654,7 @@ PREFERRED_VERSION_rfakeap ?= "0.2" PREFERRED_VERSION_rglueap ?= "0.1" PREFERRED_VERSION_rhythmbox ?= "0.8.7" PREFERRED_VERSION_rlpr ?= "2.05" +PREFERRED_VERSION_roadmap-gtk2 ?= "1.1.0" PREFERRED_VERSION_rott ?= "1.0" PREFERRED_VERSION_rox-filer ?= "2.5" PREFERRED_VERSION_rp-pppoe ?= "3.8" @@ -1898,7 +1893,7 @@ PREFERRED_VERSION_udhcp ?= "0.9.8" PREFERRED_VERSION_ufraw ?= "0.12" PREFERRED_VERSION_uicmoc-native ?= "2.3.10" PREFERRED_VERSION_uicmoc3-native ?= "3.3.5" -PREFERRED_VERSION_uicmoc4-native ?= "4.3.2" +PREFERRED_VERSION_uicmoc4-native ?= "4.3.3" PREFERRED_VERSION_uim ?= "1.3.1" PREFERRED_VERSION_uim-native ?= "1.3.1" PREFERRED_VERSION_uim-tomoe-gtk ?= "0.2.0" @@ -2127,7 +2122,7 @@ PREFERRED_VERSION_zmerlin ?= "0.9.1" PREFERRED_VERSION_zope ?= "3.3.1" PREFERRED_VERSION_zrally ?= "0.90" PREFERRED_VERSION_zrev7 ?= "1.0.1" -PREFERRED_VERSION_zroadmap ?= "1.0.12" +PREFERRED_VERSION_zroadmap ?= "1.1.0" PREFERRED_VERSION_zsafe ?= "2.1.3" PREFERRED_VERSION_zsh ?= "4.1.1" PREFERRED_VERSION_zshopi ?= "0.2" diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 74b930781b..9f8ae61fc3 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -44,7 +44,7 @@ SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}" SRCREV_pn-openocd ?= "${AUTOREV}" SRCREV_pn-openocd-native ?= "${AUTOREV}" -SRCREV_pn-uboot-openmoko ?= "${AUTOREV}" +SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}" SRCREV_pn-dfu-util ?= "${AUTOREV}" SRCREV_pn-dfu-util-native ?= "${AUTOREV}" SRCREV_pn-usbpath ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index b3b47093b7..8f82eb4611 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -148,7 +148,6 @@ SRCDATE_xcompmgr ?= "20060814" SRCDATE_xirssi ?= "20060814" SRCDATE_xsvg ?= "20060814" SRCDATE_yamonenv ?= "20060814" -SRCDATE_zroadmap ?= "20060814" # Freedesktop.org SRCDATE_poppler0.6 = "20070708" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index ab80719646..177a0edfe8 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.7" +SLUGOS_VERSION = "4.8" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 0cf5e8e81e..a946734831 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Unslung Linux Distribution for the NSLU2 DISTRO_NAME = "Unslung" -DISTRO_VERSION = "6.9-alpha" +DISTRO_VERSION = "6.10-beta" DISTRO_TYPE = "beta" FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable" |