diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-08-20 12:27:31 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-08-20 12:27:31 +0200 |
| commit | a0ac64bb461533e06f99e865f5b2fc315d033b17 (patch) | |
| tree | 9fa683112d553e0ab76feccac26f11d4be9ec48b /conf/distro/include | |
| parent | f77a615dee76f1c6d560b69ec8c1a245bd46f39c (diff) | |
| parent | 6d77f938e950a882ab500392d9d7074a3dcd15ba (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro/include')
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 3 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-eglibc.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 69cf032a4b..32cfbfb403 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -6,7 +6,7 @@ PREFERRED_VERSION_cairo = "1.8.0" PREFERRED_VERSION_dbus = "1.2.1" PREFERRED_VERSION_dropbear = "0.51" PREFERRED_VERSION_fontconfig = "2.6.0" -PREFERRED_VERSION_glib-2.0 = "2.20.4" +PREFERRED_VERSION_glib-2.0 = "2.21.4" PREFERRED_VERSION_glib-2.0-native = "2.18.0" PREFERRED_VERSION_glibmm = "2.18.0" PREFERRED_VERSION_glproto = "1.4.9" @@ -28,6 +28,7 @@ PREFERRED_VERSION_pango = "1.24.4" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.15" +PREFERRED_VERSION_python = "2.6.1" PREFERRED_VERSION_samba = "3.3.0" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index 92e22332b7..e947833453 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -3,6 +3,8 @@ require conf/distro/include/eglibc.inc TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" +TARGET_OS = "linux${@['','-gnuspe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', 'powerpc'] and bb.data.getVar('MACHINE',d) in ['calamari']]}" + #TARGET_OS = "linux-gnuspe" #mess with compiler flags to use -Os instead of -O2 diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 5eff3db83b..d881202b09 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -635,7 +635,7 @@ PREFERRED_VERSION_gtkmm ?= "2.10.10" PREFERRED_VERSION_gtk-sato-engine ?= "0.1" PREFERRED_VERSION_gtk-sharp ?= "2.10.2" PREFERRED_VERSION_gtk-smooth-engine ?= "0.5.8" -PREFERRED_VERSION_gtksourceview ?= "1.7.2" +PREFERRED_VERSION_gtksourceview1 ?= "1.7.2" PREFERRED_VERSION_gtkterm2 ?= "0.2.3" PREFERRED_VERSION_gtk-xfce-engine ?= "2.4.1" PREFERRED_VERSION_gtracer ?= "0.0.10" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 342d785d29..a9cc84fde4 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -39,8 +39,6 @@ SRCREV_pn-dfu-util-native ?= "4160" SRCREV_pn-diversity-daemon ?= "571" SRCREV_pn-diversity-radar ?= "453" SRCREV_pn-eds-dbus ?= "736" -SRCREV_pn-eglibc ?= "8139" -SRCREV_pn-eglibc-initial ?= "8139" SRCREV_pn-enlazar ?= "37" SRCREV_pn-essential-dialer ?= "194" SRCREV_pn-exalt ?= "79" |