From ebc5a6179a680eadd5e7fc7ca985e2ce63fb90dc Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 28 Nov 2007 05:32:57 +0000 Subject: slugos.inc: Move slugos to the same toolchain as OABI Angstrom 2007.1, and bump version to 4.7 --- conf/distro/include/slugos.inc | 45 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'conf/distro/include') diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 652373a3eb..a0d238f560 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.6" +SLUGOS_VERSION = "4.7" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): @@ -89,24 +89,28 @@ DISTRO_EXTRA_RRECOMMENDS ?= "" # necessary to define which gets generated first, glibc or the kernel, and # this is done by selecting the provider of libc (in this case it needs the # kernel, so there has to be a non-libc gcc to build the kernel!) -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_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -# Select 2.6 versions of the depmod support -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" + +# Virtuals: +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" + +#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate" # compiler/binary/library versions -PREFERRED_VERSION_binutils ?= "2.16" -PREFERRED_VERSION_binutils-cross ?= "2.16" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_gcc-cross ?= "4.1.1" -PREFERRED_VERSION_gcc ?= "4.1.1" -PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" -#For SVN uclibc: -#SRCDATE_uclibc ?= "20060120" -#PREFERRED_VERSION_uclibc ?= "0.9.28+svn${SRCDATE_uclibc}" +PREFERRED_VERSION_binutils ?= "2.18" +PREFERRED_VERSION_binutils-cross ?= "2.18" +PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" +PREFERRED_VERSION_gcc ?= "4.1.2" +PREFERRED_VERSION_gcc-cross ?= "4.1.2" +PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2" +PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2" +PREFERRED_VERSION_glibc ?= "2.5" +PREFERRED_VERSION_glibc-intermediate ?= "2.5" +PREFERRED_VERSION_glibc-initial ?= "2.5" # Select the correct versions of the kernel and modules (these are the # defaults, override in the conf/distro top-level distro file). @@ -139,12 +143,7 @@ PREFERRED_VERSION_ipkg-native ?= "0.99.163" #FIXME: HACK: REMOVE THIS IGNORE_STRIP_ERRORS = "" -# Due to upstream instability, and another OE project with conflicting -# needs, nail down a specific, known-working version of madwifi-ng. -# Remove this once the madwifi-ng stuff seems to stabilize once again. -#PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225" - -PREFERRED_VERSION_linux-libc-headers = "2.6.18" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.20" # we don't ship gtk-directfb by default PREFERRED_PROVIDER_gtk+ ?= "gtk+" -- cgit v1.2.3 From f19c873a409ab4628ab5db2ddf12827063c0cfe8 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Wed, 28 Nov 2007 05:35:28 +0000 Subject: linux-ixp4xx: Migration from ixp4xx-kernel. Intended to follow recent OE kernel recipe conventions. Default kernel for slugos distro and ixp4xx machines. ixp4xx-kernel will be removed later once this is well tested. --- conf/distro/include/sane-srcrevs.inc | 1 + conf/distro/include/slugos.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'conf/distro/include') diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 11145fe330..d2a86da256 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -42,6 +42,7 @@ SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" +SRCREV_pn-linux-ixp4xx ?= "927" SRCREV_pn-linux-openmoko ?= "3238" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index a0d238f560..6acb72c345 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -114,7 +114,7 @@ PREFERRED_VERSION_glibc-initial ?= "2.5" # Select the correct versions of the kernel and modules (these are the # defaults, override in the conf/distro top-level distro file). -PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.6" # Select the smallest provider of x11 libraries -- cgit v1.2.3