From b4a7122cacef647dbec3db5c9ebe1e504a7670df Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 20 Sep 2005 07:04:35 +0000 Subject: Updates against mainline OE git-svn-id: https://svn.o-hand.com/repos/poky@26 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- openembedded/conf/distro/familiar-0.8.3.conf | 4 ++-- openembedded/conf/distro/openzaurus-3.5.4.conf | 15 ++++++++++++--- openembedded/conf/distro/openzaurus.conf | 12 ------------ openembedded/conf/distro/openzaurus.inc | 12 ++++++++++++ openembedded/conf/distro/preferred-gpe-versions-2.7.inc | 7 ++++--- 5 files changed, 30 insertions(+), 20 deletions(-) delete mode 100644 openembedded/conf/distro/openzaurus.conf create mode 100644 openembedded/conf/distro/openzaurus.inc (limited to 'openembedded/conf/distro') diff --git a/openembedded/conf/distro/familiar-0.8.3.conf b/openembedded/conf/distro/familiar-0.8.3.conf index 475117ceb..4b3d33dd9 100644 --- a/openembedded/conf/distro/familiar-0.8.3.conf +++ b/openembedded/conf/distro/familiar-0.8.3.conf @@ -21,7 +21,7 @@ PREFERRED_PROVIDER_virtual/libiconv=glibc PREFERRED_PROVIDER_virtual/libintl=glibc PREFERRED_PROVIDER_x11=diet-x11 -PREFERRED_VERSION_hostap-modules ?= "0.3.9 +PREFERRED_VERSION_hostap-modules ?= "0.3.9" # The CSL compiler is unusable because # 1) certain programs stop to compile @@ -37,7 +37,7 @@ PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" PREFERRED_VERSION_qte = "2.3.10" -#OPIE_VERSION = "1.2.0" +OPIE_VERSION = "1.2.1" include conf/distro/preferred-opie-versions.inc # diff --git a/openembedded/conf/distro/openzaurus-3.5.4.conf b/openembedded/conf/distro/openzaurus-3.5.4.conf index 61458c0b0..fbc197086 100644 --- a/openembedded/conf/distro/openzaurus-3.5.4.conf +++ b/openembedded/conf/distro/openzaurus-3.5.4.conf @@ -1,4 +1,4 @@ -include conf/distro/openzaurus.conf +include conf/distro/openzaurus.inc DISTRO = "openzaurus" DISTRO_NAME = "OpenZaurus" DISTRO_VERSION = "3.5.3-snapshot-${DATE}" @@ -27,6 +27,16 @@ KERNEL_CONSOLE = "ttyS0" #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 # @@ -48,12 +58,11 @@ include conf/distro/preferred-opie-versions.inc # PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDER_x11 = "diet-x11" -#PREFERRED_PROVIDER_x11 = "x11" include conf/distro/preferred-gpe-versions-2.7.inc # # E # -include conf/distro/preferred-e-versions.inc +#include conf/distro/preferred-e-versions.inc include conf/distro/poky-additions.inc \ No newline at end of file diff --git a/openembedded/conf/distro/openzaurus.conf b/openembedded/conf/distro/openzaurus.conf deleted file mode 100644 index 9208aeda0..000000000 --- a/openembedded/conf/distro/openzaurus.conf +++ /dev/null @@ -1,12 +0,0 @@ -#@TYPE: Distribution -#@NAME: OpenZaurus -#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org) - -INHERIT += " package_ipk debian" -# For some reason, this doesn't work -# TARGET_OS ?= "linux" -TARGET_OS = "linux" -TARGET_FPU = "soft" - -PARALLEL_INSTALL_MODULES = "1" - diff --git a/openembedded/conf/distro/openzaurus.inc b/openembedded/conf/distro/openzaurus.inc new file mode 100644 index 000000000..9208aeda0 --- /dev/null +++ b/openembedded/conf/distro/openzaurus.inc @@ -0,0 +1,12 @@ +#@TYPE: Distribution +#@NAME: OpenZaurus +#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org) + +INHERIT += " package_ipk debian" +# For some reason, this doesn't work +# TARGET_OS ?= "linux" +TARGET_OS = "linux" +TARGET_FPU = "soft" + +PARALLEL_INSTALL_MODULES = "1" + diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc index 5919f351f..4a3078240 100644 --- a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc +++ b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc @@ -7,13 +7,14 @@ #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.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" +PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs-${CVSDATE}" PREFERRED_VERSION_matchbox-panel ?= "0.9.2" PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" PREFERRED_VERSION_atk ?= "1.9.0" @@ -49,7 +50,7 @@ PREFERRED_VERSION_gpe-today ?= "0.09" PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" PREFERRED_VERSION_dbus ?= "0.23.4" PREFERRED_VERSION_gpe-beam ?= "0.2.8" -PREFERRED_VERSION_gpe-bluetooth ?= "0.44" +PREFERRED_VERSION_gpe-bluetooth ?= "0.45" PREFERRED_VERSION_gpe-su ?= "0.18" PREFERRED_VERSION_gpe-conf ?= "0.1.25" PREFERRED_VERSION_gpe-clock ?= "0.21" @@ -86,7 +87,7 @@ 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" -PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1" +PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" PREFERRED_VERSION_poppler ?= "0.3.3" PREFERRED_VERSION_evince ?= "0.3.2" PREFERRED_VERSION_gpe_mini_browser ?= "0.15" -- cgit v1.2.3