diff options
| author | Lukas Gorris <lukas.gorris@gmail.com> | 2010-02-02 17:11:19 +0100 |
|---|---|---|
| committer | Lukas Gorris <lukas.gorris@gmail.com> | 2010-02-02 17:11:19 +0100 |
| commit | 5484f8810904446320b4ea1c97b2958cc9853daa (patch) | |
| tree | 4bb9d2bb844398056734e94b194e8808c8849029 /conf/distro | |
| parent | 54c6fa7af1c69196c28e1ec7df0f4b50785e8674 (diff) | |
| parent | 86a69a7aa513ab7b2a53f6f6589646952b1e7ebb (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 3 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs-fso.inc | 20 | ||||
| -rw-r--r-- | conf/distro/include/sane-toolchain-java.inc | 6 |
3 files changed, 18 insertions, 11 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index a827a93269..5f9e333046 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -26,7 +26,7 @@ PREFERRED_VERSION_libtool-sdk = "2.2.6b" PREFERRED_VERSION_mesa = "7.6" PREFERRED_VERSION_mesa-dri = "7.6" PREFERRED_VERSION_mesa-xlib = "7.6" -PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr30432" +PREFERRED_VERSION_mplayer = "0.0+1.0rc3+svnr30165" PREFERRED_VERSION_pango = "1.24.4" #PREFERRED_VERSION_pixman = "0.13.2" PREFERRED_VERSION_pkgconfig = "0.23" @@ -48,6 +48,7 @@ UDEV_GE_141 = "1" PREFERRED_VERSION_usbutils = "0.82" PREFERRED_VERSION_wpa-supplicant = "0.6.9" +PREFERRED_VERSION_xserver-common = "1.32" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" # diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index b858d81283..38a4a633f5 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -1,19 +1,19 @@ # To be included from sane-srcrevs.inc # FSO Projects -- Cornucopia -FSO_CORNUCOPIA_SRCREV ?= "70b87d6e8b04f0bf0078702f6467e037eb4fdb28" +FSO_CORNUCOPIA_SRCREV ?= "429a3d190016b7516b57703faa777c398d843d6c" SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsodeviced ?= "44a4aabf382995c9f3141ec09b202f0e569a484d" +SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsomusicd ?= "3233c80585dfbc0e77ee5549f9d7fb1a60b5a0f9" +SRCREV_pn-fsomusicd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsotdld ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-libfsoframework ?= "c227502c59f4d1de3b3097b3329c2461d6cfa2a2" +SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-mickeydbus2 ?= "${FSO_CORNUCOPIA_SRCREV}" @@ -28,13 +28,13 @@ SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6" SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4" SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44" SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815" -SRCREV_pn-fso-specs ?= "60580a3fc3e8b2c036f9734c59994a5175bfcc1e" +SRCREV_pn-fso-specs ?= "af3e18e5183ccce29a03eea9fc5f5a0098003cc6" SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8" -SRCREV_pn-libeflvala ?= "707ca862f11feb4fa6945c222a34272b8fd3aebb" -SRCREV_pn-libfso-glib ?= "4016a7ff20cf53403ab22877eef3a706607f25a3" -SRCREV_pn-libframeworkd-glib ?= "bdea2ad33bb5c5aa2b996712b99e8dd9b58aed7d" +SRCREV_pn-libeflvala ?= "294f250f5c20a058f5016aaf674c57d0498070fd" +SRCREV_pn-libfso-glib ?= "d7d9045b806744bdedf409874009cfde16c2de39" +SRCREV_pn-libframeworkd-glib ?= "f68fe525c20aa8ef6c6cff70a80e60b91bed89a9" SRCREV_pn-libgsm0710 ?= "cd564c8782f018e0d65fb8716c99a6040b5bd166" -SRCREV_pn-libgsm0710mux ?= "b6793a8191f20adba31b93b2f337cc5451270cf9" +SRCREV_pn-libgsm0710mux ?= "7934196c47eb80e77105a92cb684656b3614a9fc" SRCREV_pn-libpersistence ?= "217ad803745f8ac1f3c72c6715e2c0faefb3fd06" FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317" SRCREV_pn-mickeydbus ?= "${FSO_PYTHONHELPERS_SRCREV}" @@ -43,7 +43,7 @@ SRCREV_pn-msmcommd ?= "072226ac1e0f21735cb3bc26cdb87cd87e347afb" SRCREV_pn-multicat ?= "${FSO_PYTHONHELPERS_SRCREV}" SRCREV_pn-python-pyrtc ?= "${FSO_PYTHONHELPERS_SRCREV}" SRCREV_pn-pycd ?= "${FSO_PYTHONHELPERS_SRCREV}" -SRCREV_pn-vala-dbus-binding-tool-native ?= "11e5b817f569e3ce81fa94ed77ed529101368b7f" +SRCREV_pn-vala-dbus-binding-tool-native ?= "8df9b5aab50066d3f5a525518f902dd26f77bbd7" SRCREV_pn-vala-terminal ?= "932285d72e26b965c488f8aa99fe51f7a34231ad" SRCREV_pn-vala-native ?= "a8aa50a80bcdc5f6c8183507f87b6c6fdfac8d9f" SRCREV_pn-zhone ?= "d654b3d15500a56c8e987e4d2cc2f8eef70b78c0" diff --git a/conf/distro/include/sane-toolchain-java.inc b/conf/distro/include/sane-toolchain-java.inc new file mode 100644 index 0000000000..a0f579252c --- /dev/null +++ b/conf/distro/include/sane-toolchain-java.inc @@ -0,0 +1,6 @@ +# Set PREFFERED and VERSION stuff for working java-toolchain + +PREFERRED_PROVIDER_virtual/java-initial = "jamvm-initial" +PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" +PREFERRED_VERSION_classpath-native = "0.98" +PREFERRED_VERSION_classpath = "0.98" |