From 7b55d42bc99057d51ec5c8b4c3c8eb0f20407265 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 15 Oct 2006 17:34:36 +0000
Subject: generic-unstable.conf: remove generic.conf: use gcc 4.1.1 / glibc 2.4

---
 conf/distro/generic-unstable.conf | 72 ---------------------------------------
 conf/distro/generic.conf          | 20 +++++++----
 2 files changed, 14 insertions(+), 78 deletions(-)
 delete mode 100644 conf/distro/generic-unstable.conf

(limited to 'conf')

diff --git a/conf/distro/generic-unstable.conf b/conf/distro/generic-unstable.conf
deleted file mode 100644
index 80fd25ae19..0000000000
--- a/conf/distro/generic-unstable.conf
+++ /dev/null
@@ -1,72 +0,0 @@
-#@--------------------------------------------------------------------
-#@TYPE: Distribution
-#@NAME: Bleeding Edge
-#@DESCRIPTION: An experimental distribution configuration
-#@--------------------------------------------------------------------
-
-#
-# Header
-#
-DISTRO_NAME = "generic-unstable-glibc"
-DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
-#DISTRO_TYPE = "release"
-DISTRO_TYPE = "debug"
-
-#
-# Naming schemes
-#
-PARALLEL_INSTALL_MODULES = "1"
-INHERIT += "debian multimachine"
-
-#
-# Packaging and output format
-#
-INHERIT += "package_ipk"
-IMAGE_FSTYPES = "tar.gz ext2.gz jffs2"
-
-#
-# 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"
-
-#
-# Target OS & FPU system
-# 
-TARGET_OS = "linux"
-TARGET_FPU_arm = "soft"
-TARGET_FPU_armeb = "soft"
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_VERSION_glibc = "2.4"
-PREFERRED_VERSION_glibc-intermediate = "2.4"
-
-#
-# Bootstrap & Init
-#
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-
-#
-# Framebuffer & X
-#
-PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
-PREFERRED_PROVIDER_tslib ?= tslib
-
-#
-# GPE
-#
-require conf/distro/include/preferred-gpe-versions.inc
-
-#
-# 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
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index 08520f0dfe..11c9af4111 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -28,6 +28,12 @@ INHERIT += "debian multimachine"
 INHERIT += "package_ipk"
 IMAGE_FSTYPES = "tar.gz ext2.gz jffs2"
 
+#
+# Kernel
+#
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
 #
 # Binutils & Compiler
 #
@@ -35,11 +41,14 @@ 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 @@ TARGET_FPU_arm = "soft"
 TARGET_FPU_armeb = "soft"
 PREFERRED_PROVIDER_virtual/libiconv = "glibc"
 PREFERRED_PROVIDER_virtual/libintl = "glibc"
-PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
 
 #
 # Bootstrap & Init
-- 
cgit v1.2.3