diff options
| author | Kristoffer Ericson <kristoffer_e1@hotmail.com> | 2006-07-12 18:45:46 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-12 18:45:46 +0000 |
| commit | de96a1c7650363b4146a3926def0d182239834b3 (patch) | |
| tree | 0c39c0b73ecc5fec486a6322578dc46ae34a1d8b /conf | |
| parent | 1cdf41ddd69ade3d584973b70aa86ced38cb0e3c (diff) | |
| parent | 013176285df78d1dcd75605c62271eada172c6ca (diff) | |
merge of fab47ded5e1837c41db0c40cd772fe320c0c8a19
and 55d391274f060e7c8b1dc4c632bfcaf865f5fb26
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/jlime-donkey.conf | 10 | ||||
| -rw-r--r-- | conf/machine/include/poodle-2.6.conf | 8 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-clamshell-2.6.conf | 10 |
3 files changed, 10 insertions, 18 deletions
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index 72692a28f7..923953420a 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -14,7 +14,6 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" #<> #<> We will set CVS DATE when things are known to work. #<> - 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" @@ -57,9 +56,9 @@ PREFERRED_VERSION_glib-1.2 = "1.2.10" #<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11. #<> PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312" -PREFERRED_PROVIDER_libx11 = "diet-x11" +PREFERRED_PROVIDER_libx11 = "x11" PREFERRED_PROVIDER_tslib = "tslib" - +PREFRRED_VERSION_cairo = "1.0.4" #<> #<>Other Specific stuff. #<> @@ -67,7 +66,7 @@ PREFERRED_PROVIDER_tslib = "tslib" #<>We want to be able to build this for all jornadas so #<>to not mess up the folders we need to make them dynamic. #<>It will use different folders depending on Arch (set in local.conf) -INHERIT += "package_tar package_ipk multimachine" +INHERIT += "package_ipk multimachine" BBINCLUDELOGS = "yes" IMAGE_FSTYPES = "tar.bz2" TARGET_OS = "linux" @@ -87,7 +86,7 @@ QTE_VERSION = "2.3.10" PALMTOP_USE_MULTITHREADED_QT = "yes" PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt" PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie" -OPIE_VERSION = "20060708" +OPIE_VERSION = "20060709" include conf/distro/preferred-opie-cvs-versions.inc #<> @@ -106,4 +105,3 @@ FULL_OPTIMIZATION = "-O1" #<> IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}" - diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf index 9076355522..1b128ea6cb 100644 --- a/conf/machine/include/poodle-2.6.conf +++ b/conf/machine/include/poodle-2.6.conf @@ -35,9 +35,5 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \ hostap-conf orinoco-conf" # Sound Modules -###BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss" -BOOTSTRAP_EXTRA_SOUND = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \ - kernel-module-snd-pcm \ - kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s" - -###BOOTSTRAP_EXTRA_RDEPENDS_append_poodle += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-poodle kernel-module-snd-soc-wm8731 " +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss" +BOOTSTRAP_EXTRA_RDEPENDS_append_poodle += " kernel-module-snd-soc-poodle " diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf index 8c91a7b29a..2433c5a748 100644 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/conf/machine/include/zaurus-clamshell-2.6.conf @@ -40,10 +40,8 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \ # Sound Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss" -BOOTSTRAP_EXTRA_SOUND = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \ - kernel-module-snd-pcm \ - kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s" -BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 " -BOOTSTRAP_EXTRA_RDEPENDS_append_akita += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " -BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " +BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += " kernel-module-snd-soc-corgi " +BOOTSTRAP_EXTRA_RDEPENDS_append_akita += " kernel-module-snd-soc-spitz " +BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += " kernel-module-snd-soc-spitz " +BOOTSTRAP_EXTRA_RDEPENDS_append_poodle += " kernel-module-snd-soc-poodle " |