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

10 files changed, 286 insertions, 83 deletions

diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 32cfbfb403..0c0c83117e 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -11,7 +11,7 @@ PREFERRED_VERSION_glib-2.0-native = "2.18.0"
 PREFERRED_VERSION_glibmm = "2.18.0"
 PREFERRED_VERSION_glproto	= "1.4.9"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
-PREFERRED_VERSION_gtk+		= "2.16.4"
+PREFERRED_VERSION_gtk+		= "2.16.6"
 PREFERRED_VERSION_gtkmm		= "2.14.1"
 PREFERRED_VERSION_hal		= "0.5.13"
 PREFERRED_VERSION_libgemwidget	= "1.0"
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index e947833453..2a1b7b059c 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -1,9 +1,10 @@
 # eglibc:
 require conf/distro/include/eglibc.inc
 
-TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
+TARGET_OS = "linux"
 
-TARGET_OS = "linux${@['','-gnuspe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', 'powerpc'] and bb.data.getVar('MACHINE',d) in ['calamari']]}"
+TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
+TARGET_OS .= "${@['','-gnuspe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', 'powerpc'] and bb.data.getVar('MACHINE',d) in ['calamari']]}"
 
 #TARGET_OS = "linux-gnuspe"
 
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
deleted file mode 100644
index ce9f488e77..0000000000
--- a/conf/distro/include/moko-autorev.inc
+++ /dev/null
@@ -1,71 +0,0 @@
-SRCREV_pn-assassin ?= "${AUTOREV}"
-SRCREV_pn-dfu-util ?= "${AUTOREV}"
-SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
-SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
-SRCREV_pn-diversity-radar ?= "${AUTOREV}"
-SRCREV_pn-etk-theme-ninja ?= "${AUTOREV}"
-SRCREV_pn-exposure ?= "${AUTOREV}"
-SRCREV_pn-illume-theme-asu ?= "${AUTOREV}"
-SRCREV_pn-libgsmd ?= "${AUTOREV}"
-SRCREV_pn-libjana ?= "${AUTOREV}"
-SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
-SRCREV_pn-libmokojournal2 ?= "${AUTOREV}"
-SRCREV_pn-libmokopanelui2 ?= "${AUTOREV}"
-SRCREV_pn-libmokoui2 ?= "${AUTOREV}"
-SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
-SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
-SRCREV_pn-multitap-pad ?= "${AUTOREV}"
-SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
-SRCREV_pn-neod ?= "${AUTOREV}"
-SRCREV_pn-om-locations ?= "${AUTOREV}"
-SRCREV_pn-openmoko-agpsui ?= "${AUTOREV}"
-SRCREV_pn-openmoko-alsa-scenarios ?= "${AUTOREV}"
-SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
-SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-common2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-contacts2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-dates2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-dialer2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "${AUTOREV}"
-SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-memory ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
-SRCREV_pn-openmoko-panel-wifi ?= "${AUTOREV}"
-SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
-SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
-SRCREV_pn-openmoko-toolchain-scripts ?= "${AUTOREV}"
-SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
-SRCREV_pn-openocd ?= "${AUTOREV}"
-SRCREV_pn-openocd-native ?= "${AUTOREV}"
-SRCREV_pn-opkg ?= "${AUTOREV}"
-SRCREV_pn-opkg-native ?= "${AUTOREV}"
-SRCREV_pn-opkg-sdk ?= "${AUTOREV}"
-SRCREV_pn-packagekit ?= "${AUTOREV}"
-SRCREV_pn-paroli ?= "${AUTOREV}"
-SRCREV_pn-pyefl-sudoku ?= "${AUTOREV}"
-SRCREV_pn-qi ?= "${AUTOREV}"
-SRCREV_pn-tichy ?= "${AUTOREV}"
-SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}"
-SRCREV_pn-u-boot-openmoko-devel ?= "${AUTOREV}"
-SRCREV_pn-usbpath ?= "${AUTOREV}"
-SRCREV_pn-usbpath-native ?= "${AUTOREV}"
-SRCREV_pn-wmiconfig ?= "${AUTOREV}"
-
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
index 6e42065aed..4acca00174 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
@@ -2,6 +2,6 @@
 
 PREFERRED_VERSION_xserver-xorg ?= "1.5.3"
 PREFERRED_VERSION_xf86-input-evdev ?= "2.1.0"
