Sync more files with OE

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

5 files changed, 216 insertions, 61 deletions

diff --git a/openembedded/conf/distro/familiar-unstable.conf b/openembedded/conf/distro/familiar-unstable.conf
new file mode 100644
index 000000000..1d40bbac5
--- /dev/null
+++ b/openembedded/conf/distro/familiar-unstable.conf
@@ -0,0 +1,72 @@
+DISTRO = "familiar"
+DISTRO_NAME = "Familiar Linux"
+DISTRO_VERSION = "unstable-${DATE}"
+MAINTAINER = "Koen Kooi <koen@handhelds.org>"
+# Do not touch this file before notifying familiar-dev@handhelds.org
+
+include conf/distro/familiar.conf
+
+
+DISTRO_TYPE = "debug"
+#DISTRO_TYPE = "release"
+#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!!
+
+
+FEED_URIS += " \
+        base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
+	updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates"
+
+#SRCDATE = 20050331
+#SRCDATE = "now"
+
+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"
+
+PREFERRED_PROVIDER_virtual/libiconv=glibc
+PREFERRED_PROVIDER_virtual/libintl=glibc
+PREFERRED_PROVIDER_x11=diet-x11
+
+PREFERRED_VERSION_hostap-modules ?= "0.3.9"
+
+#2.4 machines prefer 0.13e ones
+PREFERRED_VERSION_orinoco-modules ?= "0.13e"
+
+#but 0.13e doesn't build against 2.6
+PREFERRED_VERSION_orinoco-modules_h2200 ?= "0.15"
+PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15"
+
+
+
+# The CSL compiler is unusable because
+# 1) certain programs stop to compile
+# 2) more programs segfault
+PREFERRED_VERSION_gcc ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
+
+#
+# Opie
+#
+
+PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
+PREFERRED_VERSION_qte = "2.3.10"
+
+#OPIE_VERSION = "1.2.1"
+#include conf/distro/preferred-opie-versions.inc
+
+#
+# GPE
+#
+
+PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
+PREFERRED_PROVIDER_x11 = "diet-x11"
+
+include conf/distro/preferred-gpe-versions-2.8.inc
+
+#
+# E
+#
+include conf/distro/preferred-e-versions.inc
+
diff --git a/openembedded/conf/distro/familiar.conf b/openembedded/conf/distro/familiar.conf
new file mode 100644
index 000000000..99e501589
--- /dev/null
+++ b/openembedded/conf/distro/familiar.conf
@@ -0,0 +1,16 @@
+#@TYPE: Distribution
+#@NAME: Familiar Linux
+#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org)
+
+INHERIT += "package_ipk debian"
+TARGET_OS = "linux"
+
+PARALLEL_INSTALL_MODULES = "1"
+UDEV_DEVFS_RULES = "1"
+IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version"
+
+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')}"
+
+include conf/distro/include/multimachine.conf
diff --git a/openembedded/conf/distro/openzaurus-unstable.conf b/openembedded/conf/distro/openzaurus-unstable.conf
new file mode 100644
index 000000000..f424b1669
--- /dev/null
+++ b/openembedded/conf/distro/openzaurus-unstable.conf
@@ -0,0 +1,67 @@
+DISTRO_VERSION = ".dev-snapshot-${DATE}"
+
+include conf/distro/openzaurus.conf
+
+DISTRO_TYPE = "debug"
+# DISTRO_TYPE = "release"
+
+#FEED_URIS += " \
+#           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"
+
+# SRCDATE = "20050704"
+
+#
+# Zaurus
+#
+
+ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
+
+KERNEL_CONSOLE = "ttyS0"
+#DEBUG_OPTIMIZATION = "-O -g3"
+#DEBUG_BUILD = "1"
+#INHIBIT_PACKAGE_STRIP = "1"
+
+PREFERRED_VERSION_gcc-cross ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
+
+PREFERRED_VERSION_hostap-modules ?= "0.3.9"
+
+#fix some iconv issues, needs to be adjusted when doing uclibc builds
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+
+
+#
+# Base
+#
+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.1"
+#include conf/distro/preferred-opie-versions.inc
+
+#
+# GPE
+#
+PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDER_x11 = "diet-x11"
+include conf/distro/preferred-gpe-versions-2.8.inc
+
+#
+# E
+#
+include conf/distro/preferred-e-versions.inc
+
diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf
index d628b1d3f..ad35c65b0 100644
--- a/openembedded/conf/distro/poky.conf
+++ b/openembedded/conf/distro/poky.conf
@@ -73,44 +73,44 @@ PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
 #
 # CVS Dates to use:
 #
