freesmartphone: catch up with milestone5.5 and SHR/import

3 files changed, 55 insertions, 24 deletions

diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index 8ceb233f2f..a66a37fdd0 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -2,8 +2,12 @@
 SRCREV_pn-dbus-hlid = "${AUTOREV}"
 SRCREV_pn-frameworkd = "${AUTOREV}"
 SRCREV_pn-frameworkd-devel = "${AUTOREV}"
-SRCREV_pn-fsod = "${AUTOREV}"
 SRCREV_pn-fsodeviced = "${AUTOREV}"
+SRCREV_pn-fsogsmd = "${AUTOREV}"
+SRCREV_pn-fsogpsd = "${AUTOREV}"
+SRCREV_pn-fsonetworkd = "${AUTOREV}"
+SRCREV_pn-fsotimed = "${AUTOREV}"
+SRCREV_pn-fsousaged = "${AUTOREV}"
 SRCREV_pn-fso-abyss = "${AUTOREV}"
 SRCREV_pn-fso-apm = "${AUTOREV}"
 SRCREV_pn-fso-term = "${AUTOREV}"
@@ -11,16 +15,25 @@ 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-libeflvala = "${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-libgee = "${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 = "${AUTOREV}"
 SRCREV_pn-vala-native = "${AUTOREV}"
 SRCREV_pn-vala = "${AUTOREV}"
 SRCREV_pn-zhone = "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
new file mode 100644
index 0000000000..aef87a62a5
--- /dev/null
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -0,0 +1,39 @@
+# To be included from sane-srcrevs.inc
+
+# FSO Projects -- Cornucopia
+FSO_CORNUCOPIA_SRCREV ?= "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
+SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsogpsd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-misc-vapi ?= "${FSO_CORNUCOPIA_SRCREV}"
+# FSO Projects -- Misc
+SRCREV_pn-dbus-hlid ?= "39e804f28808247df2573788cb99897d4d765e69"
+SRCREV_pn-frameworkd ?= "a2dfde0fb46a745f5c07e6a1ab44e4b95b7dde80"
+SRCREV_pn-fso-abyss ?= "8ce3c6e40c4852de7dcca502f65784f6b18ca6bf"
+SRCREV_pn-fso-term ?= "e0d92222e3e5a62025089c60a625f1836c510915"
+SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0"
+SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
+SRCREV_pn-fso-monitord ?= "eb8fb32d52d19c5aa9284c6cc540dd40bb924c9d"
+SRCREV_pn-fso-sounds ?= "cc46b55131fc07a415bf1bd62ce98f73344489cb"
+SRCREV_pn-fso-specs ?= "66c992afd6c551ffd8fc63d7201c5cce269a4d77"
+SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8"
+SRCREV_pn-libeflvala ?= "c566847e000fad132225aefd854b81ae713eaa82"
+SRCREV_pn-libfso-glib ?= "b855b0297ff68bb505a02d9b4b13914ca558cd59"
+SRCREV_pn-libframeworkd-glib ?= "680276e4cddabeb1edd088ddd421f363dd106a50"
+SRCREV_pn-libgsm0710 ?= "3bb80ba6cc9f86ed3996f88bfa2986cc572489d6"
+SRCREV_pn-libgsm0710mux ?= "b74d4615374abb856441e4a416726fb3e8d7835b"
+FSO_PYTHONHELPERS_SRCREV ?= "6d7f51b5189a00a07d9b88100a565f46fcb62644"
+SRCREV_pn-mickeydbus ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-mickeyterm ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-multicat ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-python-pyrtc ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-fso-apm ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-vala-dbus-binding-tool-native ?= "0d221b688bfb51e0607b7f4e6e03bf96d13d5d44"
+SRCREV_pn-vala-terminal ?= "2f849c5690d834a69f6c0693cc159573b3aa78d"
+SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
+SRCREV_pn-zhone ?= "d654b3d15500a56c8e987e4d2cc2f8eef70b78c0"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7297f4710b..342d785d29 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -34,7 +34,6 @@ SRCREV_pn-contact ?= "1410"
 SRCREV_pn-dasher-gpe ?= "1251"
 SRCREV_pn-dbus-c++-native ?= "13131"
 SRCREV_pn-dbus-c++ ?= "13131"
-SRCREV_pn-dbus-hlid ?= "e82bb41c8f7b41b85db918166db6682962853713"
 SRCREV_pn-dfu-util ?= "4160"
 SRCREV_pn-dfu-util-native ?= "4160"
 SRCREV_pn-diversity-daemon ?= "571"
@@ -55,16 +54,6 @@ SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-etk-theme-ninja ?= "5"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-flashrom ?= "3682"
-SRCREV_pn-frameworkd ?= "1b57e0a6bab423f4f74c0107b4bb9bd83733ee42"
-SRCREV_pn-frameworkd-devel ?= "858c8d58d1f7e807f2c09532787c4e7b1a5daa52"
-SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136"
-SRCREV_pn-fso-abyss ?= "0c713f42f078ae4aa3138ea487f044b9cd9d525b"
-SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
-SRCREV_pn-fso-term ?= "2cd15459c689d56e3ddde761129f4b00beab68ef"
-SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0"
-SRCREV_pn-fso-gsm0710muxd ?= "af1b80c7ded08b697730c3191d110dfd6dd872d3"
-SRCREV_pn-fso-monitord ?= "0f64979a11d6263c7b7ed0e945a0889744f295f1"
-SRCREV_pn-fso-sounds ?= "3d2cf5231cb0e81770a246530574142bd2b8bbff"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gabriel ?= "38"
 SRCREV_pn-gabriel-native ?= "38"
@@ -93,15 +82,11 @@ SRCREV_pn-intuition ?= "194"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
-SRCREV_pn-libeflvala ?= "676c901eb57f653231fb4c9eeabc2ed3d1b0c072"
 SRCREV_pn-libefso ?= "194"
 SRCREV_pn-libexalt ?= "78"
 SRCREV_pn-libexalt-dbus ?= "76"
 SRCREV_pn-libfakekey ?= "1455"
-SRCREV_pn-libframeworkd-glib ?= "e90f7c208356b53c34e025585248ea0a7a2ea13c"
 SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
-SRCREV_pn-libgsm0710 ?= "50079c58e6f4a21edd6ab33ef2365abb1f5441d2"
-SRCREV_pn-libgsm0710mux ?= "114044266a094c61a2c25ee5a823635ae50a4e89"
 SRCREV_pn-libgsmd ?= "4505"
 SRCREV_pn-libiac ?= "1590"
 SRCREV_pn-libjana = "749"
@@ -135,8 +120,6 @@ SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-matchbox-terminal ?= "1612"
-SRCREV_pn-mickeydbus ?= "f894801916cc4d0e912e4553490dc215276c52a9"
-SRCREV_pn-mickeyterm ?= "f894801916cc4d0e912e4553490dc215276c52a9"
 SRCREV_pn-midori ?= "400139644371c0b675723f9a986ddab4445a8794"
 SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
@@ -218,13 +201,11 @@ SRCREV_pn-psplash ?= "249"
 SRCREV_pn-pty-forward-native ?= "4907"
 SRCREV_pn-pyefl-sudoku ?= "49"
 SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
-SRCREV_pn-pylgrim ?= "20"
 SRCREV_pn-python-coherence ?= "1161"
 SRCREV_pn-python-connexion ?= "1439"
 SRCREV_pn-python-formencode ?= "3148"
 SRCREV_pn-python-gsmd ?= "148"
 SRCREV_pn-python-pycrypto ?= "d087280d7e9643a3e3f68f209932119fe6738b3c"
-SRCREV_pn-python-pyrtc ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
 SRCREV_pn-python-pyyaml ?= "344"
 QEMUSRCREV ?= "4242"
 SRCREV_pn-tslib ?= "77"
@@ -252,9 +233,6 @@ SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512"
 SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
-SRCREV-pn-vala-dbus-binding-tool-native ?= "55a6bc5dd032731d89c238d274b2898ef02d12f8"
-SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
-SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
 SRCREV_pn-webkit-gtk ?= "45825"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
@@ -262,7 +240,6 @@ SRCREV_pn-wmiconfig ?= "5394"
 SRCREV_pn-xf86-video-glamo ?= "25c4b0e80e93e04e6f7d4b8bca6d007fb9de6da8"
 SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
-SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
 
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
@@ -337,3 +314,5 @@ SRCREV_pn-rage ?= "${EFL_SRCREV}"
 SRCREV_pn-illume ?= "${EFL_SRCREV}"
 SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}"
 SRCREV_pn-waker ?= "${EFL_SRCREV}"
+
+require conf/distro/include/sane-srcrevs-fso.inc