summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc20
-rw-r--r--conf/distro/include/fso-autorev.inc1
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc4
-rw-r--r--conf/distro/include/preferred-shr-versions.inc16
-rw-r--r--conf/distro/include/sane-feed.inc6
-rw-r--r--conf/distro/include/sane-srcrevs-fso.inc29
-rw-r--r--conf/distro/include/sane-srcrevs.inc19
-rw-r--r--conf/distro/include/sane-toolchain-java.inc6
-rw-r--r--conf/distro/include/sane-toolchain.inc4
-rw-r--r--conf/distro/include/shr-autorev.inc2
-rw-r--r--conf/distro/jlime-2010.1.conf13
-rw-r--r--conf/distro/shr.conf1
12 files changed, 71 insertions, 50 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 18df733fa1..5f9e333046 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -8,24 +8,25 @@ PREFERRED_VERSION_cairo = "1.8.8"
PREFERRED_VERSION_dbus = "1.2.3"
PREFERRED_VERSION_dropbear = "0.51"
PREFERRED_VERSION_fontconfig = "2.6.0"
-PREFERRED_VERSION_glib-2.0 = "2.22.1"
-PREFERRED_VERSION_glib-2.0-native = "2.22.1"
+PREFERRED_VERSION_glib-2.0 = "2.22.4"
+PREFERRED_VERSION_glib-2.0-native = "2.22.4"
PREFERRED_VERSION_glibmm = "2.22.1"
PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_gtk+ = "2.18.3"
+PREFERRED_VERSION_gtk+ = "2.18.6"
+PREFERRED_VERSION_gtk+-native = "2.18.6"
PREFERRED_VERSION_gtkmm = "2.18.1"
-PREFERRED_VERSION_hal = "0.5.13"
+PREFERRED_VERSION_hal = "0.5.14"
PREFERRED_VERSION_libgemwidget = "1.0"
PREFERRED_VERSION_libgpephone = "0.4"
PREFERRED_VERSION_libsdl-x11 = "1.2.14"
-PREFERRED_VERSION_libtool = "2.2.6a"
-PREFERRED_VERSION_libtool-native = "2.2.6a"
-PREFERRED_VERSION_libtool-cross = "2.2.6a"
-PREFERRED_VERSION_libtool-sdk = "2.2.6a"
+PREFERRED_VERSION_libtool = "2.2.6b"
+PREFERRED_VERSION_libtool-native = "2.2.6b"
+PREFERRED_VERSION_libtool-cross = "2.2.6b"
+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+svnr30165"
+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"
@@ -47,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/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index f5c7974d5b..fda3cd4729 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -11,6 +11,7 @@ SRCREV_pn-fsonetworkd = "${AUTOREV}"
SRCREV_pn-fsotimed = "${AUTOREV}"
SRCREV_pn-fsousaged = "${AUTOREV}"
SRCREV_pn-fso-abyss = "${AUTOREV}"
+SRCREV_pn-fso-boot = "${AUTOREV}"
SRCREV_pn-fso-apm = "${AUTOREV}"
SRCREV_pn-fso-term = "${AUTOREV}"
SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index d881202b09..960169afbd 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -123,7 +123,7 @@ PREFERRED_VERSION_bvi ?= "1.3.1"
PREFERRED_VERSION_bwmon ?= "1.3"
PREFERRED_VERSION_bzflag ?= "1.10.6.20040515"
PREFERRED_VERSION_bzflag-server ?= "1.10.6.20040515"
-PREFERRED_VERSION_bzip2 ?= "1.0.2"
+PREFERRED_VERSION_bzip2 ?= "1.0.5"
PREFERRED_VERSION_cacao-cldc ?= "0.98"
PREFERRED_VERSION_cacaoh-cldc-native ?= "0.98"
PREFERRED_VERSION_cairo ?= "1.6.4"
@@ -1429,7 +1429,7 @@ PREFERRED_VERSION_phoneserver ?= "1.0"
PREFERRED_VERSION_php ?= "5.2.0"
PREFERRED_VERSION_php-native ?= "5.2.0"
PREFERRED_VERSION_picocom ?= "1.4"
-PREFERRED_VERSION_pidgin ?= "2.5.8"
+PREFERRED_VERSION_pidgin ?= "2.6.5"
PREFERRED_VERSION_pine ?= "4.64"
PREFERRED_VERSION_pipeman ?= "1.0.0"
PREFERRED_VERSION_pipepanic ?= "0.1.1"
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 39b1f0764e..f1d16d3b4d 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -25,15 +25,18 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.31"
PREFERRED_VERSION_openssh = "5.2p1"
# upgrades used in Angstrom
-PREFERRED_VERSION_gtk+ = "2.18.3"
+PREFERRED_VERSION_gtk+ = "2.18.6"
+PREFERRED_VERSION_gtk+-native = "2.18.6"
PREFERRED_VERSION_hal = "0.5.13"
-PREFERRED_VERSION_libtool = "2.2.6a"
-PREFERRED_VERSION_libtool-native = "2.2.6a"
-PREFERRED_VERSION_libtool-cross = "2.2.6a"
-PREFERRED_VERSION_libtool-sdk = "2.2.6a"
+PREFERRED_VERSION_libtool = "2.2.6b"
+PREFERRED_VERSION_libtool-native = "2.2.6b"
+PREFERRED_VERSION_libtool-cross = "2.2.6b"
+PREFERRED_VERSION_libtool-sdk = "2.2.6b"
PREFERRED_VERSION_udev = "141"
PREFERRED_VERSION_usbutils = "0.82"
PREFERRED_VERSION_wpa-supplicant = "0.6.9"
+PREFERRED_VERSION_glib-2.0 = "2.22.4"
+PREFERRED_VERSION_glib-2.0-native = "2.22.4"
UDEV_GE_141 = "1"
ANGSTROM_QT_VERSION ?= "4.6.0"
@@ -46,5 +49,4 @@ PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}"
# 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_pulseaudio = "0.9.15"
diff --git a/conf/distro/include/sane-feed.inc b/conf/distro/include/sane-feed.inc
index 5bc19a1806..873972f5aa 100644
--- a/conf/distro/include/sane-feed.inc
+++ b/conf/distro/include/sane-feed.inc
@@ -41,7 +41,13 @@ FEED_ARCH_a780 = "armv5te"
FEED_ARCH_akita = "armv5te"
FEED_ARCH_asus620 = "armv5te"
FEED_ARCH_asus730 = "armv5te"
+FEED_ARCH_at91sam9260ek = "armv5te"
+FEED_ARCH_at91sam9261ek = "armv5te"
FEED_ARCH_at91sam9263ek = "armv5te"
+FEED_ARCH_at91sam9rlek = "armv5te"
+FEED_ARCH_at91sam9g10ek = "armv5te"
+FEED_ARCH_at91sam9g20ek = "armv5te"
+FEED_ARCH_at91sam9g45ekes = "armv5te"
FEED_ARCH_aximx50 = "armv5te"
FEED_ARCH_aximx50v = "armv5te"
FEED_ARCH_c7x0 = "armv5te"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index 06e3f1c8e0..eecf69f24b 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -1,26 +1,27 @@
# 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-fso-boot ?= "241e9212db9f22d3cb0491723a1c41309f4bf486"
SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsodeviced ?= "44a4aabf382995c9f3141ec09b202f0e569a484d"
-SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsodeviced ?= "c5094450745643b1b4410a79d7cb72e3f7df28a6"
+SRCREV_pn-fsogsmd ?= "42b94a43ef1dce1225c1f26301c0f4b8aab669e8"
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-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsotransport ?= "0c1e8c057b4110b1d8d2c24fd93744c03c304cc8"
SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-mickeydbus2 ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-mickeydbus2 ?= "3e75d0ab3e334e303fa1f64b5d87465150c0b58c"
# FSO Projects -- Misc
SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb"
-SRCREV_pn-frameworkd ?= "439300083459fe66cb93aca20cee185f6fcc52f5"
+SRCREV_pn-frameworkd ?= "e3d6339c5d69e0791c4633f86363159e56126075"
SRCREV_pn-frameworkd-config-shr_FSO_REV ?= ${SRCREV_pn-frameworkd}
SRCREV_pn-fso-abyss ?= "aaa3c48296c8589d845f2b6e4314b794750d91cc"
SRCREV_pn-fso-term ?= "aa0b9c26dee3918a5e9d2809bb36335bda276a0d"
@@ -28,13 +29,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 +44,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-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index f4d79268a2..2dfaf34145 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -46,7 +46,6 @@ SRCREV_pn-dfu-util-native ?= "4160"
SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953"
SRCREV_pn-diversity-daemon ?= "571"
SRCREV_pn-diversity-radar ?= "453"
-SRCREV_pn-e-tasks ?= "22"
SRCREV_pn-e-wm-config-illume-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752"
SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
@@ -63,7 +62,7 @@ SRCREV_pn-elementary-theme-neo ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
SRCREV_pn-elementary-theme-niebiee ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
SRCREV_pn-elementary-theme-sixteen ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
SRCREV_pn-elf2flt ?= "1786"
-SRCREV_pn-elmdentica ?= "171"
+SRCREV_pn-elmdentica ?= "215"
SRCREV_pn-enlazar ?= "37"
SRCREV_pn-enotes ?= "19"
SRCREV_pn-epdfview ?= "346"
@@ -102,7 +101,7 @@ SRCREV_pn-guitartune ?= "11"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
SRCREV_pn-icon-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-illume-keyboards-shr ?= "c23bde500152c303971b4c2ec5c463d760b7cc14"
+SRCREV_pn-illume-keyboards-shr ?= "7bcdd55dc0cf6f3b50fd0226345592f538301b8a"
SRCREV_pn-illume-theme-asu ?= "4881"
SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5"
SRCREV_pn-intone ?= "75"
@@ -148,7 +147,7 @@ SRCREV_pn-linux-ixp4xx ?= "1089"
SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
SRCREV_pn-linux-openmoko-2.6.31 ?= "dd32737aa524e09c1d141a0e735dd58674552244"
-SRCREV_pn-linux-openmoko-2.6.32 ?= "058cbf4220fd2f1cd970bf553c044cb178e3804e"
+SRCREV_pn-linux-openmoko-2.6.32 ?= "04697d0e4011a0f2942411acff56f9bc9ca6c11a"
SRCREV_pn-linux-openmoko-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
SRCREV_pn-linux-openmoko-shr-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
SRCREV_pn-linux-openmoko-shr-drm-devel ?= "e62a4ae1c6783f41b41a9ac3d258786586b65a40"
@@ -157,8 +156,8 @@ SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3"
SRCREV_pn-maemo-mapper ?= "118"
-SRCREV_pn-mamona_input_methods ?= "7e6a8cc947689a045d0fba90015da599275347d9"
-SRCREV_pn-mamonaim_e_applet ?= "51c747849f71981bd1dc9eb1807df4993ad97d04"
+SRCREV_pn-mamona-input-methods ?= "4a8f11973021b8b4f157f5743e00f9f9a3c4802b"
+SRCREV_pn-mamonaim-e-applet ?= "a1ba7e8a388ffce3cca92bad059cd801e7733a7a"
SRCREV_pn-matchbox-config-gtk ?= "1614"
SRCREV_pn-matchbox-desktop-2 ?= "2096"
SRCREV_pn-matchbox-keyboard ?= "1910"
@@ -181,8 +180,8 @@ SRCREV_pn-mplayer-maemo ?= "342"
SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257"
SRCREV_pn-multitap-pad ?= "373"
SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
-SRCREV_pn-navit ?= "2902"
-SRCREV_pn-navit-icons ?= "2871"
+SRCREV_pn-navit ?= "2934"
+SRCREV_pn-navit-icons ?= "2927"
SRCREV_pn-neod ?= "4617"
SRCREV_pn-neomis ?= "6"
SRCREV_pn-net-snmp ?= "17367"
@@ -246,7 +245,7 @@ SRCREV_pn-openocd ?= "517"
SRCREV_pn-openocd-native ?= "517"
SRCREV_pn-opimd-utils ?= "7321c3f1a3cd781f9ed13ea3cac38879429dd420"
SRCREV_pn-opkg ?= "446"
-SRCREV_pn-opkg-native ?= "446"
+SRCREV_pn-opkg-native ?= "519"
SRCREV_pn-opkg-sdk ?= "446"
SRCREV_pn-opkg-utils ?= "4578"
SRCREV_pn-opkg-utils-native ?= "4595"
@@ -335,7 +334,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCREV ?= "45060"
+EFL_SRCREV ?= "45765"
SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
SRCREV_pn-edb ?= "${EFL_SRCREV}"
SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
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"
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index 04fde21b25..daa2deff29 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -9,8 +9,8 @@ PREFERRED_GCC_VERSION ?= "4.4.2"
PREFERRED_BINUTILS ?= "2.20"
# Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
-PREFERRED_VERSION_glibc ?= "2.6.1"
-PREFERRED_VERSION_glibc-initial ?= "2.6.1"
+PREFERRED_VERSION_glibc ?= "2.10.1"
+PREFERRED_VERSION_glibc-initial ?= "2.10.1"
PREFERRED_VERSION_eglibc ?= "2.10"
PREFERRED_VERSION_eglibc-initial ?= "2.10"
PREFERRED_VERSION_uclibc ?= "0.9.30.1"
diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
index 75f389cf83..6a8ef29fe2 100644
--- a/conf/distro/include/shr-autorev.inc
+++ b/conf/distro/include/shr-autorev.inc
@@ -16,3 +16,5 @@ SRCREV_pn-opimd-utils = "${AUTOREV}"
SRCREV_pn-shr-installer = "${AUTOREV}"
SRCREV_pn-shr-wizard = "${AUTOREV}"
+SRCREV_pn-ventura = "${AUTOREV}"
+SRCREV_pn-emtooth = "${AUTOREV}"
diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf
index c60d65ddb8..9e18e9c8bd 100644
--- a/conf/distro/jlime-2010.1.conf
+++ b/conf/distro/jlime-2010.1.conf
@@ -31,7 +31,7 @@ DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
#<>Our Image files should look abit better.
#<>
#<>------------------------------------------------------------------<
-IMAGE_NAME = "JLiMe-${IMAGE_BASENAME}-2009.1-${MACHINE}"
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
SPLASH = "psplash"
#
@@ -71,14 +71,14 @@ PREFERRED_VERSION_gcc = "4.4.2"
PREFERRED_VERSION_gcc-cross = "4.4.2"
PREFERRED_VERSION_gcc-cross-initial = "4.4.2"
PREFERRED_VERSION_gcc-cross-intermediate = "4.4.2"
-PREFERRED_VERSION_binutils = "2.18"
-PREFERRED_VERSION_binutils-cross = "2.18"
-PREFERRED_VERSION_coreutils-native = "6.0"
+PREFERRED_VERSION_binutils = "2.20"
+PREFERRED_VERSION_binutils-cross = "2.20"
+PREFERRED_VERSION_coreutils-native = "7.2"
#
# Target OS & FPU system
#
-TARGET_OS = "linux"
+TARGET_OS ?= "linux"
TARGET_FPU_sh = "soft"
TARGET_FPU_arm = "soft"
TARGET_FPU_armeb = "soft"
@@ -103,13 +103,14 @@ require conf/distro/include/sane-srcrevs.inc
# Framebuffer & X
#
require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/libx11 = "libx11"
PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libgl = "mesa-xlib"
PREFERRED_PROVIDER_tslib = "tslib"
PREFERRED_VERSION_mesa = "7.6"
PREFERRED_VERSION_mesa-dri = "7.6"
PREFERRED_VERSION_mesa-xlib = "7.6"
+SERVER ?= " xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mousexf86-video-fbdev "
#
# General Userspace
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 5417f5b06d..6872bb6abf 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -49,6 +49,7 @@ ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4
ANGSTROM_BLACKLIST_pn-atd = "atd has been replaced by atd-over-fso"
ANGSTROM_BLACKLIST_pn-update-alternatives-cworth-native = "update-alternatives-cworth-native has been replaced by opkg implementation of u-a script"
ANGSTROM_BLACKLIST_pn-update-alternatives-cworth = "update-alternatives-cworth has been replaced by opkg implementation of u-a script"
+ANGSTROM_BLACKLIST_pn-qt4-x11-free-gles = "qt4-x11-free is fine even without gles"
CVS_TARBALL_STASH += "http://build.shr-project.org/sources/"
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-31 08:58:21 +0000