summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/angstrom.inc5
-rw-r--r--conf/distro/include/preferred-opie-cvs-versions.inc2
-rw-r--r--conf/distro/include/preferred-opie-versions-1.2.3.inc2
-rw-r--r--conf/distro/include/preferred-opie-versions-1.2.4-pre.inc2
4 files changed, 8 insertions, 3 deletions
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 4ada4a89d4..3375a0089f 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -79,6 +79,11 @@ TARGET_FPU_armv6 ?= "hard"
TARGET_FPU_armv7a ?= "hard"
TARGET_FPU_ppc603e ?= "hard"
+# webkit-gtk and cairo have alignment issues with double instructions on armv5 so
+# disable them here
+TARGET_CC_ARCH_pn-webkit-gtk_armv5te = "-march=armv4t"
+TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t"
+
#Set the right arch for the feeds
#Alphabetically sorted
diff --git a/conf/distro/include/preferred-opie-cvs-versions.inc b/conf/distro/include/preferred-opie-cvs-versions.inc
index 8ffad210bb..79fc56c08c 100644
--- a/conf/distro/include/preferred-opie-cvs-versions.inc
+++ b/conf/distro/include/preferred-opie-cvs-versions.inc
@@ -206,4 +206,4 @@ SRCDATE_opie-zkbapplet ?= "${OPIE_VERSION}"
SRCDATE_opie-zlines ?= "${OPIE_VERSION}"
SRCDATE_opie-zsafe ?= "${OPIE_VERSION}"
SRCDATE_opie-zsame ?= "${OPIE_VERSION}"
-PREFERRED_VERSION_konqueror-embedded = "20060404"
+PREFERRED_VERSION_konqueror-embedded = "20070316"
diff --git a/conf/distro/include/preferred-opie-versions-1.2.3.inc b/conf/distro/include/preferred-opie-versions-1.2.3.inc
index ffcbbc2217..56bb4fbeaa 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.3.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.3.inc
@@ -208,4 +208,4 @@ PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
-PREFERRED_VERSION_konqueror-embedded = "20070212"
+PREFERRED_VERSION_konqueror-embedded = "20070316"
diff --git a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
index d6c43a3839..10d0833c6c 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
@@ -221,7 +221,7 @@ PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
-PREFERRED_VERSION_konqueror-embedded = "20070212"
+PREFERRED_VERSION_konqueror-embedded = "20070316"
SRCDATE_opie-aboutapplet = "${OPIE_SRCDATE}"