diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-28 19:55:44 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-28 19:58:50 +0100 |
| commit | a5d21cde984b2c6ec5b14f0bae268e07289df9fb (patch) | |
| tree | 7ddb94ace350a23ce8f9e107db20932bfeb92b66 | |
| parent | 808a7c70481d96aaa92acddb742c62bc6d804415 (diff) | |
shr: bump linux-libc-headers to 2.6.31, use EFL_SRCREV from sane-srcrevs
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | conf/distro/include/preferred-shr-versions.inc | 22 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs-fso.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 |
3 files changed, 14 insertions, 12 deletions
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index 5970f2da14..b1948e8c02 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -1,22 +1,24 @@ # Upgraded # use newer version then preferred by default -PREFERRED_VERSION_boost ?= "1.40.0" -PREFERRED_VERSION_dbus ?= "1.3.0" +PREFERRED_VERSION_boost = "1.40.0" +PREFERRED_VERSION_dbus = "1.3.0" PREFERRED_VERSION_autoconf = "2.63" PREFERRED_VERSION_autoconf-native = "2.63" -PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2" -PREFERRED_VERSION_mtd-utils-native ?= "1.2.0+git" -PREFERRED_VERSION_strace ?= "4.5.15" +PREFERRED_VERSION_libmikmod = "3.2.0-beta2" +PREFERRED_VERSION_mtd-utils-native = "1.2.0+git" +PREFERRED_VERSION_strace = "4.5.15" # We need this for jamvm -PREFERRED_VERSION_classpath ?= "0.98" -PREFERRED_VERSION_classpath-native ?= "0.98" +PREFERRED_VERSION_classpath = "0.98" +PREFERRED_VERSION_classpath-native = "0.98" # we need new headers for libc, now OLDEST_KERNEL_linux-gnueabi = "2.6.24" -PREFERRED_VERSION_linux-libc-headers = "2.6.29" +# and 2.6.31 for fsodeviced +PREFERRED_VERSION_linux-libc-headers = "2.6.31" # override EFL_SRCREV from sane-srcrevs.inc -EFL_SRCREV ?= "43898" +# now is EFL_SRCREV newer in sane-srcrevs.inc +# EFL_SRCREV ?= "43898" # upgrades used in Angstrom PREFERRED_VERSION_gtk+ = "2.18.3" @@ -32,4 +34,4 @@ UDEV_GE_141 = "1" # Downgraded # python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py -PREFERRED_VERSION_python-pygtk ?= "2.10.4" +PREFERRED_VERSION_python-pygtk = "2.10.4" diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index 6eb1004cfd..f99b44945c 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -19,7 +19,7 @@ SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}" # FSO Projects -- Misc SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb" SRCREV_pn-frameworkd ?= "d48bd43c430322b26744e31829f9c76e9b725819" -SRCREV_pn-frameworkd-config-shr_FSO_REV = ${SRCREV_pn-frameworkd} +SRCREV_pn-frameworkd-config-shr_FSO_REV ?= ${SRCREV_pn-frameworkd} SRCREV_pn-fso-abyss ?= "7f271311e2e0b63235139859169bd248920ade30" SRCREV_pn-fso-term ?= "aa0b9c26dee3918a5e9d2809bb36335bda276a0d" SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index bdfb729b2d..9210ef7fe6 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -80,7 +80,7 @@ SRCREV_pn-ffalarms ?= "67" SRCREV_pn-flashrom ?= "3682" SRCREV_pn-fltk2 ?= "6671" SRCREV_pn-frameworkd-config-shr ?= "cb4159e653d770da8e8f9fc9a65135839533d4c5" -SRCREV_pn-frameworkd-config-shr_SHR_REV = ${SRCREV_pn-frameworkd-config-shr} +SRCREV_pn-frameworkd-config-shr_SHR_REV ?= ${SRCREV_pn-frameworkd-config-shr} SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b" SRCREV_pn-fsoraw ?= "20" SRCREV_pn-fstests ?= "204" |