-PREFERRED_VERSION_xf86-video-geode ?= "2.11.2"
+PREFERRED_VERSION_xf86-video-geode ?= "2.11.4.1"
 PREFERRED_VERSION_libxi ?= "1.2.0"
 PREFERRED_VERSION_inputproto ?= "1.5.0"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
index 21f9758f0e..156653f18c 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
@@ -203,6 +203,7 @@ PREFERRED_VERSION_bigreqsproto ?= "1.0.2"
 PREFERRED_VERSION_compositeproto ?= "0.4"
 PREFERRED_VERSION_damageproto ?= "1.1.0"
 PREFERRED_VERSION_dmxproto ?= "2.2.2"
+PREFERRED_VERSION_dri2proto ?= "1.1"
 PREFERRED_VERSION_fixesproto ?= "4.0"
 PREFERRED_VERSION_fontcacheproto ?= "0.1.2"
 PREFERRED_VERSION_fontsproto ?= "2.0.2"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
index 4d62c487c7..d3794834b9 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
@@ -102,13 +102,13 @@ PREFERRED_VERSION_xf86-video-chips ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-cirrus ?= "1.2.1"
 PREFERRED_VERSION_xf86-video-dummy ?= "0.3.0"
 PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.0"
-PREFERRED_VERSION_xf86-video-geode ?= "2.11.2"
+PREFERRED_VERSION_xf86-video-geode ?= "2.11.4.1"
 PREFERRED_VERSION_xf86-video-glide ?= "1.0.1"
 PREFERRED_VERSION_xf86-video-glint ?= "1.2.1"
 PREFERRED_VERSION_xf86-video-i128 ?= "1.3.1"
 PREFERRED_VERSION_xf86-video-i740 ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-impact ?= "0.2.0"
-PREFERRED_VERSION_xf86-video-intel ?= "2.4.2"
+PREFERRED_VERSION_xf86-video-intel ?= "2.6.3"
 PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.0"
 PREFERRED_VERSION_xf86-video-mga ?= "1.4.9"
 PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.1"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index a9cc84fde4..956e1fbe22 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -17,6 +17,7 @@ SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1"
 SRCREV_pn-app-restarter ?= "4552"
 SRCREV_pn-assassin ?= "268"
 SRCREV_pn-assassin-thumbnail ?= "4690"
+SRCREV_pn-aufs2-util ?= "f35ba2292fe40aa94aa83713e0b2719f35a25768"
 SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-bootchart-lite ?= "4"
 SRCREV_pn-bubble-keyboard ?= "194"
@@ -86,6 +87,7 @@ SRCREV_pn-libexalt-dbus ?= "76"
 SRCREV_pn-libfakekey ?= "1455"
 SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
 SRCREV_pn-libgsmd ?= "4505"
+SRCREV_pn-libgee ?= "ea130c0837eefe404b53240f8c2ed642ae98a677"
 SRCREV_pn-libiac ?= "1590"
 SRCREV_pn-libjana = "749"
 SRCREV_pn-libmokogsmd2 ?= "4334"
@@ -94,6 +96,7 @@ SRCREV_pn-libmokopanelui2 ?= "4568"
 SRCREV_pn-libmokoui2 ?= "4342"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-librfid ?= "2094"
+SRCREV_pn-libsnmp-perl ?= "17367"
 SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
 SRCREV_pn-libw100 ?= "47"
 SRCREV_pn-libxcalibrate ?= "209d83af61ed38a002c8096377deac292b3e396c"