-#CVSDATE_gnome-vfs-dbus = "20051215"
-CVSDATE_gconf-dbus = "20060119"
-CVSDATE_gnome-vfs-dbus = "20060119"
-CVSDATE_contacts = "20060207"
-CVSDATE_dates = "20060120"
-CVSDATE_eds-dbus = "20060126"
-CVSDATE_minimo = "20050401"
-CVSDATE_ipkg-utils-native = "20050930"
-CVSDATE_ipkg-link-1 = "20050930"
-CVSDATE_ipkg-utils = "20050930"
-CVSDATE_ipkg-link = "20050930"
-CVSDATE_matchbox-common = "20051101"
-CVSDATE_matchbox-config-gtk = "20051101"
-CVSDATE_matchbox-desktop = "20060120"
-CVSDATE_matchbox-keyboard = "20051101"
-CVSDATE_matchbox-panel = "20051101"
-CVSDATE_matchbox-panel-manager = "20051101"
-CVSDATE_matchbox-stroke = "20051101"
-CVSDATE_matchbox-themes-extra = "20051101"
-CVSDATE_matchbox-wm = "20060120"
-CVSDATE_libmatchbox = "20060120"
-CVSDATE_tslib = "20051101"
-CVSDATE_xext = "20051101"
-CVSDATE_renderext = "20051101"
-CVSDATE_libxrender = "20051101"
-CVSDATE_fixesext = "20051101"
-CVSDATE_damageext = "20051101"
-CVSDATE_compositeext = "20051101"
-CVSDATE_xcalibrateext = "20051101"
-CVSDATE_recordext = "20051101"
-CVSDATE_libfakekey = "20051101"
-CVSDATE_xmodmap = "20051101"
-CVSDATE_xrandr = "20051101"
-CVSDATE_xtst = "20051101"
-CVSDATE_xcalibrate = "20051101"
-CVSDATE_xmu = "20051115"
-CVSDATE_xdpyinfo = "20051115"
-CVSDATE_xauth = "20060120"
+#SRCDATE_gnome-vfs-dbus = "20051215"
+SRCDATE_gconf-dbus = "20060119"
+SRCDATE_gnome-vfs-dbus = "20060119"
+SRCDATE_contacts = "20060207"
+SRCDATE_dates = "20060120"
+SRCDATE_eds-dbus = "20060126"
+SRCDATE_minimo = "20050401"
+SRCDATE_ipkg-utils-native = "20050930"
+SRCDATE_ipkg-link-1 = "20050930"
+SRCDATE_ipkg-utils = "20050930"
+SRCDATE_ipkg-link = "20050930"
+SRCDATE_matchbox-common = "20051101"
+SRCDATE_matchbox-config-gtk = "20051101"
+SRCDATE_matchbox-desktop = "20060120"
+SRCDATE_matchbox-keyboard = "20051101"
+SRCDATE_matchbox-panel = "20051101"
+SRCDATE_matchbox-panel-manager = "20051101"
+SRCDATE_matchbox-stroke = "20051101"
+SRCDATE_matchbox-themes-extra = "20051101"
+SRCDATE_matchbox-wm = "20060120"
+SRCDATE_libmatchbox = "20060120"
+SRCDATE_tslib = "20051101"
+SRCDATE_xext = "20051101"
+SRCDATE_renderext = "20051101"
+SRCDATE_libxrender = "20051101"
+SRCDATE_fixesext = "20051101"
+SRCDATE_damageext = "20051101"
+SRCDATE_compositeext = "20051101"
+SRCDATE_xcalibrateext = "20051101"
+SRCDATE_recordext = "20051101"
+SRCDATE_libfakekey = "20051101"
+SRCDATE_xmodmap = "20051101"
+SRCDATE_xrandr = "20051101"
+SRCDATE_xtst = "20051101"
+SRCDATE_xcalibrate = "20051101"
+SRCDATE_xmu = "20051115"
+SRCDATE_xdpyinfo = "20051115"
+SRCDATE_xauth = "20060120"
 
 #
 # Preferred Versions:
