From dd1b4430b5d74ee7f3827ed6eed56a2bd5f99d42 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 10 Feb 2006 11:45:39 +0000 Subject: Pull conf file updates from OE git-svn-id: https://svn.o-hand.com/repos/poky/trunk@270 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- openembedded/conf/distro/familiar-0.8.3.conf | 66 --------------------- openembedded/conf/distro/familiar-distro.conf | 11 ---- openembedded/conf/distro/maemo-1.0.conf | 2 +- openembedded/conf/distro/openzaurus-3.5.4.conf | 71 ----------------------- openembedded/conf/distro/openzaurus.conf | 7 +++ openembedded/conf/distro/preferred-e-versions.inc | 32 +++++++--- 6 files changed, 31 insertions(+), 158 deletions(-) delete mode 100644 openembedded/conf/distro/familiar-0.8.3.conf delete mode 100644 openembedded/conf/distro/familiar-distro.conf delete mode 100644 openembedded/conf/distro/openzaurus-3.5.4.conf (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 deleted file mode 100644 index 53614d929..000000000 --- a/openembedded/conf/distro/familiar-0.8.3.conf +++ /dev/null @@ -1,66 +0,0 @@ -DISTRO = "familiar" -DISTRO_NAME = "Familiar Linux" -DISTRO_VERSION = "v0.8.3-unofficial-unsupported-snapshot-${DATE}" - -include conf/distro/familiar.conf - -"${@bb.fatal('This file is unmaintained in the org.oe.dev branch, use the org.openembedded.oz354fam083 branch instead. You can also remove this line, but don't complain if something breaks')}" - - - -DISTRO_TYPE = "debug" -#DISTRO_TYPE = "release" - -FEED_URIS += " \ - base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ - updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" - -#CVSDATE = 20050331 - -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" - -# 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.7.inc - -# -# E -# - - -#23:57 < mickeyl> it's no longer necessary since our cleanup -#23:57 < mickeyl> it may be again when we add cvs versions, but until now, just don't include it - -#include conf/distro/preferred-e-versions.inc - diff --git a/openembedded/conf/distro/familiar-distro.conf b/openembedded/conf/distro/familiar-distro.conf deleted file mode 100644 index 497ba6a89..000000000 --- a/openembedded/conf/distro/familiar-distro.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@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" - diff --git a/openembedded/conf/distro/maemo-1.0.conf b/openembedded/conf/distro/maemo-1.0.conf index 15ec45f34..f83e4b1d9 100644 --- a/openembedded/conf/distro/maemo-1.0.conf +++ b/openembedded/conf/distro/maemo-1.0.conf @@ -11,7 +11,7 @@ FEED_URIS += " \ base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" -#CVSDATE = 20050331 +#SRCDATE = 20050331 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" diff --git a/openembedded/conf/distro/openzaurus-3.5.4.conf b/openembedded/conf/distro/openzaurus-3.5.4.conf deleted file mode 100644 index 8fbcbefa4..000000000 --- a/openembedded/conf/distro/openzaurus-3.5.4.conf +++ /dev/null @@ -1,71 +0,0 @@ -DISTRO = "openzaurus" -DISTRO_NAME = "OpenZaurus" -DISTRO_VERSION = "3.5.3-snapshot-${DATE}" - -include conf/distro/openzaurus.conf - - -# DISTRO_VERSION = "3.5.4" -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" - -# CVSDATE = "20050704" - -# -# Zaurus -# - -ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95" -OEINCLUDELOGS = "yes" -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.7.inc - -# -# E -# -#include conf/distro/preferred-e-versions.inc - diff --git a/openembedded/conf/distro/openzaurus.conf b/openembedded/conf/distro/openzaurus.conf index a935ed4ac..edcbacc80 100644 --- a/openembedded/conf/distro/openzaurus.conf +++ b/openembedded/conf/distro/openzaurus.conf @@ -2,12 +2,19 @@ #@NAME: OpenZaurus #@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org) +DISTRO = "openzaurus" +DISTRO_NAME = "OpenZaurus" + INHERIT += " package_ipk debian" # For some reason, this doesn't work # TARGET_OS ?= "linux" TARGET_OS = "linux" TARGET_FPU = "soft" +BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version" + 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')}" + +include conf/distro/include/multimachine.conf diff --git a/openembedded/conf/distro/preferred-e-versions.inc b/openembedded/conf/distro/preferred-e-versions.inc index d861944d5..e4571f1ae 100644 --- a/openembedded/conf/distro/preferred-e-versions.inc +++ b/openembedded/conf/distro/preferred-e-versions.inc @@ -2,12 +2,26 @@ # Specify which versions of E-related libraries and applications to build # -PREFERRED_VERSION_ecore = "0.9.9.013" -PREFERRED_VERSION_edb = "1.0.5.004" -PREFERRED_VERSION_edje = "0.5.0.013" -PREFERRED_VERSION_eet = "0.9.10.013" -PREFERRED_VERSION_embryo = "0.9.1.013" -PREFERRED_VERSION_etox = "0.9.0.004" -PREFERRED_VERSION_evas = "0.9.9.013" -PREFERRED_VERSION_ewl = "0.0.4.004" -PREFERRED_VERSION_imlib2 = "1.2.1.004" +PREFERRED_VERSION_e = "0.16.999.023" +PREFERRED_VERSION_ecore-x11 = "0.9.9.023" +PREFERRED_VERSION_ecore-native = "0.9.9.023" +PREFERRED_VERSION_edb = "1.0.5.005" +PREFERRED_VERSION_edb-native = "1.0.5.005" +PREFERRED_VERSION_edje = "0.5.0.023" +PREFERRED_VERSION_edje-native = "0.5.0.023" +PREFERRED_VERSION_eet = "0.9.10.023" +PREFERRED_VERSION_eet-native = "0.9.10.023" +PREFERRED_VERSION_embryo = "0.9.1.023" +PREFERRED_VERSION_embryo-native = "0.9.1.023" +PREFERRED_VERSION_emotion = "0.0.1.004" +PREFERRED_VERSION_emotion-native = "0.0.1.004" +PREFERRED_VERSION_epeg = "0.9.0.005" +PREFERRED_VERSION_epsilon = "0.3.0.005" +PREFERRED_VERSION_esmart-x11 = "0.9.0.005" +PREFERRED_VERSION_evas-x11 = "0.9.9.023" +PREFERRED_VERSION_evas-native = "0.9.9.023" +PREFERRED_VERSION_ewl = "0.0.4.005" +PREFERRED_VERSION_imlib2-x11 = "1.2.1.010" +PREFERRED_VERSION_imlib2-native = "1.2.1.010" +PREFERRED_VERSION_e-wm = "0.16.999.023" +PREFERRED_VERSION_entrance = "0.9.0.005" -- cgit v1.2.3