aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2011-05-02 22:49:36 +0200
committerHenning Heinold <heinold@inf.fu-berlin.de>2011-05-17 22:11:15 +0200
commit2a1c9e1ee5eb8067592d26100b563dd2ae7be00d (patch)
tree8243c023c82c084b614e287d1e95f57f6bf8e944 /conf
parentb167a9a9e55a7a493a7ee565cec9c7dd463362ff (diff)
downloadopenembedded-2a1c9e1ee5eb8067592d26100b563dd2ae7be00d.tar.gz
ulibc: bump git to version 71d63ed75648da9b0b71afabb9c60aaad792c55c and add some features
* enable backtrace support and put libubacktrace into own package, needed by firefox * added one patch from Timo Teräs to implement RTLD_NO, needed by openjdk * added one patch from Timo Teräs implement ORIGIN_PATH, needed by openjdk * remove fts-support.patch, because is applied upstream * bump PR
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2010.x.conf2
-rw-r--r--conf/distro/include/angstrom-2010-preferred-versions.inc4
-rw-r--r--conf/distro/include/angstrom.inc2
-rw-r--r--conf/machine/include/tune-strongarm.inc3
4 files changed, 6 insertions, 5 deletions
diff --git a/conf/distro/angstrom-2010.x.conf b/conf/distro/angstrom-2010.x.conf
index fd6cb42829..073a340224 100644
--- a/conf/distro/angstrom-2010.x.conf
+++ b/conf/distro/angstrom-2010.x.conf
@@ -26,7 +26,7 @@ DISTRO_PR = ".9"
OLDEST_KERNEL ?= "2.6.16"
require conf/distro/include/angstrom-2010-preferred-versions.inc
-require conf/distro/include/preferred-opie-versions-1.2.4.inc
+require conf/distro/include/preferred-opie-versions-1.2.5.inc
#Images built can have to modes:
# 'debug': empty rootpassword, strace included
diff --git a/conf/distro/include/angstrom-2010-preferred-versions.inc b/conf/distro/include/angstrom-2010-preferred-versions.inc
index 0e15f34b4b..fc5f82c12b 100644
--- a/conf/distro/include/angstrom-2010-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2010-preferred-versions.inc
@@ -1,4 +1,4 @@
-ANGSTROM_MESA_VERSION = "7.9.1"
+ANGSTROM_MESA_VERSION = "7.10"
ANGSTROM_QT_VERSION ?= "4.7.3"
ANGSTROM_LIBTOOL_VERSION = "2.4"
# Use new sysroot feature
@@ -65,8 +65,6 @@ PREFERRED_VERSION_samba = "3.3.9"
PREFERRED_VERSION_tiff = "3.9.4+4.0.0beta6"
PREFERRED_VERSION_udev = "168"
-PREFERRED_VERSION_udev_libc-uclibc = "141"
-UDEV_GE_141 = "1"
PREFERRED_VERSION_usbutils = "0.86"
PREFERRED_VERSION_wpa-supplicant = "0.7.3"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index c99374b3d6..50eac850c6 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -54,7 +54,7 @@ ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}"
# but requires more instructions (140% for 70% smaller code) so may be
# slower.
-THUMB_INTERWORK = "yes"
+THUMB_INTERWORK ?= "yes"
# "yes" "no"
# Whether to compile with code to allow interworking between the two
# instruction sets. This allows thumb code to be executed on a primarily
diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc
index fe57c9ccc0..ac584e3e38 100644
--- a/conf/machine/include/tune-strongarm.inc
+++ b/conf/machine/include/tune-strongarm.inc
@@ -6,3 +6,6 @@ TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm"
FEED_ARCH = "armv4"
BASE_PACKAGE_ARCH = "armv4"
PACKAGE_EXTRA_ARCHS += "armv4"
+
+ARM_INSTRUCTION_SET = "arm"
+THUMB_INTERWORK = "no"