@@ -118,15 +118,15 @@ CVSDATE_xauth = "20060120"
 PREFERRED_VERSION_matchbox = "0.9.1"
 PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
 PREFERRED_VERSION_matchbox-applet-startup-monitor = "0.1"
-PREFERRED_VERSION_matchbox-common = "0.9.1+cvs-${CVSDATE}"
-PREFERRED_VERSION_matchbox-config-gtk = "0.0+cvs-${CVSDATE}"
-PREFERRED_VERSION_matchbox-desktop = "0.9.1+cvs-${CVSDATE}"
-PREFERRED_VERSION_matchbox-keyboard = "0.0+cvs-${CVSDATE}"
-PREFERRED_VERSION_matchbox-panel = "0.9.2+cvs-${CVSDATE}"
-PREFERRED_VERSION_matchbox-stroke = "0.0+cvs-${CVSDATE}"
-PREFERRED_VERSION_matchbox-themes-extra = "0.3+cvs-${CVSDATE}"
-PREFERRED_VERSION_matchbox-wm = "0.9.5+cvs-${CVSDATE}"
-PREFERRED_VERSION_libmatchbox = "1.7+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-common = "0.9.1+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-config-gtk = "0.0+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-desktop = "0.9.1+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-keyboard = "0.0+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-panel = "0.9.2+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-stroke = "0.0+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-themes-extra = "0.3+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-wm = "0.9.5+svn${SRCDATE}"
+PREFERRED_VERSION_libmatchbox = "1.7+svn${SRCDATE}"
 
 #PREFERRED_VERSION_atk = "1.10.0"
 #PREFERRED_VERSION_cairo = "1.0.0"
@@ -155,18 +155,18 @@ PREFERRED_VERSION_libschedule ?= "0.15"
 PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
 PREFERRED_VERSION_linphone ?= "0.12.2"
 PREFERRED_VERSION_minilite ?= "0.49"
-PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
+PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}"
 PREFERRED_VERSION_poppler ?= "0.3.3"
-PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}"
 PREFERRED_VERSION_rxvt-unicode ?= "5.6"
 PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
 PREFERRED_VERSION_xdemineur ?= "2.1.1"
 PREFERRED_VERSION_xextensions ?= "1.0.1"
-PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
+PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
 PREFERRED_VERSION_xmonobut ?= "0.4"
-PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 
+PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" 
 PREFERRED_VERSION_xproto ?= "6.6.2"
-PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
 PREFERRED_VERSION_xst ?= "0.15"
 
-PREFERRED_VERSION_oprofile ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_oprofile ?= "0.0+cvs${SRCDATE}"
diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
index e535f4e12..f8af96435 100644
--- a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc
@@ -3,7 +3,7 @@
 #
 
 #work around some breakages
-#CVSDATE_minimo=20050401
+#SRCDATE_minimo=20050401
 
 #set some preferred providers:
 PREFERRED_PROVIDER_gconf=gconf-dbus
@@ -14,7 +14,7 @@ PREFERRED_VERSION_libmatchbox ?= "1.7"
 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.5+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-wm ?= "0.9.5+svn${SRCDATE}"
 PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
 PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
 PREFERRED_VERSION_atk ?= "1.9.0"
@@ -36,10 +36,10 @@ PREFERRED_VERSION_rxvt-unicode ?= "5.6"
 PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
 PREFERRED_VERSION_xst ?= "0.15"
 PREFERRED_VERSION_xextensions ?= "1.0.1"
-PREFERRED_VERSION_xserver-kdrive = "0.0cvs20050207"
-PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" 
-PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
-PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207"
+PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" 
+PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
+PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
 PREFERRED_VERSION_gpe-login ?= "0.83"
 PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
 PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
@@ -82,9 +82,9 @@ PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
 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_rosetta ?= "0.0+cvs${SRCDATE}"
 PREFERRED_VERSION_dillo2 ?= "0.6.6"
-PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
+PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}"
 PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
 PREFERRED_VERSION_linphone ?= "0.12.2"
 PREFERRED_VERSION_firefox ?= "1.0"