diff options
| author | Oyvind Repvik <nail@nslu2-linux.org> | 2006-02-05 01:01:54 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-05 01:01:54 +0000 |
| commit | a1e5ad6c67eaaf22b6223f3f3c2633177d77f4da (patch) | |
| tree | edf3a86d536491c46247a95e76c1910de359e9ae /conf | |
| parent | 0c89a054a6e3279f935d0fd1b1a29d5da3b2089d (diff) | |
| parent | f5c58cb11d713fe6fabccc5265ba461600b0971c (diff) | |
merge of 253b3416d6485c95aa1653ae4d5b49a707d9fbe6
and 9b98e6390444bf96f5e5fa74d89ff83c0083a833
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/familiar-unstable.conf | 7 | ||||
| -rw-r--r-- | conf/distro/openzaurus-unstable.conf | 2 | ||||
| -rw-r--r-- | conf/distro/preferred-e-versions.inc | 32 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-clamshell-2.6.conf | 1 |
4 files changed, 26 insertions, 16 deletions
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index f7d941063d..1d40bbac56 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -68,10 +68,5 @@ include conf/distro/preferred-gpe-versions-2.8.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-unstable.conf b/conf/distro/openzaurus-unstable.conf index 072c69c5a0..f424b16696 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -63,5 +63,5 @@ include conf/distro/preferred-gpe-versions-2.8.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..e4571f1ae6 100644 --- a/conf/distro/preferred-e-versions.inc +++ b/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" diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf index d8a82ea9f7..d3882b7f65 100644 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/conf/machine/include/zaurus-clamshell-2.6.conf @@ -2,6 +2,7 @@ # Don't forget to include zaurus-clamshell.conf as well PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" +PREFERRED_VERSION_wpa_supplicant = "0.4.7" BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ pcmcia-cs apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ |