SlugOS: update preferred versions for distro to current

(fixes problem where gphoto and libgphoto fail to build)

diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index 5ec80ff..204047f 100644 (file)
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -36,22 +36,22 @@ PREFERRED_VERSION_binutils                  ?= "2.18.50.0.7"
 PREFERRED_VERSION_binutils-cross               ?= "2.18.50.0.7"
 PREFERRED_VERSION_binutils-cross-sdk           ?= "2.18.50.0.7"
 PREFERRED_VERSION_busybox                      ?= "1.13.2"
-PREFERRED_VERSION_dbus                         ?= "1.2.1"
+PREFERRED_VERSION_dbus                         ?= "1.2.3"
 PREFERRED_VERSION_gcc                          ?= "4.2.4"
 PREFERRED_VERSION_gcc-cross                    ?= "4.2.4"
 PREFERRED_VERSION_gcc-cross-sdk                        ?= "4.2.4"
 PREFERRED_VERSION_gcc-cross-initial            ?= "4.2.4"
 PREFERRED_VERSION_gcc-cross-intermediate       ?= "4.2.4"
-PREFERRED_VERSION_glib-2.0                     ?= "2.18.3"
-PREFERRED_VERSION_glib-2.0-native              ?= "2.18.0"
+PREFERRED_VERSION_glib-2.0                     ?= "2.22.1"
+PREFERRED_VERSION_glib-2.0-native              ?= "2.22.1"
 PREFERRED_VERSION_glibc                                ?= "2.6.1"
 PREFERRED_VERSION_glibc-initial                        ?= "2.6.1"
 PREFERRED_VERSION_ipkg                         ?= "0.99.163"
 PREFERRED_VERSION_ipkg-native                  ?= "0.99.163"
-PREFERRED_VERSION_libtool                      ?= "2.2.4"
-PREFERRED_VERSION_libtool-native               ?= "2.2.4"
-PREFERRED_VERSION_libtool-cross                        ?= "2.2.4"
-PREFERRED_VERSION_libtool-sdk                  ?= "2.2.4"
+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_linux-libc-headers           ?= "2.6.23"
 PREFERRED_VERSION_m4                           ?= "1.4.8"
 PREFERRED_VERSION_m4-native                    ?= "1.4.8"

diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 8a331ae..10a2bc4 100644 (file)
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -166,6 +166,12 @@ PREFERRED_PROVIDER_avahi                   ?= "avahi"
 PREFERRED_PROVIDER_gconf                       ?= "gconf"
 PREFERRED_PROVIDER_virtual/libusb0             ?= "libusb-compat"
 
+# we use bluez4 instead of the older bluez3
+DISTRO_BLUETOOTH_MANAGER                       = "bluez4"
+PREFERRED_PROVIDER_bluez-utils-dbus            = "bluez-utils"
+PREFERRED_PROVIDER_bluez-libs                  = "bluez4"
+PREFERRED_PROVIDER_bluez-utils                 = "bluez4"
+
 # Include any package preferred versions and srcrevs:
 
 require conf/distro/include/preferred-slugos-versions.inc