summaryrefslogtreecommitdiff
path: root/conf/distro/include
diff options
context:
space:
mode:
authorJohn Lee <john_lee@openmoko.org>2008-03-07 12:40:47 +0000
committerJohn Lee <john_lee@openmoko.org>2008-03-07 12:40:47 +0000
commitb781aba534b1c5ba47a00fe9e2caaf8743536100 (patch)
tree2f6d5f780d0aeea2118ca212bb905d445313ee95 /conf/distro/include
parentbd4028cfd4a24a0c5875e7445bb115619830b947 (diff)
parente906546390539db91733531aa8007a59fcc3b60f (diff)
merge of '211b2bf7086145ba83e7b54cebded9bb3025b075'
and 'cb58be96e7128aa032b10e0b9d369ca6f59af487'
Diffstat (limited to 'conf/distro/include')
-rw-r--r--conf/distro/include/angstrom.inc3
-rw-r--r--conf/distro/include/sane-srcrevs.inc8
2 files changed, 7 insertions, 4 deletions
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index d55b5bf3db..0f7ce15a9d 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -47,6 +47,9 @@ ENABLE_BINARY_LOCALE_GENERATION_nokia800 = "0"
ENABLE_BINARY_LOCALE_GENERATION_omap2420h4 = "0"
ENABLE_BINARY_LOCALE_GENERATION_omap2430sdp = "0"
+#qemu has taken a dislike to armeb as well
+ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
+
#ARM EABI is softfloat by default, but let's make sure :)
#make it overridable for platforms with FPU, like ep93xx or i.mx31
TARGET_FPU_arm ?= "soft"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index f49c89eae7..39550c221e 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -132,12 +132,12 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "3767"
SRCREV_pn-openmoko-worldclock2 ?= "3365"
SRCREV_pn-openocd ?= "206"
SRCREV_pn-openocd-native ?= "206"
-SRCREV_pn-opkg ?= "4022"
-SRCREV_pn-opkg-native ?= "4019"
+SRCREV_pn-opkg ?= "4142"
+SRCREV_pn-opkg-native ?= "4142"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-psplash ?= "249"
-SRCREV_pn-pyneod ?= "85"
-SRCREV_pn-pyneog ?= "85"
+SRCREV_pn-pyneod ?= "88"
+SRCREV_pn-pyneog ?= "88"
SRCREV_pn-python-formencode = "3148"
SRCREV_pn-python-gsmd = "127"
SRCREV_pn-python-lightmediascanner = "68"