summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/angstrom-2007-for-openmoko.inc2
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc2
-rw-r--r--conf/distro/include/sane-srcrevs.inc4
-rw-r--r--conf/machine/include/palm.inc1
4 files changed, 5 insertions, 4 deletions
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc
index 0c7fe5be49..22a2c98a16 100644
--- a/conf/distro/include/angstrom-2007-for-openmoko.inc
+++ b/conf/distro/include/angstrom-2007-for-openmoko.inc
@@ -218,7 +218,7 @@ DISTRO_EXTRA_DEPENDS += " \
DISTRO_EXTRA_RDEPENDS += "\
update-modules \
- ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "screen", "exquisite", "",d)} \
angstrom-version \
opkg opkg-collateral distro-feed-configs \
util-linux-mount util-linux-umount \
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 5cf079de84..7a7c29f121 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1713,7 +1713,7 @@ PREFERRED_VERSION_setserial ?= "2.17"
PREFERRED_VERSION_setxkbmap ?= "1.0.4"
PREFERRED_VERSION_sgml-common ?= "0.6.3"
PREFERRED_VERSION_sgml-common-native ?= "0.6.3"
-PREFERRED_VERSION_shared-mime-info ?= "0.22"
+PREFERRED_VERSION_shared-mime-info ?= "0.51"
PREFERRED_VERSION_sharp-compat-libs ?= "0.5"
PREFERRED_VERSION_sharprom-toolchain-native ?= "1.0"
PREFERRED_VERSION_shasum-native ?= "1.0"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index e8c88626cc..6b1d5d8fe6 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -212,9 +212,11 @@ SRCREV_pn-zhone ?= "929c78f2e83faef526064231c17958eaef72eba3"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCREV ?= "36540"
+EFL_SRCREV ?= "37324"
SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
SRCREV_pn-edb ?= "${EFL_SRCREV}"
+SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
+SRCREV_pn-eina ?= "${EFL_SRCREV}"
SRCREV_pn-eet-native ?= "${EFL_SRCREV}"
SRCREV_pn-eet ?= "${EFL_SRCREV}"
SRCREV_pn-evas-native ?= "${EFL_SRCREV}"
diff --git a/conf/machine/include/palm.inc b/conf/machine/include/palm.inc
index 22c6ad4233..5394855523 100644
--- a/conf/machine/include/palm.inc
+++ b/conf/machine/include/palm.inc
@@ -3,7 +3,6 @@
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
SERIAL_CONSOLE = "115200 ttyS0"