diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2006-10-16 12:59:57 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2006-10-16 12:59:57 +0000 |
| commit | 4e66990d27586901af7ce814e410caa6a9fdcd82 (patch) | |
| tree | 9cfeee8b3e9dac271e7efa5e4a50ce48ca15ff8d /conf | |
| parent | e1dcba71e604171bb63e8fcc802b524990ee79a8 (diff) | |
| parent | 008313e2eaf472c57ab66301df90bd64ddd84b2c (diff) | |
merge of '520d98a2b3e5a5099b9a277781643288ce015b5a'
and '90907870097423c412dd5ea9520d4d6a6e674c51'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/generic-unstable.conf | 72 | ||||
| -rw-r--r-- | conf/distro/generic.conf | 20 | ||||
| -rw-r--r-- | conf/distro/openzaurus-unstable.conf | 1 |
3 files changed, 15 insertions, 78 deletions
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 @@ -29,17 +29,26 @@ INHERIT += "package_ipk" 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 @@ 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 diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index 51922b8ad4..6be29e5c1b 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -55,6 +55,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_VERSION_binutils-cross = "2.16" PREFERRED_VERSION_binutils = "2.16" +PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" # # Opie # |