Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

7 files changed, 21 insertions, 12 deletions

diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 6cbd032259..f78c804203 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1840,7 +1840,7 @@ PREFERRED_VERSION_thunar ?= "0.8.0"
 PREFERRED_VERSION_thunderbird ?= "1.0.7"
 PREFERRED_VERSION_tickypip ?= "0.1.2"
 PREFERRED_VERSION_tickypip-levels ?= "1.1"
-PREFERRED_VERSION_tiff ?= "3.7.2"
+PREFERRED_VERSION_tiff ?= "3.8.2"
 PREFERRED_VERSION_tightvnc ?= "1.3dev7"
 PREFERRED_VERSION_tiinit ?= "3.2.26"
 PREFERRED_VERSION_time ?= "1.7"
@@ -1932,7 +1932,7 @@ PREFERRED_VERSION_util-macros ?= "1.1.5"
 PREFERRED_VERSION_util-macros-native ?= "1.1.5"
 PREFERRED_VERSION_uucp ?= "1.07"
 PREFERRED_VERSION_v4l2apps ?= "20020317"
-PREFERRED_VERSION_vala ?= "0.5.1"
+PREFERRED_VERSION_vala ?= "0.5.6"
 PREFERRED_VERSION_vala-native ?= "0.5.6"
 PREFERRED_VERSION_vde ?= "2.0.2"
 PREFERRED_VERSION_vectoroids ?= "1.1.0"
diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index 1c69b14fa6..d495930b20 100644
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -63,6 +63,14 @@ PREFERRED_VERSION_udev				?= "118"
 
 ##################### Stuff with special notes, and broken stuff:
 
+# libtool/pkgconfig victims -- these packages are locked down because
+# newer versions also require newer libtool/pkgconfig versions.
+
+PREFERRED_VERSION_avahi				?= "0.6.23"
+PREFERRED_VERSION_gst-plugins-base		?= "0.10.17"
+PREFERRED_VERSION_tiff				?= "3.7.2"
+
+
 # Hack alert - selecting this version of libusb effectively selects
 # the use of libusb1 and libusb-compat in the case that something
 # still depends on libusb. This is required because otherwise
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 15baf2b144..4f87639586 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -57,11 +57,11 @@ SRCREV_pn-flashrom ?= "3682"
 SRCREV_pn-frameworkd ?= "700ab8250582767628165b7cf6f671ef756ba56d"
 SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}"
 SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136"
-SRCREV_pn-fso-abyss ?= "09fd818470bb0da3b7614804f5141be52e0942c1"
+SRCREV_pn-fso-abyss ?= "1af4f7914c84e050b3b409634c5e7ef70d5d6544"
 SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
 SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0"
 SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
-SRCREV_pn-fso-monitord ?= "6a7860dc09a18144e8e363e64b2eb881bba83728"
+SRCREV_pn-fso-monitord ?= "0f64979a11d6263c7b7ed0e945a0889744f295f1"
 SRCREV_pn-fso-sounds ?= "3d2cf5231cb0e81770a246530574142bd2b8bbff"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
@@ -84,7 +84,7 @@ SRCREV_pn-libexalt-dbus ?= "76"
 SRCREV_pn-libfakekey ?= "1455"
 SRCREV_pn-libframeworkd-glib ?= "e90f7c208356b53c34e025585248ea0a7a2ea13c"
 SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
-SRCREV_pn-libgsm0710 ?= "a05704a56003dc02dca784cef4176e97eaf9f688"
+SRCREV_pn-libgsm0710 ?= "243ef1b0db523a1ff163803e8277dc02e7c7b0b8"
 SRCREV_pn-libgsmd ?= "4505"
 SRCREV_pn-libiac ?= "1590"
 SRCREV_pn-libjana ?= "713"
@@ -116,6 +116,7 @@ SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-mickeydbus ?= "f894801916cc4d0e912e4553490dc215276c52a9"
 SRCREV_pn-mickeyterm ?= "f894801916cc4d0e912e4553490dc215276c52a9"
+SRCREV_pn-midori ?= "f30dff433056e239ca775d16f343bdb249f1a338"
 SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
 SRCREV_pn-mokoko ?= "127"
@@ -245,7 +246,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "38544"
+EFL_SRCREV ?= "39089"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 0f88755f8d..40c9f9e557 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -16,7 +16,7 @@
 #TARGET_OS "linux" or "linux-uclibc"
 
 # The following may be overridden to make sub-versions
-SLUGOS_VERSION = "5.2"
+SLUGOS_VERSION = "5.3"
 DISTRO_REVISION ?= ""
 DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 # For release (only):
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index fac86c8667..a65bbff2c8 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -21,7 +21,7 @@ require conf/distro/include/preferred-opie-versions-1.2.4.inc
 PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
 PREFERRED_VERSION_busybox        = "1.13.2"
 
-DISTRO_DEV_MANAGER = "busybox-mdev"
+IMAGE_DEV_MANAGER = "busybox-mdev"
 
 #Images built can have to modes:
 # 'debug': empty rootpassword, strace included
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index c038096231..cb1513de4b 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -30,7 +30,7 @@ DISTRO_FEED_URI ?= "http://downloads.openmoko.org/repository/testing"
 AB_DEPLOY_EXTRA ?= ""
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE_ARCH}/${AB_DEPLOY_EXTRA}"
 
-DISTRO_INITSCRIPTS = "initscripts-openmoko"
+IMAGE_INITSCRIPTS = "initscripts-openmoko"
 
 # We try to minimize the distro features in the default image.
 DISTRO_FEATURES = "wifi ppp alsa ext2 vfat usbhost"
diff --git a/conf/distro/openprotium.conf b/conf/distro/openprotium.conf
index b794d4a4ec..633e3bcaef 100644
--- a/conf/distro/openprotium.conf
+++ b/conf/distro/openprotium.conf
@@ -8,10 +8,10 @@ TARGET_OS = "linux"
 #
 # Basic configuration
 #
-DISTRO_DEV_MANAGER = "udev"
+IMAGE_DEV_MANAGER = "udev"
 DISTRO_SSH_DAEMON = "dropbear"
-DISTRO_INIT_MANAGER = "sysvinit"
-DISTRO_LOGIN_MANAGER = "tinylogin"
+IMAGE_INIT_MANAGER = "sysvinit"
+IMAGE_LOGIN_MANAGER = "tinylogin"
 MACHINE_TASK_PROVIDER = "task-openprotium"
 
 #