freesmartphone: move SRCREVs to recipes

* simplify fso-autorev
* move cornucopia and python-helpers rev to sane-srcrevs.inc
* drop SRCREV for removed recipes fsolocationd, fsotimed, vala-native

3 files changed, 5 insertions, 73 deletions

diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index cb02400e2f..a29016da0f 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -1,19 +1,11 @@
 # FSO
+FSO_CORNUCOPIA_SRCREV = "${AUTOREV}"
+FSO_PYTHONHELPERS_SRCREV = "${AUTOREV}"
+
 SRCREV_pn-android-image-utils-native = "${AUTOREV}"
 SRCREV_pn-dbus-hlid = "${AUTOREV}"
 SRCREV_pn-frameworkd = "${AUTOREV}"
 SRCREV_pn-frameworkd-devel = "${AUTOREV}"
-SRCREV_pn-fsodatad = "${AUTOREV}"
-SRCREV_pn-fsodeviced = "${AUTOREV}"
-SRCREV_pn-fsogsmd = "${AUTOREV}"
-SRCREV_pn-fsotdld = "${AUTOREV}"
-SRCREV_pn-fsomusicd = "${AUTOREV}"
-SRCREV_pn-fsonetworkd = "${AUTOREV}"
-SRCREV_pn-fsotimed = "${AUTOREV}"
-SRCREV_pn-fsousaged = "${AUTOREV}"
-SRCREV_pn-fso-abyss = "${AUTOREV}"
-SRCREV_pn-fso-boot = "${AUTOREV}"
-SRCREV_pn-fso-apm = "${AUTOREV}"
 SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}"
 SRCREV_pn-fso-gpsd = "${AUTOREV}"
 SRCREV_pn-fso-monitord = "${AUTOREV}"
@@ -23,28 +15,17 @@ 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-libfsoresource = "${AUTOREV}"
-SRCREV_pn-libfsotransport = "${AUTOREV}"
 SRCREV_pn-libframeworkd-glib = "${AUTOREV}"
 SRCREV_pn-libfso-glib = "${AUTOREV}"
 SRCREV_pn-libgee-native = "${AUTOREV}"
 SRCREV_pn-libgee = "${AUTOREV}"
 SRCREV_pn-libgsm0710 = "${AUTOREV}"
-SRCREV_pn-libgsm0710mux = "${AUTOREV}"
 SRCREV_pn-libmsmcomm = "${AUTOREV}"
 SRCREV_pn-libpersistence = "${AUTOREV}"
-SRCREV_pn-mdbus = "${AUTOREV}"
-SRCREV_pn-mdbus2 = "${AUTOREV}"
-SRCREV_pn-mickeyterm = "${AUTOREV}"
-SRCREV_pn-mterm2 = "${AUTOREV}"
 SRCREV_pn-misc-vapi = "${AUTOREV}"
 SRCREV_pn-msmcommd = "${AUTOREV}"
-SRCREV_pn-python-pytrc = "${AUTOREV}"
 SRCREV_pn-vala-dbus-binding-tool-native = "${AUTOREV}"
 SRCREV_pn-vala-dbus-binding-tool = "${AUTOREV}"
-SRCREV_pn-vala-native = "${AUTOREV}"
 SRCREV_pn-vala = "${AUTOREV}"
 SRCREV_pn-zhone = "${AUTOREV}"
 SRCREV_pn-zhone2 = "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
deleted file mode 100644
index d30dfcb50b..0000000000
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-# To be included from sane-srcrevs.inc
-
-# FSO Projects -- Cornucopia
-FSO_CORNUCOPIA_SRCREV ?= "eb075d098faa26d79b5a527b893d33eb0120f26e"
-SRCREV_pn-fso-abyss ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fso-boot ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsomusicd ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsotdld ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-libgsm0710mux ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-mdbus2 ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-mterm2 ?= "${FSO_CORNUCOPIA_SRCREV}"
-
-# FSO Projects -- Misc
-SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb"
-SRCREV_pn-frameworkd ?= "f751f2724eea23d0ca050bdf2672f9011ae09517"
-SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6"
-SRCREV_pn-fso-gsm0710muxd ?= "1d69fb5b666ac2a9e54e46978c7afa8fe5dfc3c9"
-SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44"
-SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815"
-SRCREV_pn-fso-specs ?= "e3fcb57675f7f48b6848f5b8114961f9418eb17b"
-SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8"
-SRCREV_pn-libfso-glib ?= "f1a0b3fe2ed6e15d83ad4880b4eb7aece00f9d57"
-SRCREV_pn-libframeworkd-glib ?= "487b092dd3daa12a5beff0abe1be3f53d82f4bf0"
-SRCREV_pn-libgsm0710 ?= "52eea64bdbb79c09002b46e98a5e656509884f72"
-SRCREV_pn-libpersistence ?= "217ad803745f8ac1f3c72c6715e2c0faefb3fd06"
-FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317"
-SRCREV_pn-mdbus ?= "${FSO_PYTHONHELPERS_SRCREV}"
-SRCREV_pn-mickeyterm ?= "${FSO_PYTHONHELPERS_SRCREV}"
-SRCREV_pn-msmcommd ?= "2ed618dd347c3245c5f62c00ce75c985ad90a0ea"
-SRCREV_pn-multicat ?= "${FSO_PYTHONHELPERS_SRCREV}"
-SRCREV_pn-python-pyrtc ?= "${FSO_PYTHONHELPERS_SRCREV}"
-SRCREV_pn-pycd ?= "${FSO_PYTHONHELPERS_SRCREV}" 
-SRCREV_pn-vala-dbus-binding-tool-native ?= "0dda9a5d7f895d67c6a778f559e929ace229e42b"
-SRCREV_pn-vala-dbus-binding-tool ?= "0dda9a5d7f895d67c6a778f559e929ace229e42b"
-SRCREV_pn-vala-terminal ?= "fda5f26710acfc0befe04c8f2e58b35bdba297f7"
-SRCREV_pn-vala-native ?= "e98c5df3db6d47f0e2462e294be63fc8385c5916"
-SRCREV_pn-zhone ?= "bd1e895f73a0e5beb2608ebe111d7ef32ee3adbc"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index bf37c3791a..7ed126c3c8 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -3,5 +3,5 @@
 
 OPKG_SRCREV ?= "527"
 EFL_SRCREV ?= "47713"
-
-require conf/distro/include/sane-srcrevs-fso.inc
+FSO_CORNUCOPIA_SRCREV ?= "eb075d098faa26d79b5a527b893d33eb0120f26e"
+FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317"