diff options
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 21 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 3 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-glibc.inc | 10 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-uclibc.inc | 6 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 |
5 files changed, 23 insertions, 19 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index eb83cbcbb5..df5435a3e5 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -70,12 +70,9 @@ KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_D PREFERRED_VERSION_linux-libc-headers = "2.6.23" #Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing. -PREFERRED_VERSION_glibc = "2.6.1" -PREFERRED_VERSION_glibc-intermediate = "2.6.1" -PREFERRED_VERSION_glibc-initial = "2.6.1" -PREFERRED_VERSION_uclibc ?= "0.9.29" -PREFERRED_VERSION_uclibc-initial ?= "0.9.29" - +PREFERRED_VERSION_glibc ?= "2.6.1" +PREFERRED_VERSION_glibc-intermediate ?= "2.6.1" +PREFERRED_VERSION_glibc-initial ?= "2.6.1" #Prefer a newer GTK+ and friends PREFERRED_VERSION_gtk+ ?= "2.12.3" @@ -134,18 +131,6 @@ 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-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc-intermediate" - -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" - # hostap stuff, we prefer the in-kernel modules, but those don't work for all machines PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 2612734422..382d562426 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -1,5 +1,5 @@ PREFERRED_VERSION_busybox = "1.9.2" -PREFERRED_VERSION_dbus = "1.1.20" +PREFERRED_VERSION_dbus = "1.2.1" PREFERRED_VERSION_glib-2.0 = "2.16.1" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_libtool = "1.5.10" @@ -7,3 +7,4 @@ PREFERRED_VERSION_pango = "1.18.3" PREFERRED_VERSION_pulseaudio = "0.9.9" PREFERRED_VERSION_udev = "118" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" +PREFERRED_VERSION_dropbear = "0.50" diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 29b34f9665..c780056f9e 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -5,6 +5,16 @@ PREFERRED_PROVIDER_virtual/libc ?= "glibc" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial" PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" +#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-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc-intermediate" + + 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']]}" #mess with compiler flags to use -Os instead of -O2 diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 7c713e65ea..4b68293faf 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -3,6 +3,12 @@ PREFERRED_PROVIDER_virtual/libc = "uclibc" PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" PREFERRED_PROVIDER_virtual/libintl ?= "gettext" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" +PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" + +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index db944f9861..d84c7ac9b6 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -14,6 +14,8 @@ SRCREV_pn-aircrack-ng ?= "802" SRCREV_pn-assassin ?= "41" SRCREV_pn-bfin-uclibc ?= "1857" +SRCREV_pn-uclibc ?= "21926" +SRCREV_pn-uclibc-initial ?= "21926" SRCREV_pn-contact ?= "1410" SRCREV_pn-dbus-c++-native ?= "13131" SRCREV_pn-dbus-c++ ?= "13131" |