generic-unstable.conf detach from generic, since we don't want to include sane-srcdat...

diff --git a/conf/distro/generic-unstable.conf b/conf/distro/generic-unstable.conf
index 10f14ef..551f73b 100644 (file)
--- a/conf/distro/generic-unstable.conf
+++ b/conf/distro/generic-unstable.conf
@@ -4,25 +4,63 @@
 #@DESCRIPTION: An experimental distribution configuration
 #@--------------------------------------------------------------------
 
-require conf/distro/generic.conf
+#
+# Header
+#
+DISTRO_NAME = "generic-unstable-glibc"
+DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
+#DISTRO_TYPE = "release"
+DISTRO_TYPE = "debug"
 
 #
-# Binutils & Compiler
+# Naming schemes
 #
-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.16.91.0.7"
-PREFERRED_VERSION_binutils-cross = "2.16.91.0.7"
-# PREFERRED_VERSION_linux-libc-headers = "2.6.15.99"
+PARALLEL_INSTALL_MODULES = "1"
+INHERIT += "debian multimachine"
 
 #
-# Target OS, FPU system and libc
+# 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 = "soft"
+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"
+
+#
+# GPE
+#
+require conf/distro/preferred-gpe-versions.inc
+
+#
+# Opie
+#
+QTE_VERSION = "2.3.10"
+PALMTOP_USE_MULTITHREADED_QTE = "yes"
+require conf/distro/preferred-opie-versions.inc
+
+#
+# Enlightenment
+#
+require conf/distro/preferred-e-versions.inc