diff options
| author |   Matt Reimer <mattjreimer@gmail.com> | 2006-02-14 20:25:50 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-14 20:25:50 +0000 |
| commit | b35d0ede1afe36421158f8de8c73fddcdc4b0ae0 (patch) | |
| tree | dd419593d42f2774e34eeaa822040ae3d81bd127 /conf | |
| parent | a5e977b62a380031579993527287dc3e2a5a4412 (diff) | |
| parent | 2fcce29b65948e57d6699206339aa9f09affff06 (diff) | |
| download | openembedded-b35d0ede1afe36421158f8de8c73fddcdc4b0ae0.tar.gz | |
merge of 4615881c10f014d7178566b35970b667331af46f
and 77a8dee59907740bd11b7a1d50f49a308fb1c016
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/familiar-0.8.3.conf | 7 | ||||
| -rw-r--r-- | conf/distro/openzaurus-3.5.4.conf | 2 | ||||
| -rw-r--r-- | conf/distro/preferred-e-versions.inc | 38 | ||||
| -rw-r--r-- | conf/machine/poodle-2.4.conf | 2 |
4 files changed, 32 insertions, 17 deletions
diff --git a/conf/distro/familiar-0.8.3.conf b/conf/distro/familiar-0.8.3.conf index f75ad332b9..23a58106ab 100644 --- a/conf/distro/familiar-0.8.3.conf +++ b/conf/distro/familiar-0.8.3.conf @@ -84,10 +84,5 @@ 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 +include conf/distro/preferred-e-versions.inc diff --git a/conf/distro/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf index b67fed685e..08dc292da6 100644 --- a/conf/distro/openzaurus-3.5.4.conf +++ b/conf/distro/openzaurus-3.5.4.conf @@ -68,5 +68,5 @@ include conf/distro/preferred-gpe-versions-2.7.inc # # E # -#include conf/distro/preferred-e-versions.inc +include conf/distro/preferred-e-versions.inc diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/preferred-e-versions.inc index d861944d53..836b28c9d9 100644 --- a/conf/distro/preferred-e-versions.inc +++ b/conf/distro/preferred-e-versions.inc @@ -2,12 +2,32 @@ # 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" + +PREFERRED_PROVIDER_virtual/evas = "evas-x11" +PREFERRED_PROVIDER_virtual/ecore = "ecore-x11" +PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" + +PREFERRED_VERSION_gcc = "3.4.4" diff --git a/conf/machine/poodle-2.4.conf b/conf/machine/poodle-2.4.conf index c055c600fd..a309a8fdee 100644 --- a/conf/machine/poodle-2.4.conf +++ b/conf/machine/poodle-2.4.conf @@ -1,4 +1,4 @@ -PREFERRED_PROVIDER_virtual/kernel = "poodle-kernels" +PREFERRED_PROVIDER_virtual/kernel = "poodle-kernels-2.4-embedix" # Later versions are broken on kernel 2.4 PREFERRED_VERSION_orinoco-modules = "0.13e" |