diff options
| author | Richard Purdie <richard@openedhand.com> | 2005-09-20 07:04:35 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2005-09-20 07:04:35 +0000 |
| commit | b4a7122cacef647dbec3db5c9ebe1e504a7670df (patch) | |
| tree | 006885a1f4e8032062632ee1a091e72c32dd2810 /openembedded/conf/distro/openzaurus-3.5.4.conf | |
| parent | f9e1d16bfa73a2df5254c63ae1abb6a4bbe0a062 (diff) | |
| download | openembedded-core-b4a7122cacef647dbec3db5c9ebe1e504a7670df.tar.gz openembedded-core-b4a7122cacef647dbec3db5c9ebe1e504a7670df.tar.bz2 openembedded-core-b4a7122cacef647dbec3db5c9ebe1e504a7670df.tar.xz openembedded-core-b4a7122cacef647dbec3db5c9ebe1e504a7670df.zip | |
Updates against mainline OE
git-svn-id: https://svn.o-hand.com/repos/poky@26 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf/distro/openzaurus-3.5.4.conf')
| -rw-r--r-- | openembedded/conf/distro/openzaurus-3.5.4.conf | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/openembedded/conf/distro/openzaurus-3.5.4.conf b/openembedded/conf/distro/openzaurus-3.5.4.conf index 61458c0b0..fbc197086 100644 --- a/openembedded/conf/distro/openzaurus-3.5.4.conf +++ b/openembedded/conf/distro/openzaurus-3.5.4.conf @@ -1,4 +1,4 @@ -include conf/distro/openzaurus.conf +include conf/distro/openzaurus.inc DISTRO = "openzaurus" DISTRO_NAME = "OpenZaurus" DISTRO_VERSION = "3.5.3-snapshot-${DATE}" @@ -27,6 +27,16 @@ KERNEL_CONSOLE = "ttyS0" #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 # @@ -48,12 +58,11 @@ include conf/distro/preferred-opie-versions.inc # PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDER_x11 = "diet-x11" -#PREFERRED_PROVIDER_x11 = "x11" include conf/distro/preferred-gpe-versions-2.7.inc # # E # -include conf/distro/preferred-e-versions.inc +#include conf/distro/preferred-e-versions.inc include conf/distro/poky-additions.inc
\ No newline at end of file |