@@ -123,13 +126,14 @@ SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
 SRCREV_pn-mokoko ?= "127"
 SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-mplayer ?= "28346"
+SRCREV_pn-mplayer ?= "29653"
 SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-multicat ?= "f894801916cc4d0e912e4553490dc215276c52a9"
 SRCREV_pn-multitap-pad ?= "373"
 SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
 SRCREV_pn-navit ?= "1096"
 SRCREV_pn-neod ?= "4617"
+SRCREV_pn-net-snmp ?= "17367"
 SRCREV_pn-netsurf ?= "3859"
 SRCREV_pn-networkmanager ?= "3202"
 SRCREV_pn-networkmanager-applet ?= "200"
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index 65cb7763d1..9351187fe1 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -5,8 +5,8 @@
 #############################################################################
 
 # Base line versions, good for most things
-PREFERRED_GCC_VERSION                ?= "4.2.4"
-PREFERRED_BINUTILS                   ?= "2.18"
+PREFERRED_GCC_VERSION                ?= "4.4.1"
+PREFERRED_BINUTILS                   ?= "2.19.51"
 
 # Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
 PREFERRED_VERSION_glibc             ?= "2.6.1"
@@ -19,9 +19,9 @@ PREFERRED_VERSION_uclibc-initial    ?= "0.9.30.1"
 # Some systems need a special gcc version
 PREFERRED_GCC_VERSION_486sx          ?= "4.3.2"
 PREFERRED_GCC_VERSION_avr32          ?= "4.2.2"
-PREFERRED_GCC_VERSION_armv7a         ?= "4.3.1" 
+PREFERRED_GCC_VERSION_armv7a         ?= "4.4.1" 
 PREFERRED_GCC_VERSION_bfin           ?= "4.1.2"
-PREFERRED_GCC_VERSION_ppc405         ?= "4.1.1"
+PREFERRED_GCC_VERSION_ppc405         ?= "4.4.1"
 PREFERRED_GCC_VERSION_xilinx-ml403   ?= "4.1.1"
 PREFERRED_GCC_VERSION_xilinx-ml403   ?= "4.1.1"
 
@@ -157,7 +157,7 @@ def detect_arm_abi (d):
 def compute_os_portion_of_target_triplet (d):
 	import bb
 	arm_eabi_supporting_arches = "armv6 armv6-novfp \
-	armv5te iwmmxt armv7a armv7 armv6 armv5teb armv5te armv4t"
+	armv5te iwmmxt armv7a armv7 armv6 armv5teb armv4t"
 	ppc_spe_supporting_arches = "ppce500v2 ppce500"
 
   	if bb.data.getVar("LIBC", d, 1) == "uclibc":
