More merging from OE

git-svn-id: https://svn.o-hand.com/repos/poky@172 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 9 insertions, 91 deletions

diff --git a/openembedded/conf/distro/openzaurus-3.5.4.conf b/openembedded/conf/distro/openzaurus-3.5.4.conf
index d7780e8605..10214614f9 100644
--- a/openembedded/conf/distro/openzaurus-3.5.4.conf
+++ b/openembedded/conf/distro/openzaurus-3.5.4.conf
@@ -10,12 +10,13 @@ DISTRO_TYPE = "debug"
 # DISTRO_TYPE = "release"
 
 FEED_URIS += " \
-        upgrades##http://openzaurus.org/official/unstable/3.5.3/upgrades/       \
-        machine##http://openzaurus.org/official/unstable/3.5.3/feed/machine/${MACHINE} \
-        base##http://openzaurus.org/official/unstable/3.5.3/feed/base/          \
-        libs##http://openzaurus.org/official/unstable/3.5.3/feed/libs/          \
-        console##http://openzaurus.org/official/unstable/3.5.3/feed/console     \
-        devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel"
+           upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
+upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
+            machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
+               base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
+               libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
+            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
+              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
 
 # CVSDATE = "20050704"
 
@@ -68,4 +69,4 @@ include conf/distro/preferred-gpe-versions-2.7.inc
 #
 #include conf/distro/preferred-e-versions.inc
 
-include conf/distro/poky-additions.inc
\ No newline at end of file
+include conf/distro/poky-additions.inc
diff --git a/openembedded/conf/distro/openzaurus.conf b/openembedded/conf/distro/openzaurus.conf
index 9208aeda09..a935ed4ac2 100644
--- a/openembedded/conf/distro/openzaurus.conf
+++ b/openembedded/conf/distro/openzaurus.conf
@@ -10,3 +10,4 @@ TARGET_FPU = "soft"
 
 PARALLEL_INSTALL_MODULES = "1"
 
+DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
diff --git a/openembedded/conf/distro/preferred-gpe-versions.inc b/openembedded/conf/distro/preferred-gpe-versions.inc
deleted file mode 100644
index de4fdb15bf..0000000000
--- a/openembedded/conf/distro/preferred-gpe-versions.inc
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Specify which versions of GPE (and related) applications to build
-#
-
-#work around some breakages
-#CVSDATE_xext=20050222
-
-#set some preferred providers:
-#PREFERRED_PROVIDER_gconf=gconf-dbus
-PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
-
-#specify versions, as the header says :)
-#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.3"
-#PREFERRED_VERSION_matchbox-panel ?= "0.9.1"
-#PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
-#PREFERRED_VERSION_gtk+ ?= "2.6.3"
-#PREFERRED_VERSION_libgpewidget ?= "0.97"
-#PREFERRED_VERSION_libgpepimc ?= "0.4"
-#PREFERRED_VERSION_libgpevtype ?= "0.11"
-#PREFERRED_VERSION_libschedule ?= "0.14"
-#PREFERRED_VERSION_gpe-icons ?= "0.24"
-#PREFERRED_VERSION_libgsm ?= "1.0.10"
-PREFERRED_VERSION_diet-x11 ?= "6.2.1"
-PREFERRED_VERSION_xproto ?= "6.6.2"
-#PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
-PREFERRED_VERSION_rxvt-unicode ?= "5.3"
-#PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
-#PREFERRED_VERSION_xst ?= "0.14"
-PREFERRED_VERSION_xextensions ?= "1.0.1"
-PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 
-PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
-PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
-#PREFERRED_VERSION_gpe-login ?= "0.76"
-#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.36"
-#PREFERRED_VERSION_gpe-today ?= "0.08"
-#PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
-PREFERRED_VERSION_dbus ?= "0.23.4"
-#PREFERRED_VERSION_gpe-bluetooth ?= "0.38"
-#PREFERRED_VERSION_gpe-su ?= "0.18"
-#PREFERRED_VERSION_gpe-conf ?= "0.1.23"
-#PREFERRED_VERSION_gpe-clock ?= "0.20"
-#PREFERRED_VERSION_gpe-mininet ?= "0.5"
-#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_minimo}"
-#PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
-#PREFERRED_VERSION_linphone ?= "0.12.2"
-#PREFERRED_VERSION_firefox ?= "1.0"
-