angstrom 2007: remove some preferred version that are already in the lockdown file

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 4c4f436..542199d 100644 (file)
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -58,26 +58,6 @@ PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.21-hh17"
 RDEPENDS_kernel-base_hx4700 = ""
 RDEPENDS_kernel-base_htcuniversal = ""
 
-# Needed for crappy ipaqs with broken hostap in the kernel
-PREFERRED_VERSION_hostap-modules                    ?= "0.4.7"
-PREFERRED_VERSION_hostap-utils                      ?= "0.4.7"
-
-PREFERRED_VERSION_file         = "4.18"
-PREFERRED_VERSION_file_native  = "4.18"
-
-PREFERRED_VERSION_fontconfig       = "2.4.1"
-PREFERRED_VERSION_freetype         = "2.3.4"
-PREFERRED_VERSION_freetype-native  = "2.2.1"
-PREFERRED_VERSION_cairo            = "1.4.10"
-PREFERRED_VERSION_glib-2.0         = "2.12.12"
-PREFERRED_VERSION_pango            = "1.16.4"
-PREFERRED_VERSION_atk              = "1.20.0"
-PREFERRED_VERSION_gtk+             = "2.10.14"
-
-# newer poppler cvs breaks some apps, fix until popper 6 and apps
-# catch up with api changes
-# PREFERRED_VERSION_poppler          = "0.5.4"
-
 # older gtk-webcore releases don't work on ARM/EABI
 # We need to switch to a fixed SRCDATE or release as soon as possible 
 PREFERRED_VERSION_osb-browser      = "0.5.0+svn${SRCDATE}"
@@ -91,14 +71,10 @@ PREFERRED_PROVIDER_avahi = "avahi"
 PREFERRED_PROVIDER_virtual/xserver  ?= "xserver-kdrive"
 PREFERRED_PROVIDER_xserver          ?= "xserver-kdrive"
 
-PREFERRED_VERSION_xserver-kdrive    ?= "1.3.0.0"
 PREFERRED_VERSION_libxrandr         ?= "1.2.1"
 PREFERRED_VERSION_xrandr            ?= "1.2.0" 
 PREFERRED_VERSION_randrproto        ?= "1.2.1"
 
-PREFERRED_VERSION_libgnomeui         = "2.18.1"
-PREFERRED_VERSION_prismstumbler      = "0.7.3"
-
 #use EABI ready toolchain
 PREFERRED_VERSION_gcc               ?= "4.1.2"
 PREFERRED_VERSION_gcc-cross         ?= "4.1.2"
@@ -149,13 +125,6 @@ PREFERRED_VERSION_glibc-initial ?= "2.5"
 # PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3"
 # PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
 
-
-# Busybox <1.1.0 doesn't have EABI support
-PREFERRED_VERSION_busybox = "1.2.1"
-
-PREFERRED_VERSION_dbus ?= "1.0.2"
-PREFERRED_VERSION_dbus-glib ?= "0.74"
-
 #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 require conf/distro/include/preferred-e-versions.inc