refactor GPE versions out into preferred-gpe-versions.inc

BKrev: 420e0aaf3OwoBPCFYJvafYgrZPoCSQ

4 files changed, 16 insertions, 168 deletions

diff --git a/conf/distro/familiar-0.8.1.conf b/conf/distro/familiar-0.8.1.conf
index b2bb42dfc0..4e7ed880cd 100644
--- a/conf/distro/familiar-0.8.1.conf
+++ b/conf/distro/familiar-0.8.1.conf
@@ -41,73 +41,4 @@ PREFERRED_VERSION_libqpe-opie = 1.1.9+cvs-${CVSDATE}
 
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 
-PREFERRED_VERSION_libmatchbox = "1.6"
-PREFERRED_VERSION_matchbox = "0.9.1"
-PREFERRED_VERSION_matchbox-common = "0.9.1"
-PREFERRED_VERSION_matchbox-desktop = "0.9.1"
-PREFERRED_VERSION_matchbox-wm = "0.9.2"
-PREFERRED_VERSION_matchbox-panel = "0.9.1"
-PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
-PREFERRED_VERSION_gtk+ = "2.6.2"
-#PREFERRED_VERSION_libgpewidget = "0.97"
-PREFERRED_VERSION_libgpepimc = "0.4"
-PREFERRED_VERSION_libgpevtype = "0.7"
-PREFERRED_VERSION_libschedule = "0.13"
-PREFERRED_VERSION_gpe-icons = "0.24"
-PREFERRED_VERSION_libgsm = "1.0.10"
-PREFERRED_VERSION_diet-x11 = "6.2.1"
-PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1"
-PREFERRED_VERSION_rxvt-unicode = "4.8"
-PREFERRED_VERSION_gtk2-theme-angelistic = "0.3"
-PREFERRED_VERSION_xst = "0.14"
-PREFERRED_VERSION_xprop = "0.0cvs${CVSDATE}" 
-PREFERRED_VERSION_xhost = "0.0cvs20040413"
-PREFERRED_VERSION_xrdb = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_gpe-login = "0.75"
-PREFERRED_VERSION_gpe-session-scripts = "0.62"
-PREFERRED_VERSION_gpe-soundserver = "0.4-1"
-PREFERRED_VERSION_gpe-todo = "0.50"
-PREFERRED_VERSION_gpe-calendar = "0.61"
-PREFERRED_VERSION_gpe-sketchbox = "0.2.8"
-PREFERRED_VERSION_gpe-contacts = "0.34"
-PREFERRED_VERSION_gpe-today = "0.08"
-PREFERRED_VERSION_matchbox-panel-manager = "0.1"
-PREFERRED_VERSION_dbus = "0.23"
-#PREFERRED_VERSION_gpe-bluetooth = "0.37"
-PREFERRED_VERSION_gpe-su = "0.18"
-PREFERRED_VERSION_gpe-conf = "0.1.22"
-PREFERRED_VERSION_gpe-clock = "0.20"
-PREFERRED_VERSION_gpe-mininet = "0.4"
-PREFERRED_VERSION_gpe-mixer = "0.40"
-PREFERRED_VERSION_gpe-shield = "0.7"
-PREFERRED_VERSION_gpe-wlancfg = "0.2.6"
-PREFERRED_VERSION_gpe-taskmanager = "0.17"
-PREFERRED_VERSION_keylaunch = "2.0.7"
-PREFERRED_VERSION_minilite = "0.47"
-PREFERRED_VERSION_xmonobut = "0.4"
-PREFERRED_VERSION_gpe-edit = "0.28"
-PREFERRED_VERSION_gpe-gallery = "0.95"
-PREFERRED_VERSION_gpe-calculator = "0.2"
-PREFERRED_VERSION_gpe-package = "0.2"
-PREFERRED_VERSION_gpe-soundbite = "1.0.5"
-PREFERRED_VERSION_gpe-terminal = "1.1"
-PREFERRED_VERSION_gpe-watch = "0.10"
-PREFERRED_VERSION_gpe-what = "0.33"
-PREFERRED_VERSION_gpe-filemanager = "0.20"
-PREFERRED_VERSION_gpe-go = "0.05"
-PREFERRED_VERSION_gpe-irc = "0.07"
-PREFERRED_VERSION_gpe-lights = "0.13"
-#PREFERRED_VERSION_gpe-nmf = "0.19"
-PREFERRED_VERSION_gpe-othello = "0.2-1"
-PREFERRED_VERSION_gpe-plucker = "0.2"
-PREFERRED_VERSION_gpe-tetris = "0.6-2"
-PREFERRED_VERSION_gsoko = "0.4.2-gpe6"
-PREFERRED_VERSION_xdemineur = "2.1.1"
-PREFERRED_VERSION_matchbox-panel-hacks = "0.3-1"
-PREFERRED_VERSION_rosetta = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_dillo2 = "0.6.6"
-PREFERRED_VERSION_minimo = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_linphone-hh = "0.12.2.hh1"
-PREFERRED_VERSION_linphone = "0.12.2"
-PREFERRED_VERSION_firefox = "1.0"
-
+include conf/distro/preferred-gpe-versions.inc
diff --git a/conf/distro/grant.conf b/conf/distro/grant.conf
deleted file mode 100644
index 30bbb831f2..0000000000
--- a/conf/distro/grant.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-INHERIT += " package_ipk debian"
-DISTRO = "grant-openzaurus"
-
-FEED_URIS_openzaurus = "OZ-3.5.2##http://openzaurus.org/official/unstable/3.5.2/feed/ \
-              OZ-Upgrades##http://openzaurus.org/official/unstable/3.5.2/upgrades/"
-
-ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
-PREFERRED_PROVIDERS = " virtual/libqpe:libqpe-opie"
-PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-OEINCLUDELOGS = "yes"
-KERNEL_CONSOLE = "tty1"
-TARGET_FPU = "soft"
-
-
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index 3f08c02e9f..77f7283dbb 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -13,15 +13,13 @@ FEED_URIS += " \
 	console##http://openzaurus.org/official/unstable/3.5.2/feed/console     \
 	devel##http://openzaurus.org/official/unstable/3.5.2/feed/devel"
 
-CVSDATE = "20050210"
-ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
-PREFERRED_PROVIDERS = " virtual/libqpe:libqpe-opie"
-PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+CVSDATE = "20050213"
+
+#
+# Zaurus
+#
 
+ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
 OEINCLUDELOGS = "yes"
 KERNEL_CONSOLE = "tty1"
 #DEBUG_OPTIMIZATION = "-O -g3"
@@ -33,11 +31,15 @@ KERNEL_CONSOLE = "tty1"
 #
 
 PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
-
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 #
 # Opie
 #
 
+PREFERRED_PROVIDERS = " virtual/libqpe:libqpe-opie"
+
 OPIE_VERSION = "1.2.0"
 include conf/distro/preferred-opie-versions.inc
 
@@ -45,74 +47,8 @@ include conf/distro/preferred-opie-versions.inc
 # GPE
 #
 
-PREFERRED_VERSION_libmatchbox = "1.4"
-PREFERRED_VERSION_matchbox = "0.8.1"
-PREFERRED_VERSION_matchbox-common = "0.8"
-PREFERRED_VERSION_matchbox-desktop = "0.8.1"
-PREFERRED_VERSION_matchbox-wm = "0.8.4"
-PREFERRED_VERSION_matchbox-panel = "0.8.3"
-PREFERRED_VERSION_matchbox-applet-inputmanager = "0.5"
-PREFERRED_VERSION_gtk+ = "2.4.13"
-PREFERRED_VERSION_libgpewidget = "0.96"
-PREFERRED_VERSION_libgpepimc = "0.3"
-PREFERRED_VERSION_libgpevtype = "0.5"
-PREFERRED_VERSION_libschedule = "0.13"
-PREFERRED_VERSION_gpe-icons = "0.24"
-PREFERRED_VERSION_libgsm = "1.0.10"
-PREFERRED_VERSION_diet-x11 = "6.2.1"
-PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1"
-PREFERRED_VERSION_rxvt-unicode = "4.9"
-PREFERRED_VERSION_gtk2-theme-angelistic = "0.3"
-CVSDATE_xext = "20041120"
-PREFERRED_VERSION_xst = "0.14"
-PREFERRED_VERSION_xprop = "0.0cvs${CVSDATE}" 
-PREFERRED_VERSION_xhost = "0.0cvs20040413"
-PREFERRED_VERSION_xrdb = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_gpe-login = "0.73"
-PREFERRED_VERSION_gpe-session-scripts = "0.62"
-PREFERRED_VERSION_gpe-soundserver = "0.4-1"
-PREFERRED_VERSION_gpe-todo = "0.50"
-PREFERRED_VERSION_gpe-calendar = "0.58"
-PREFERRED_VERSION_gpe-sketchbox = "0.2.8"
-PREFERRED_VERSION_gpe-contacts = "0.33"
-PREFERRED_VERSION_gpe-today = "0.08"
-PREFERRED_VERSION_matchbox-panel-manager = "0.1"
-PREFERRED_VERSION_dbus = "0.22"
-PREFERRED_VERSION_gpe-bluetooth = "0.37"
-PREFERRED_VERSION_gpe-su = "0.18"
-PREFERRED_VERSION_gpe-conf = "0.1.22"
-PREFERRED_VERSION_gpe-clock = "0.14"
-PREFERRED_VERSION_gpe-mininet = "0.4"
-PREFERRED_VERSION_gpe-mixer = "0.40"
-PREFERRED_VERSION_gpe-shield = "0.6"
-PREFERRED_VERSION_gpe-wlancfg = "0.2.6"
-PREFERRED_VERSION_gpe-taskmanager = "0.17"
-PREFERRED_VERSION_keylaunch = "2.0.7"
-PREFERRED_VERSION_minilite = "0.44"
-PREFERRED_VERSION_xmonobut = "0.4"
-PREFERRED_VERSION_gpe-edit = "0.28"
-PREFERRED_VERSION_gpe-gallery = "0.95"
-PREFERRED_VERSION_gpe-calculator = "0.2"
-PREFERRED_VERSION_gpe-package = "0.2"
-PREFERRED_VERSION_gpe-soundbite = "1.0.5"
-PREFERRED_VERSION_gpe-terminal = "1.1"
-PREFERRED_VERSION_gpe-watch = "0.10"
-PREFERRED_VERSION_gpe-what = "0.31"
-PREFERRED_VERSION_gpe-filemanager = "0.20"
-PREFERRED_VERSION_gpe-go = "0.05"
-PREFERRED_VERSION_gpe-irc = "0.07"
-PREFERRED_VERSION_gpe-lights = "0.12"
-PREFERRED_VERSION_gpe-nmf = "0.19"
-PREFERRED_VERSION_gpe-othello = "0.2-1"
-PREFERRED_VERSION_gpe-plucker = "0.1"
-PREFERRED_VERSION_gpe-tetris = "0.6-2"
-PREFERRED_VERSION_gsoko = "0.4.2-gpe5"
-PREFERRED_VERSION_xdemineur = "2.1.1"
-PREFERRED_VERSION_matchbox-panel-hacks = "0.3-1"
-PREFERRED_VERSION_rosetta = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_dillo2 = "0.6.6"
-PREFERRED_VERSION_minimo = "0.0cvs${CVSDATE}"
-PREFERRED_VERSION_linphone-hh = "0.12.2.hh1"
-PREFERRED_VERSION_linphone = "0.12.2"
-PREFERRED_VERSION_firefox = "1.0"
+PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
+
+include conf/distro/preferred-gpe-versions.inc
 
diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/distro/preferred-gpe-versions.inc