diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-10-23 14:06:47 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-10-23 14:06:47 +0000 |
| commit | c67e3327ee97255fda3143a7a013b210d3e614a2 (patch) | |
| tree | b92ee5c63171a8ca7531b2cb1c7b8a384abd1941 /conf | |
| parent | 6b4d2b41bee7ee874d6f47bdb599cdbfadabf46c (diff) | |
| parent | 5a63543f4b1e8651f3665a89748676a5794f59fe (diff) | |
merge of '7f726014d804dac37f882d802eea690ed0c00cee'
and 'de1ed6b33382c6e5abd3af8087cf833ca9a9c78b'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 5 | ||||
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 2 | ||||
| -rw-r--r-- | conf/distro/include/moko-autorev.inc | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 046b107936..43e45bd87d 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -460,9 +460,10 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}" # when ${MACHINE} is 'ramses'. And finally '<foo>_local' overrides anything. # # This works for functions as well, they are really just environment variables. -#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}" -# Alternative OVERRIDES to make compilation fail fast, we will enable it by default soon +# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration. OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" +# Alternative OVERRIDES definition without "fail fast", usually only for native building and Scratchbox toolchains. +#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}" ################################################################## # Include the rest of the config files. diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 00fa645c5e..1f2961f3a1 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -71,7 +71,7 @@ PREFERRED_VERSION_freetype-native = "2.2.1" PREFERRED_VERSION_cairo = "1.4.10" PREFERRED_VERSION_glib-2.0 = "2.12.12" PREFERRED_VERSION_pango = "1.16.4" -PREFERRED_VERSION_atk = "1.10.3" +PREFERRED_VERSION_atk = "1.20.0" PREFERRED_VERSION_gtk+ = "2.10.14" # newer poppler cvs breaks some apps, fix until popper 6 and apps diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 6695dd0d97..d557c77e9a 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -7,9 +7,12 @@ SRCREV_pn-linux-openmoko ?= "${AUTOREV}" SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}" SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}" +SRCREV_pn-neod ?= "${AUTOREV}" SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}" +SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}" SRCREV_pn-openmoko-appearance ?= "${AUTOREV}" +SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}" SRCREV_pn-openmoko-calculator ?= "${AUTOREV}" SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}" SRCREV_pn-openmoko-common ?= "${AUTOREV}" |