From 64f4a233cdeac3d0fd4475e00677336d8984d575 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 2 Feb 2006 13:18:02 +0000 Subject: familair: change image naming --- conf/distro/familiar.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf index 9cc84e96c4..99e501589f 100644 --- a/conf/distro/familiar.conf +++ b/conf/distro/familiar.conf @@ -7,9 +7,10 @@ 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 \ No newline at end of file +include conf/distro/include/multimachine.conf -- cgit v1.2.3 From cfddab8dd345de091dbe2fa46078f908cb41c917 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 4 Feb 2006 01:58:38 +0000 Subject: openzaurus-unstable, preferred-e-versions: update preferred-e-versions with newest releases (and add lots of packages) and uncomment the entry in OZ --- conf/distro/openzaurus-unstable.conf | 2 +- conf/distro/preferred-e-versions.inc | 32 +++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 10 deletions(-) (limited to 'conf') 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" -- cgit v1.2.3 From 81b2d93f4ec268fe52f47d414b2881f754458d13 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 4 Feb 2006 02:02:03 +0000 Subject: familiar-unstable: re-add preferred-e-versions --- conf/distro/familiar-unstable.conf | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'conf') 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 -- cgit v1.2.3 From 44e06d595adfa0ee032cd904e14fe69e71524456 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 4 Feb 2006 16:20:58 +0000 Subject: linux-oz-2.6 (2.6.15): Update led patches. Refresh c7x0 and poodle defconfigs. Update sharpsl_pm patch from Dirk. --- conf/machine/include/zaurus-clamshell-2.6.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') 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 \ -- cgit v1.2.3