diff --git a/conf/distro/include/shr-autorev-unstable.inc b/conf/distro/include/shr-autorev-unstable.inc
new file mode 100644
index 0000000000..5e7a0ddfa3
--- /dev/null
+++ b/conf/distro/include/shr-autorev-unstable.inc
@@ -0,0 +1,128 @@
+
+# SHR - override revs for shr-unstable
+
+
+# KERNEL
+SRCREV_pn-linux-openmoko-shr-devel = "${AUTOREV}"
+
+PREFERRED_VERSION_vala-native = "0.7.4+0.7.5-fso2"
+
+
+# FSO stuff
+SRCREV_pn-dbus-hlid = "${AUTOREV}"
+SRCREV_pn-frameworkd = "${AUTOREV}"
+SRCREV_pn-frameworkd-config-shr = "${AUTOREV}"
+SRCREV_pn-frameworkd-config-shr_FSO_REV = "${AUTOREV}"
+SRCREV_pn-frameworkd-config-shr_SHR_REV = "${AUTOREV}"
+SRCREV_pn-fsod = "${AUTOREV}"
+SRCREV_pn-fsodeviced = "${AUTOREV}"
+SRCREV_pn-fsonetworkd = "${AUTOREV}"
+SRCREV_pn-fsousaged = "${AUTOREV}"
+SRCREV_pn-fsoraw = "${AUTOREV}"
+SRCREV_pn-fso-abyss = "${AUTOREV}"
+SRCREV_pn-fso-apm = "${AUTOREV}"
+SRCREV_pn-fso-term = "${AUTOREV}"
+SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}"
+SRCREV_pn-fso-gpsd = "${AUTOREV}"
+SRCREV_pn-fso-monitord = "${AUTOREV}"
+SRCREV_pn-fso-sounds = "${AUTOREV}"
+SRCREV_pn-fso-specs = "${AUTOREV}"
+SRCREV_pn-fso-term = "${AUTOREV}"
+SRCREV_pn-gsmd2 = "${AUTOREV}"
+SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
+SRCREV_pn-libascenario = "${AUTOREV}"
+SRCREV_pn-libfsobasics = "${AUTOREV}"
+SRCREV_pn-libfsoframework = "${AUTOREV}"
+SRCREV_pn-libfsotransport = "${AUTOREV}"
+SRCREV_pn-libframeworkd-glib = "${AUTOREV}"
+SRCREV_pn-libfso-glib = "${AUTOREV}"
+SRCREV_pn-libgsm0710 = "${AUTOREV}"
+SRCREV_pn-libgsm0710mux = "${AUTOREV}"
+SRCREV_pn-mickeydbus = "${AUTOREV}"
+SRCREV_pn-mickeyterm = "${AUTOREV}"
+SRCREV_pn-misc-vapi = "${AUTOREV}"
+SRCREV_pn-python-pytrc = "${AUTOREV}"
+SRCREV_pn-vala-dbus-binding-tool-native = "6071da6ad645e1200eb2aee88d254ada348d361b"
+SRCREV_pn-vala = "${AUTOREV}"
+SRCREV_pn-zhone = "${AUTOREV}"
+
+
+# SHR stuff
+SRCREV_pn-libhito = "${AUTOREV}"
+SRCREV_pn-neod = "${AUTOREV}"
+SRCREV_pn-shr-settings = "${AUTOREV}"
+SRCREV_pn-ophonekitd = "${AUTOREV}"
+SRCREV_pn-ophonekitd-vala = "${AUTOREV}"
+SRCREV_pn-libmodulo = "${AUTOREV}"
+SRCREV_pn-shr-messages = "${AUTOREV}"
+SRCREV_pn-shr-contacts = "${AUTOREV}"
+SRCREV_pn-shr-dialer = "${AUTOREV}"
+SRCREV_pn-libframeworkd-phonegui     = "${AUTOREV}"
+SRCREV_pn-libframeworkd-phonegui-efl = "${AUTOREV}"
+SRCREV_pn-libframeworkd-phonegui-efl2 = "${AUTOREV}"
+SRCREV_pn-libframeworkd-phonegui-gtk = "${AUTOREV}"
+SRCREV_pn-libframeworkd-phonegui-gtk2 = "${AUTOREV}"
+SRCREV_pn-opimd-utils = "${AUTOREV}"
+SRCREV_pn-pyphonelog = "${AUTOREV}"
+SRCREV_pn-shr-theme = "${AUTOREV}"
+SRCREV_pn-shr-theme-brave = "${AUTOREV}"
+SRCREV_pn-shr-theme-gtk-e17lookalike = "${AUTOREV}"
+SRCREV_pn-shr-splash = "${AUTOREV}"
+SRCREV_pn-shr-splash-theme-simple = "${AUTOREV}"
+SRCREV_pn-shr-splash-theme-dontpanic = "${AUTOREV}"
+SRCREV_pn-shr-splash-theme-handy = "${AUTOREV}"
+SRCREV_pn-shr-splash-theme-dociswatchingyou = "${AUTOREV}"
+SRCREV_pn-shr-installer = "${AUTOREV}"
+SRCREV_pn-shr-config = "${AUTOREV}"
+SRCREV_pn-alsa-scenarii-shr = "${AUTOREV}"
+SRCREV_pn-libphone-utils = "${AUTOREV}"
+SRCREV_pn-python-phoneutils = "${AUTOREV}"
+
+
+# E17 stuff
+EFL_SRCREV = "41040"
+SRCREV_pn-python-elementary = "41040"
+SRCREV_pn-e-wm-config-illume-shr = "${AUTOREV}"
+SRCREV_pn-e-wm-sysactions-shr = "${AUTOREV}"
+SRCREV_pn-e-wm-theme-illume-shr = "${AUTOREV}"
+SRCREV_pn-e-wm-theme-illume-sixteen = "${AUTOREV}"
+SRCREV_pn-elementary-theme-sixteen = "${AUTOREV}"
+SRCREV_pn-e-wm-menu-shr = "${AUTOREV}"
+SRCREV_pn-e-wm-illume-dict-pl = "${AUTOREV}"
+SRCREV_pn-etk-theme-shr = "${AUTOREV}"
+SRCREV_pn-libeflvala = "${AUTOREV}"
+
+SRCREV_pn-illume-keyboard-german = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-arabic = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-browse = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-danish = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-default-alt = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-dutch = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-dvorak = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-french = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-hebrew = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-numeric-alt = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-russian-terminal = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-russian = "${AUTOREV}"
+
+# Other stuff
+SRCREV_pn-navit = "${AUTOREV}"
+SRCREV_pn-omview = "${AUTOREV}"
+SRCREV_pn-pythm = "${AUTOREV}"
+SRCREV_pn-omoney = "29"
+SRCREV_pn-enotes = "19"
+SRCREV_pn-ebrainy = "${AUTOREV}"
+SRCREV_pn-boost-signals2 = "52299"
+SRCREV_pn-dbus-c++-native = "${AUTOREV}"
+SRCREV_pn-dbus-c++ = "${AUTOREV}"
+SRCREV_pn-openmoocow = "${AUTOREV}"
+SRCREV_pn-libmokoui2 = "4695"
+SRCREV_pn-intone = "${AUTOREV}"
+SRCREV_pn-connman = "aac35324deb8c0b57f881338d87cb36b0979e7df"
+SRCREV_pn-msn-pecan = "${AUTOREV}"
+SRCREV_pn-omgps = "${AUTOREV}"
+SRCREV_pn-shr-launcher = "${AUTOREV}"
+SRCREV_pn-e-tasks = "${AUTOREV}"
+SRCREV_pn-mokonnect = "${AUTOREV}"
+SRCREV_pn-elmdentica = "${AUTOREV}"
+SRCREV_pn-vala-terminal = "${AUTOREV}"
diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
new file mode 100644
index 0000000000..1605e8607a
--- /dev/null
+++ b/conf/distro/include/shr-autorev.inc
@@ -0,0 +1,140 @@
+# SHR conf file
+
+# We need to override some machine stuff as well; include the machine-
+# specific file here (if it exists).
+#include conf/distro/include/shr-${MACHINE}.conf
+
+# Nail down some SRCREV's for the kernels.  There is a real potential problem
+# here, in that git hashes are hashes, not incrementing version numbers.  Thus
+# we need to have something else in the kernel version string that gets bumped
+# with each change.  So if you change one of these, go to the kernel recipe
+# and bump the OEV value up as well.
+SRCREV_pn-linux-eten = "df9715883efa3e6a88866813168fabb1c16b0b7a"
+SRCREV_pn-linux-openmoko-shr-devel = "2d158aae9d8d36f575504f59884ed8e80802efe2"
+
+# FSO stuff
+SRCREV_pn-dbus-hlid = "39e804f28808247df2573788cb99897d4d765e69"
+SRCREV_pn-frameworkd = "e96a204768744130859ab091162ec5c976854d49"
+SRCREV_pn-frameworkd-config-shr = "${AUTOREV}"
+SRCREV_pn-frameworkd-config-shr_FSO_REV = "e96a204768744130859ab091162ec5c976854d49"
+SRCREV_pn-frameworkd-config-shr_SHR_REV = "${AUTOREV}"
+SRCREV_pn-fsod = "${AUTOREV}"
+SRCREV_pn-fsodeviced = "${AUTOREV}"
+SRCREV_pn-fsonetworkd = "${AUTOREV}"
+SRCREV_pn-fsousaged = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
+SRCREV_pn-fsoraw = "${AUTOREV}"
+SRCREV_pn-fso-abyss = "ff68be1581069ca494a559e85f6299246888d3b5"
+SRCREV_pn-fso-apm = "${AUTOREV}"
+SRCREV_pn-fso-term = "${AUTOREV}"
+SRCREV_pn-fso-gsm0710muxd = "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
+SRCREV_pn-fso-gpsd = "78fe48dffb923175bde9f0aabc3500a9264a57e0"
+SRCREV_pn-fso-monitord = "${AUTOREV}"
+SRCREV_pn-fso-sounds = "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815"
+SRCREV_pn-fso-specs = "${AUTOREV}"
+SRCREV_pn-fso-term = "${AUTOREV}"
+SRCREV_pn-gsmd2 = "${AUTOREV}"
+SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
+SRCREV_pn-libascenario = "${AUTOREV}"
+SRCREV_pn-libfsobasics = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
+SRCREV_pn-libfsoframework = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
+SRCREV_pn-libfsotransport = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
+SRCREV_pn-libframeworkd-glib = "680276e4cddabeb1edd088ddd421f363dd106a50"
+SRCREV_pn-libfso-glib = "9d292508739452b55b80ec40ec57405a5de2159f"
+SRCREV_pn-libgsm0710 = "3bb80ba6cc9f86ed3996f88bfa2986cc572489d6"
+SRCREV_pn-libgsm0710mux = "8e3e7533b286d8086bce8fa09bce23bb9f18bb98"
+SRCREV_pn-mickeydbus = "6d7f51b5189a00a07d9b88100a565f46fcb62644"
+SRCREV_pn-mickeyterm = "6d7f51b5189a00a07d9b88100a565f46fcb62644"
+SRCREV_pn-misc-vapi = "${AUTOREV}"
+SRCREV_pn-python-pytrc = "f15ff7c58946a2fd6ba767628b2fe5d6f46ff9bb"
+SRCREV_pn-vala-dbus-binding-tool-native = "6071da6ad645e1200eb2aee88d254ada348d361b"
+SRCREV_pn-vala = "${AUTOREV}"
+SRCREV_pn-zhone = "${AUTOREV}"
+
+
+# SHR stuff
+SHRREV = "c3d97171723d8e824cb5acf58b711aa78b3b82d9"
+
+SRCREV_pn-libhito = "${AUTOREV}"
+SRCREV_pn-neod = "${AUTOREV}"
+SRCREV_pn-shr-settings = "4e0fbe17e4fddd18b0455ec4d007ab3f1d19918e"
+SRCREV_pn-ophonekitd = "${SHRREV}"
+SRCREV_pn-ophonekitd-vala = "${AUTOREV}"
+SRCREV_pn-libmodulo = "${AUTOREV}"
+SRCREV_pn-shr-messages = "${SHRREV}"
+SRCREV_pn-shr-contacts = "${SHRREV}"
+SRCREV_pn-shr-dialer = "${SHRREV}"
+SRCREV_pn-libframeworkd-phonegui = "${SHRREV}"
+SRCREV_pn-libframeworkd-phonegui-efl = "${SHRREV}"
+SRCREV_pn-libframeworkd-phonegui-efl2 = "${AUTOREV}"
+SRCREV_pn-libframeworkd-phonegui-gtk = "${AUTOREV}"
+SRCREV_pn-libframeworkd-phonegui-gtk2 = "${AUTOREV}"
+SRCREV_pn-opimd-utils = "${AUTOREV}"
+SRCREV_pn-pyphonelog = "9da559f0242a32aa5d0b72c795f53d7d9ef8c973"
+SRCREV_pn-shr-theme = "${AUTOREV}"
+SRCREV_pn-shr-theme-brave = "${AUTOREV}"
+SRCREV_pn-shr-theme-gtk-e17lookalike = "${AUTOREV}"
+SRCREV_pn-shr-splash = "${AUTOREV}"
+SRCREV_pn-shr-splash-theme-simple = "${AUTOREV}"
+SRCREV_pn-shr-splash-theme-dontpanic = "${AUTOREV}"
+SRCREV_pn-shr-splash-theme-handy = "${AUTOREV}"
+SRCREV_pn-shr-splash-theme-niebiee = "${AUTOREV}"
+SRCREV_pn-shr-installer = "${AUTOREV}"
+SRCREV_pn-shr-config = "${AUTOREV}"
+SRCREV_pn-alsa-scenarii-shr = "${AUTOREV}"
+SRCREV_pn-libphone-utils = "${AUTOREV}"
+SRCREV_pn-python-phoneutils = "${AUTOREV}"
+
+
+# E17 stuff
+EFL_SRCREV = "41040"
+SRCREV_pn-python-elementary = "41040"
+SRCREV_pn-e-wm-config-illume-shr = "${AUTOREV}"
+SRCREV_pn-e-wm-sysactions-shr = "${AUTOREV}"
+SRCREV_pn-e-wm-theme-illume-shr = "${AUTOREV}"
+SRCREV_pn-e-wm-theme-illume-sixteen = "${AUTOREV}"
+SRCREV_pn-e-wm-theme-illume-niebiee = "${AUTOREV}"
+SRCREV_pn-elementary-theme-sixteen = "${AUTOREV}"
+SRCREV_pn-elementary-theme-niebiee = "${AUTOREV}"
+SRCREV_pn-e-wm-menu-shr = "${AUTOREV}"
+SRCREV_pn-e-wm-illume-dict-pl = "${AUTOREV}"
+SRCREV_pn-etk-theme-shr = "${AUTOREV}"
+SRCREV_pn-libeflvala = "${AUTOREV}"
+
+SRCREV_pn-illume-keyboard-german = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-arabic = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-browse = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-danish = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-default-alt = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-dutch = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-dvorak = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-french = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-hebrew = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-numeric-alt = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-russian-terminal = "${AUTOREV}"
+SRCREV_pn-illume-keyboard-russian = "${AUTOREV}"
+
+
+# Other stuff
+SRCREV_pn-bt-configure = "${AUTOREV}"
+SRCREV_pn-navit = "2309"
+SRCREV_pn-omview = "${AUTOREV}"
+SRCREV_pn-pythm = "${AUTOREV}"
+SRCREV_pn-omoney = "29"
+SRCREV_pn-enotes = "19"
+SRCREV_pn-ebrainy = "${AUTOREV}"
+SRCREV_pn-boost-signals2 = "52299"
+SRCREV_pn-dbus-c++-native = "${AUTOREV}"
+SRCREV_pn-dbus-c++ = "${AUTOREV}"
+SRCREV_pn-openmoocow = "${AUTOREV}"
+SRCREV_pn-libmokoui2 = "4695"
+SRCREV_pn-intone = "${AUTOREV}"
+SRCREV_pn-connman = "aac35324deb8c0b57f881338d87cb36b0979e7df"
+SRCREV_pn-msn-pecan = "${AUTOREV}"
+SRCREV_pn-omgps = "${AUTOREV}"
+SRCREV_pn-shr-today = "${AUTOREV}"
+SRCREV_pn-shr-launcher = "${AUTOREV}"
+SRCREV_pn-e-tasks = "${AUTOREV}"
+SRCREV_pn-mokonnect = "${AUTOREV}"
+SRCREV_pn-elmdentica = "${AUTOREV}"
+SRCREV_pn-vala-terminal = "${AUTOREV}"
+