diff options
| author | John Lee <john_lee@openmoko.org> | 2008-03-07 12:40:47 +0000 |
|---|---|---|
| committer | John Lee <john_lee@openmoko.org> | 2008-03-07 12:40:47 +0000 |
| commit | b781aba534b1c5ba47a00fe9e2caaf8743536100 (patch) | |
| tree | 2f6d5f780d0aeea2118ca212bb905d445313ee95 /conf/distro | |
| parent | bd4028cfd4a24a0c5875e7445bb115619830b947 (diff) | |
| parent | e906546390539db91733531aa8007a59fcc3b60f (diff) | |
merge of '211b2bf7086145ba83e7b54cebded9bb3025b075'
and 'cb58be96e7128aa032b10e0b9d369ca6f59af487'
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 2 | ||||
| -rw-r--r-- | conf/distro/include/angstrom.inc | 3 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 8 | ||||
| -rw-r--r-- | conf/distro/sharprom-compatible.conf | 1 |
4 files changed, 8 insertions, 6 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 5725a8a52e..e42dd1cb3b 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -204,7 +204,7 @@ DISTRO_EXTRA_RDEPENDS += "\ update-modules \ ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ angstrom-version \ - ipkg ipkg-collateral ${ANGSTROM_FEED_CONFIGS} \ + opkg-ipkg-compat ${ANGSTROM_FEED_CONFIGS} \ util-linux-mount util-linux-umount \ ${DEBUG_APPS} \ " 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" diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index 0e130a2fd7..463c5d0442 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -37,7 +37,6 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native" -PREFERRED_PROVIDER_virtual/linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native" |