[oe-commits] Klaus Kurzmann : shr-autorev.inc: sync with shr-autorev-unstable. inc before removing that one

git version control git at git.openembedded.org
Fri Oct 23 11:18:20 UTC 2009 

Module: openembedded.git
Branch: shr/merge
Commit: e72932858aebf26fd52f3182f01a51a913a2344f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e72932858aebf26fd52f3182f01a51a913a2344f

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Fri Oct 23 13:17:14 2009 +0200

shr-autorev.inc: sync with shr-autorev-unstable.inc before removing that one

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/distro/include/shr-autorev.inc |   87 +++++++++++++++++++++-------------
 1 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
index 0308886..83e25b4 100644
--- a/conf/distro/include/shr-autorev.inc
+++ b/conf/distro/include/shr-autorev.inc
@@ -1,4 +1,4 @@
-# SHR conf file
+# SHR autorev include
 
 # We need to override some machine stuff as well; include the machine-
 # specific file here (if it exists).
@@ -9,57 +9,75 @@ include conf/distro/include/shr-${MACHINE}.conf
 # 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 = "a3587e4ed77974adfb057af261aaeea4022018e8"
+SRCREV_pn-linux-openmoko-shr-devel = "${AUTOREV}"
+SRCREV_pn-linux-openmoko-shr-drm-devel = "${AUTOREV}"
+
+# X11
+require conf/distro/include/preferred-xorg-versions-live.inc
+SRCREV_pn-xf86-video-glamo = "${AUTOREV}"
+SRCREV_pn-xf86-input-mouse = "${AUTOREV}"
+SRCREV_pn-xf86-input-keyboard = "${AUTOREV}"
+SRCREV_pn-xf86-video-glamo-kms = "${AUTOREV}"
+SRCREV_pn-glamo-dri-tests = "${AUTOREV}"
+SRCREV_pn-mesa-dri = "${AUTOREV}"
+SRCREV_pn-libdrm = "${AUTOREV}"
+SRCREV_pn-xserver-xorg = "${AUTOREV}"
+SRCREV_pn-mesa-dri = "${AUTOREV}"
+SRCREV_pn-libdrm = "${AUTOREV}"
 
 # FSO stuff
-SRCREV_pn-dbus-hlid = "5df7f49fe8881804aaab544a569fd164c3e93afb"
-SRCREV_pn-frameworkd = "ed29786daceccefe918ce3911e3b6fb7f2efb08c"
+FSOREV_cornucopia = "${AUTOREV}"
+
+SRCREV_pn-dbus-hlid = "${AUTOREV}"
+SRCREV_pn-frameworkd = "${AUTOREV}"
 SRCREV_pn-frameworkd-config-shr = "${AUTOREV}"
-SRCREV_pn-frameworkd-config-shr_FSO_REV = "ed29786daceccefe918ce3911e3b6fb7f2efb08c"
+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 = "9adf9a0e06d07d970e9752ece3f4b9731b19ff24"
+SRCREV_pn-fsodeviced = "${FSOREV_cornucopia}"
+SRCREV_pn-fsonetworkd = "${FSOREV_cornucopia}"
+SRCREV_pn-fsousaged = "${FSOREV_cornucopia}"
+SRCREV_pn-fsotimed = "${FSOREV_cornucopia}"
 SRCREV_pn-fsoraw = "${AUTOREV}"
-SRCREV_pn-fso-abyss = "a4f65077c3faff89af2b965e9e3fa9bcfea52f83"
+SRCREV_pn-fso-abyss = "${AUTOREV}"
 SRCREV_pn-fso-apm = "${AUTOREV}"
 SRCREV_pn-fso-term = "${AUTOREV}"
-SRCREV_pn-fso-gsm0710muxd = "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
-SRCREV_pn-fso-gpsd = "78fe48dffb923175bde9f0aabc3500a9264a57e0"
+SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}"
+SRCREV_pn-fso-gpsd = "${AUTOREV}"
 SRCREV_pn-fso-monitord = "${AUTOREV}"
