[oe-commits] org.oe.dev generic.conf: start to make the generic DISTRO work again

[mickeyl commit]

generic.conf: start to make the generic DISTRO work again

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 77255eff938f77a73e2bcaf9e08a9568e2c88208
ViewMTN: http://monotone.openembedded.org/revision/info/77255eff938f77a73e2bcaf9e08a9568e2c88208
Files:
1
conf/distro/generic.conf
Diffs:

#
# mt diff -r3b07132b9612f7197f2769bf467e1202628ff707 -r77255eff938f77a73e2bcaf9e08a9568e2c88208
#
# 
# 
# patch "conf/distro/generic.conf"
#  from [d45a46f2df99b280a6fead15ab5f1e1c3b41ab0f]
#    to [db433081a402e43aa3eb5a775393123ae9753a54]
# 
============================================================
--- conf/distro/generic.conf	d45a46f2df99b280a6fead15ab5f1e1c3b41ab0f
+++ conf/distro/generic.conf	db433081a402e43aa3eb5a775393123ae9753a54
@@ -36,28 +36,34 @@ MACHINE_KERNEL_VERSION = "2.6"
 #
 # Binutils & Compiler
 #
-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"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
+PREFERRED_PROVIDER_virtual/arm-linux-binutils = "binutils-cross"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 
 PREFERRED_VERSION_gcc ?= "4.1.1"
 PREFERRED_VERSION_gcc-cross ?= "4.1.1"
 PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
-PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
-PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
+PREFERRED_VERSION_binutils ?= "2.18"
+PREFERRED_VERSION_binutils-cross ?= "2.18"
 
 #
 # Target OS & FPU system
-# 
+#
 TARGET_OS = "linux"
 TARGET_FPU_arm = "soft"
 TARGET_FPU_armeb = "soft"
 
+#
+# C library
+#
 PREFERRED_PROVIDER_virtual/libiconv = "glibc"
 PREFERRED_PROVIDER_virtual/libintl = "glibc"
 PREFERRED_PROVIDER_virtual/libc = "glibc"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.23"
 PREFERRED_VERSION_glibc ?= "2.5"
 PREFERRED_VERSION_glibc-intermediate ?= "2.5"
 
@@ -65,28 +71,12 @@ PREFERRED_PROVIDER_task-bootstrap = "tas
 # Bootstrap & Init
 #
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-require conf/distro/include/sane-srcdates.inc
 
 #
-# Framebuffer & X
+# Preferred versions
 #
-PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
-PREFERRED_PROVIDER_tslib ?= "tslib"
-require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
 
-#
-# GPE
-#
-require conf/distro/include/preferred-gpe-versions-2.8.inc
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
 
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QTE = "yes"
-require conf/distro/include/preferred-opie-versions.inc
-
-#
-# Enlightenment
-#
-require conf/distro/include/preferred-e-versions.inc