diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/angstrom-uclibc.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/preferred-opie-cvs-versions.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/preferred-opie-versions-1.2.4-pre.inc | 4 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 4b68293faf..6d02578df4 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -2,7 +2,7 @@ #fix some iconv issues, needs to be adjusted when doing uclibc builds PREFERRED_PROVIDER_virtual/libc = "uclibc" PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" +PREFERRED_PROVIDER_virtual/libintl ?= "proxy-libintl" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" diff --git a/conf/distro/include/preferred-opie-cvs-versions.inc b/conf/distro/include/preferred-opie-cvs-versions.inc index d27f56fb04..8ffad210bb 100644 --- a/conf/distro/include/preferred-opie-cvs-versions.inc +++ b/conf/distro/include/preferred-opie-cvs-versions.inc @@ -42,7 +42,7 @@ SRCDATE_opie-buzzword ?= "${OPIE_VERSION}" SRCDATE_opie-calculator ?= "${OPIE_VERSION}" SRCDATE_opie-calibrate ?= "${OPIE_VERSION}" SRCDATE_opie-camera ?= "${OPIE_VERSION}" -SRCDATE_opie-cardmon ?= "${OPIE_VERSION}" +SRCDATE_opie-cardapplet ?= "${OPIE_VERSION}" SRCDATE_opie-checkbook ?= "${OPIE_VERSION}" SRCDATE_opie-citytime ?= "${OPIE_VERSION}" SRCDATE_opie-clipboardapplet ?= "${OPIE_VERSION}" 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 0a95b1ff67..4b5b3a408b 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 @@ -3,7 +3,7 @@ QTE_VERSION ?= "2.3.10" PALMTOP_USE_MULTITHREADED_QT ?= "yes" -OPIE_SRCDATE ?= "20080127" +OPIE_SRCDATE ?= "20080906" OPIE_VERSION ?= "1.2.3+cvs${OPIE_SRCDATE}" OPIE_CVS_PV ?= "1.2.3+cvs${OPIE_SRCDATE}" @@ -54,7 +54,7 @@ PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}" PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}" PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}" PREFERRED_VERSION_opie-camera = "${OPIE_VERSION}" -PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-cardapplet = "${OPIE_VERSION}" PREFERRED_VERSION_opie-checkbook = "${OPIE_VERSION}" PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}" PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index eab831c2eb..f286743816 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -251,4 +251,5 @@ SRCREV_pn-exquisite ?= "${EFL_SRCREV}" SRCREV_pn-rage ?= "${EFL_SRCREV}" # Illume module -SRCREV_pn-illume ?= "${EFL_SRCREV}" +# Use EFL_SRCREV again when E does not segfault +SRCREV_pn-illume ?= "35866" |