-SRCREV_pn-fso-sounds = "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815"
+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 = "9adf9a0e06d07d970e9752ece3f4b9731b19ff24"
-SRCREV_pn-libfsoframework = "9adf9a0e06d07d970e9752ece3f4b9731b19ff24"
-SRCREV_pn-libfsotransport = "9adf9a0e06d07d970e9752ece3f4b9731b19ff24"
-SRCREV_pn-libframeworkd-glib = "680276e4cddabeb1edd088ddd421f363dd106a50"
-SRCREV_pn-libfso-glib = "9d292508739452b55b80ec40ec57405a5de2159f"
-SRCREV_pn-libgsm0710 = "08d915268024dc3418578d40307d496454d58e34"
-SRCREV_pn-libgsm0710mux = "df01e9e81775c1d7b515b9caff7c420fae59f140"
-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-libfsobasics = "${FSOREV_cornucopia}"
+SRCREV_pn-libfsoframework = "${FSOREV_cornucopia}"
+SRCREV_pn-libfsotransport = "${FSOREV_cornucopia}"
+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 = "${FSOREV_cornucopia}"
+SRCREV_pn-python-pytrc = "${AUTOREV}"
+SRCREV_pn-vala-dbus-binding-tool-native = "${AUTOREV}"
 SRCREV_pn-vala = "${AUTOREV}"
 SRCREV_pn-zhone = "${AUTOREV}"
+SRCREV_pn-libgee = "${AUTOREV}"
+SRCREV_pn-libgee-native = "${AUTOREV}"
 
 
 # SHR stuff
-SHRREV = "767cc2cd22f5f15c69440018365d41980b1507aa"
+SHRREV = "${AUTOREV}"
 
 SRCREV_pn-gpe-theme-neo = "${AUTOREV}"
 SRCREV_pn-gtk-theme-neo = "${AUTOREV}"
 SRCREV_pn-icon-theme-neo = "${AUTOREV}"
 SRCREV_pn-libhito = "${AUTOREV}"
 SRCREV_pn-neod = "${AUTOREV}"
-SRCREV_pn-shr-settings = "39ddfa7c49a8da19800fefe237fecce984296269"
+SRCREV_pn-shr-settings = "${AUTOREV}"
 SRCREV_pn-ophonekitd = "${SHRREV}"
 SRCREV_pn-ophonekitd-vala = "${AUTOREV}"
 SRCREV_pn-libmodulo = "${AUTOREV}"
@@ -73,7 +91,7 @@ SRCREV_pn-libframeworkd-phonegui-efl-theme-neo = "${AUTOREV}"
 SRCREV_pn-libframeworkd-phonegui-gtk = "${AUTOREV}"
 SRCREV_pn-libframeworkd-phonegui-gtk2 = "${AUTOREV}"
 SRCREV_pn-opimd-utils = "${AUTOREV}"
-SRCREV_pn-pyphonelog = "5e5050dfba4ff1181175e05f5ea4cfcc6d54769d"
+SRCREV_pn-pyphonelog = "${AUTOREV}"
 SRCREV_pn-shr-theme = "${AUTOREV}"
 SRCREV_pn-shr-theme-brave = "${AUTOREV}"
 SRCREV_pn-shr-theme-gtk-e17lookalike = "${AUTOREV}"
@@ -96,9 +114,12 @@ SRCREV_pn-shr-specs = "${AUTOREV}"
 SRCREV_pn-phoneui-apps = "${AUTOREV}"
 
 # E17 stuff
-EFL_SRCREV = "41040"
+# we inherit EFL_SRCREV from sane-srcrevs.inc
+# leave this in for easy overriding if needed someday
+#EFL_SRCREV = "42837"
+
 SRCREV_pn-eve = "${AUTOREV}"
-SRCREV_pn-python-elementary = "41040"
+SRCREV_pn-python-elementary = "${EFL_SRCREV}"
 SRCREV_pn-e-wm-config-illume-shr = "${AUTOREV}"
 SRCREV_pn-e-wm-sysactions-shr = "${AUTOREV}"
 SRCREV_pn-e-wm-theme-illume-shr = "${AUTOREV}"
@@ -133,7 +154,7 @@ SRCREV_pn-illume-keyboard-russian = "${AUTOREV}"
 # Other stuff
 SRCREV_pn-bt-configure = "${AUTOREV}"
 SRCREV_pn-advancedcaching = "${AUTOREV}"
-SRCREV_pn-navit = "2309"
+SRCREV_pn-navit = "${AUTOREV}"
 SRCREV_pn-omview = "${AUTOREV}"
 SRCREV_pn-pythm = "${AUTOREV}"
 SRCREV_pn-omoney = "29"
@@ -157,5 +178,5 @@ SRCREV_pn-vala-terminal = "${AUTOREV}"
 SRCREV_pn-pisi = "150"
 SRCREV_pn-paroli = "${AUTOREV}"
 SRCREV_pn-webkit-efl = "${AUTOREV}"
-SRCREV_pn-mesa-dri = "${AUTOREV}"
-SRCREV_pn-libdrm = "${AUTOREV}"
+SRCREV_pn-epdfview = "${AUTOREV}"
+SRCREV_pn-om-neon = "${AUTOREV}"

More information about the Openembedded-commits mailing list