diff options
| -rw-r--r-- | classes/kernel.bbclass | 9 | ||||
| -rw-r--r-- | conf/distro/include/sane-toolchain-eglibc.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-toolchain-uclibc.inc | 5 | ||||
| -rw-r--r-- | conf/distro/include/sane-toolchain.inc | 8 | ||||
| -rw-r--r-- | conf/distro/micro.conf | 2 | ||||
| -rw-r--r-- | conf/distro/minimal.conf | 2 | ||||
| -rw-r--r-- | recipes/net-snmp/net-snmp.inc | 4 | ||||
| -rw-r--r-- | recipes/u-boot/u-boot_git.bb | 1 |
8 files changed, 24 insertions, 9 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 3ee7f53a29..d084cefee8 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -103,8 +103,15 @@ kernel_do_stage() { cp -fR arch/${ARCH}/include/asm/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ install -d ${STAGING_KERNEL_DIR}/arch/${ARCH}/include cp -fR arch/${ARCH}/* ${STAGING_KERNEL_DIR}/arch/${ARCH}/ + + # Check for arch/x86 on i386 + elif [ -d arch/x86/include/asm/ ]; then + cp -fR arch/x86/include/asm/* ${STAGING_KERNEL_DIR}/include/asm-x86/ + install -d ${STAGING_KERNEL_DIR}/arch/x86/include + cp -fR arch/x86/* ${STAGING_KERNEL_DIR}/arch/x86/ fi - rm -f $ASMDIR ${STAGING_KERNEL_DIR}/include/asm + + rm -f ${STAGING_KERNEL_DIR}/include/asm ln -sf $ASMDIR ${STAGING_KERNEL_DIR}/include/asm mkdir -p ${STAGING_KERNEL_DIR}/include/asm-generic diff --git a/conf/distro/include/sane-toolchain-eglibc.inc b/conf/distro/include/sane-toolchain-eglibc.inc index 4c5f44ff8e..88719f5f33 100644 --- a/conf/distro/include/sane-toolchain-eglibc.inc +++ b/conf/distro/include/sane-toolchain-eglibc.inc @@ -3,6 +3,8 @@ # eglibc: # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" +TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" + FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" diff --git a/conf/distro/include/sane-toolchain-uclibc.inc b/conf/distro/include/sane-toolchain-uclibc.inc index 68e5031efc..04935fe46d 100644 --- a/conf/distro/include/sane-toolchain-uclibc.inc +++ b/conf/distro/include/sane-toolchain-uclibc.inc @@ -3,7 +3,12 @@ # uclibc: PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" +PREFERRED_PROVIDER_virtual/libc = "uclibc" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" +PREFERRED_PROVIDER_virtual/libintl = "proxy-libintl" +PREFERRED_PROVIDER_virtual/libiconv = "libiconv" USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index 72fff9869d..cebe77b4b5 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -11,8 +11,10 @@ PREFERRED_BINUTILS ?= "2.18" # Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing. PREFERRED_VERSION_glibc ?= "2.6.1" PREFERRED_VERSION_glibc-initial ?= "2.6.1" -PREFERRED_VERSION_uclibc ?= "0.9.30" -PREFERRED_VERSION_uclibc-initial ?= "0.9.30" +PREFERRED_VERSION_eglibc ?= "2.10" +PREFERRED_VERSION_eglibc-initial ?= "2.10" +PREFERRED_VERSION_uclibc ?= "0.9.30.1" +PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1" # Some systems need a special gcc version PREFERRED_GCC_VERSION_486sx ?= "4.3.2" @@ -115,7 +117,7 @@ TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t" ############################################################################# # Can be "glibc", "eglibc" or "uclibc" -LIBC ?= "glibc" +LIBC ?= "eglibc" require conf/distro/include/${LIBC}.inc PSTAGE_EXTRAPATH = "${LIBC}" require conf/distro/include/sane-toolchain-${LIBC}.inc diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf index c566d7502d..861f7ef886 100644 --- a/conf/distro/micro.conf +++ b/conf/distro/micro.conf @@ -66,7 +66,7 @@ MACHINE_KERNEL_VERSION = "2.6" ############################################################################# # TOOLCHAIN ############################################################################# -LIBC = "glibc" +LIBC ?= "eglibc" require conf/distro/include/sane-toolchain.inc ############################################################################# diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 2eb4817b9c..fa2a926a1d 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -73,7 +73,7 @@ MACHINE_KERNEL_VERSION = "2.6" ############################################################################# # TOOLCHAIN ############################################################################# -LIBC ?= "glibc" +LIBC ?= "eglibc" require conf/distro/include/sane-toolchain.inc ############################################################################# diff --git a/recipes/net-snmp/net-snmp.inc b/recipes/net-snmp/net-snmp.inc index bbe809696e..dcc02e7f67 100644 --- a/recipes/net-snmp/net-snmp.inc +++ b/recipes/net-snmp/net-snmp.inc @@ -48,8 +48,8 @@ do_stage() { fi install -d ${STAGING_DIR_HOST}${layout_bindir} sed -e "s@-I/usr/include@@g" \ - -e "s@^prefix=.*@prefix=${STAING_DIR_HOST}@g" \ - -e "s@^exec_prefix=.*@exec_prefix=${STAING_DIR_HOST}@g" \ + -e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}@g" \ + -e "s@^exec_prefix=.*@exec_prefix=${STAGING_DIR_HOST}@g" \ -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \ -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \ -i net-snmp-config diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 202409287b..d30b0bdbd0 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -67,7 +67,6 @@ SRCREV_neuros-osd2 = "8de979d346624c0e4cfe2e5c0f08ce20ca4b5d14" SRC_URI_sequoia = "git://www.denx.de/git/u-boot.git;protocol=git" SRCREV_sequoa = "cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093" -SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git " SRC_URI_sequoia = "git://www.denx.de/git/u-boot.git;protocol=git;tag=cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093 " SRC_URI_mini2440 = "git://repo.or.cz/u-boot-openmoko/mini2440.git;protocol=git;branch=dev-mini2440-stable" |