diff options
| -rw-r--r-- | openembedded/conf/distro/poky-eabi.conf | 23 | ||||
| -rw-r--r-- | openembedded/conf/distro/poky-oabi.conf | 6 | ||||
| -rw-r--r-- | openembedded/conf/distro/poky.conf | 17 |
3 files changed, 34 insertions, 12 deletions
diff --git a/openembedded/conf/distro/poky-eabi.conf b/openembedded/conf/distro/poky-eabi.conf new file mode 100644 index 000000000..d35ec8e44 --- /dev/null +++ b/openembedded/conf/distro/poky-eabi.conf @@ -0,0 +1,23 @@ +# +# Poky configuration to use EABI +# + +PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" + +PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-2005q3" +PREFERRED_VERSION_gcc-cross ?= "3.4.4+csl-arm-2005q3" +PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4+csl-arm-2005q3" +#PREFERRED_VERSION_gcc ?= "4.1.0" +#PREFERRED_VERSION_gcc-cross ?= "4.1.0" +#PREFERRED_VERSION_gcc-cross-initial ?= "4.1.0" +PREFERRED_VERSION_binutils ?= "2.16.91.0.7" +PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" +PREFERRED_VERSION_glibc ?= "2.4" +PREFERRED_VERSION_glibc-intermediate ?= "2.4" + +#Use the ARM EABI when building for an ARM cpu. We can't use overrides +#here because this breaks all places where ":=" is used. +TARGET_VENDOR = "${@['','-poky'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" +TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
\ No newline at end of file diff --git a/openembedded/conf/distro/poky-oabi.conf b/openembedded/conf/distro/poky-oabi.conf new file mode 100644 index 000000000..3a436f655 --- /dev/null +++ b/openembedded/conf/distro/poky-oabi.conf @@ -0,0 +1,6 @@ +# +# Poky configuration to use EABI +# +PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" +PREFERRED_VERSION_gcc-cross ?= "3.4.4" +PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf index d7f4ee561..30ccbc856 100644 --- a/openembedded/conf/distro/poky.conf +++ b/openembedded/conf/distro/poky.conf @@ -1,5 +1,4 @@ -#@TYPE: Distribution -#@NAME: Poky +#@TYPE: Distribution#@NAME: Poky #@DESCRIPTION: Distribution configuration for OpenedHand (Poky) DISTRO = "poky" @@ -35,15 +34,7 @@ KERNEL_CONSOLE = "ttyS0" #DEBUG_BUILD = "1" #INHIBIT_PACKAGE_STRIP = "1" - -# -# Core Versions -# -PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" -PREFERRED_VERSION_gcc-cross ?= "3.4.4" -PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" -PREFERRED_VERSION_hostap-modules ?= "0.3.9" - +include conf/distro/poky-eabi.conf # # Preferred providers: @@ -69,7 +60,7 @@ PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}" SRCDATE_gconf-dbus ?= "20060119" SRCDATE_gnome-vfs-dbus ?= "20060119" SRCDATE_contacts ?= "20060207" -SRCDATE_dates ?= "20060323" +SRCDATE_dates ?= "20060502" SRCDATE_gtkhtml2 ?= "20060323" SRCDATE_web ?= "20060325" SRCDATE_eds-dbus ?= "20060126" @@ -105,6 +96,7 @@ SRCDATE_xcalibrate ?= "20051101" SRCDATE_libxmu ?= "20051115" SRCDATE_xdpyinfo ?= "20051115" SRCDATE_xauth ?= "20060120" +SRCDATE_xserver-kdrive = "20050207" SRCDATE_qemu-native ?= "20060418" @@ -123,6 +115,7 @@ PREFERRED_VERSION_matchbox-stroke ?= "0.0+svn${SRCDATE}" PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svn${SRCDATE}" PREFERRED_VERSION_matchbox-wm ?= "0.9.5+svn${SRCDATE}" PREFERRED_VERSION_libmatchbox ?= "1.7+svn${SRCDATE}" +PREFERRED_VERSION_xserver-kdrive = "0.0+cvs${SRCDATE}" #PREFERRED_VERSION_atk ?= "1.10.0" #PREFERRED_VERSION_cairo ?= "1.0.0" |