[oe-commits] org.oe.dev generic-unstable.conf: remove

[mickeyl commit]

generic-unstable.conf: remove
generic.conf: use gcc 4.1.1 / glibc 2.4

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: c5ad8766630613eed09e775210fd8e2ce86c5a1d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c5ad8766630613eed09e775210fd8e2ce86c5a1d
Files:
1
conf/distro/generic-unstable.conf
conf/distro/generic.conf
Diffs:

#
# mt diff -r04a593abb964d3a377f858623eb9411272ae766a -rc5ad8766630613eed09e775210fd8e2ce86c5a1d
#
# 
# 
# delete "conf/distro/generic-unstable.conf"
# 
# patch "conf/distro/generic.conf"
#  from [78eb8a8f5d2f66b7e1741033d2ac2206c6cf8efe]
#    to [7ab8a3adc7653a79ef59236c5807f1e2ba9091a2]
# 
============================================================
--- conf/distro/generic.conf	78eb8a8f5d2f66b7e1741033d2ac2206c6cf8efe
+++ conf/distro/generic.conf	7ab8a3adc7653a79ef59236c5807f1e2ba9091a2
@@ -29,17 +29,26 @@ IMAGE_FSTYPES = "tar.gz ext2.gz jffs2"
 IMAGE_FSTYPES = "tar.gz ext2.gz jffs2"
 
 #
+# Kernel
+#
+KERNEL = "kernel26"
+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_VERSION_gcc = "3.4.4"
-PREFERRED_VERSION_gcc-cross = "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
-PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
-PREFERRED_VERSION_binutils = "2.15.94.0.1"
+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"
+PREFERRED_VERSION_binutils-cross ?= "2.17"
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
+PREFERRED_VERSION_glibc ?= "2.4"
+PREFERRED_VERSION_glibc-intermediate ?= "2.4"
 
 #
 # Target OS & FPU system
@@ -49,7 +58,6 @@ PREFERRED_PROVIDER_virtual/libintl = "gl
 TARGET_FPU_armeb = "soft"
 PREFERRED_PROVIDER_virtual/libiconv = "glibc"
 PREFERRED_PROVIDER_virtual/libintl = "glibc"
-PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
 
 #
 # Bootstrap & Init