vala / freesmartphone: vala now also looks in the target directory for vapi files

We can finally inherit autotools now and remove legacy staging

16 files changed, 23 insertions, 57 deletions

diff --git a/classes/vala.bbclass b/classes/vala.bbclass
index 433b64e87e..3510a8acf3 100644
--- a/classes/vala.bbclass
+++ b/classes/vala.bbclass
@@ -1,19 +1,15 @@
 # Vala has problems with multiple concurrent invocations
 PARALLEL_MAKE = ""
 
+# Vala needs vala-native
 DEPENDS += "vala-native"
 
+# Vala looks in STAGING_DATADIR for .vapi files
+export STAGING_DATADIR
+
+# Package additional files
 FILES_${PN}-dev += "\
   ${datadir}/vala/vapi/*.vapi \
   ${datadir}/vala/vapi/*.deps \
+  ${datadir}/gir-1.0 \
 "
-
-VALA_DONT_STAGE_VAPIS ?= "\(/config.vapi$\)\|\(/config.deps$\)"
-
-# .vapi and .deps files are arch independent and need to be present in the
-# staging datadir for the native vala compiler
-do_stage_append() {
-	install -d ${STAGING_DATADIR_NATIVE}/vala/vapi
-	for VALAFILE in `find . -name "*.vapi" | grep -v "$VALA_DONT_STAGE_VAPIS"`; do install -m 0644 ${VALAFILE} ${STAGING_DATADIR_NATIVE}/vala/vapi/; done
-	for VALAFILE in `find . -name "*.deps" | grep -v "$VALA_DONT_STAGE_VAPIS"`; do install -m 0644 ${VALAFILE} ${STAGING_DATADIR_NATIVE}/vala/vapi/; done
-}
diff --git a/recipes/freesmartphone/fso-abyss_git.bb b/recipes/freesmartphone/fso-abyss_git.bb
index c23bbf457b..0fd88f2174 100644
--- a/recipes/freesmartphone/fso-abyss_git.bb
+++ b/recipes/freesmartphone/fso-abyss_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Abyss is a GSM 07.10 muxer userspace daemon"
 HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/Abyss"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 SECTION = "console/network"
-DEPENDS = "vala-native dbus dbus-glib libgsm0710mux"
+DEPENDS = "dbus dbus-glib libgsm0710mux"
 LICENSE = "GPL"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PV = "0.9.2+gitr${SRCPV}"
@@ -15,7 +15,7 @@ SRC_URI = "\
 "
 S = "${WORKDIR}/git/tools/fso-abyss"
 
-inherit autotools_stage
+inherit autotools vala
 
 do_install_append() {
 	install -d ${D}${sysconfdir}
diff --git a/recipes/freesmartphone/fso-alsa_git.bb b/recipes/freesmartphone/fso-alsa_git.bb
index 8f5e173bdd..b83613e7f0 100644
--- a/recipes/freesmartphone/fso-alsa_git.bb
+++ b/recipes/freesmartphone/fso-alsa_git.bb
@@ -11,8 +11,4 @@ PR = "r0"
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/tools/fso-alsa"
 
-do_stage() {
-	:
-}
-
-inherit autotools_stage vala
+inherit autotools vala
diff --git a/recipes/freesmartphone/fso-apm_git.bb b/recipes/freesmartphone/fso-apm_git.bb
index a42492f0f0..f04a5b1953 100644
--- a/recipes/freesmartphone/fso-apm_git.bb
+++ b/recipes/freesmartphone/fso-apm_git.bb
@@ -4,7 +4,6 @@ HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console"
 LICENSE = "GPLv2"
 PE = "1"
-DEPENDS = "vala-native"
 RCONFLICTS = "apm"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PV = "2.0.0+gitr${SRCPV}"
@@ -13,6 +12,4 @@ PR = "r1"
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/tools/apm2"
 
-inherit autotools
-
-
+inherit autotools vala
diff --git a/recipes/freesmartphone/fso-monitord_git.bb b/recipes/freesmartphone/fso-monitord_git.bb
index 0c931bdad0..808a17f1ba 100644
--- a/recipes/freesmartphone/fso-monitord_git.bb
+++ b/recipes/freesmartphone/fso-monitord_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "freesmartphone.org monitor daemon"
 AUTHOR = "freesmartphone.org development team"
 SECTION = "console/network"
-DEPENDS = "vala-native dbus dbus-glib"
+DEPENDS = "vala dbus dbus-glib"
 LICENSE = "GPL"
 SRCREV = "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44"
 PV = "0.0.0+gitr${SRCPV}"
@@ -11,7 +11,7 @@ PR = "r0"
 SRC_URI = "${FREESMARTPHONE_GIT}/fso-monitord.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d vala
 
 INITSCRIPT_NAME = "fso-monitord"
 INITSCRIPT_PARAMS = "defaults 35"
diff --git a/recipes/freesmartphone/libfso-glib_git.bb b/recipes/freesmartphone/libfso-glib_git.bb
index 8984741be7..e29ccc81aa 100644
--- a/recipes/freesmartphone/libfso-glib_git.bb
+++ b/recipes/freesmartphone/libfso-glib_git.bb
@@ -2,17 +2,13 @@ DESCRIPTION = "GLib-based DBus bindings for freesmartphone.org - Vala implementa
 AUTHOR = "Didier 'Ptitjes"
 LICENSE = "LGPL"
 SECTION = "devel"
-DEPENDS = "vala-native vala-dbus-binding-tool-native dbus-glib glib-2.0 fso-specs"
+DEPENDS = "vala-dbus-binding-tool-native dbus-glib glib-2.0 fso-specs"
 SRCREV = "f1a0b3fe2ed6e15d83ad4880b4eb7aece00f9d57"
 PV = "0.2.2+gitr${SRCPV}"
 PE = "1"
 PR = "r4"
 
-inherit autotools_stage pkgconfig vala
-
-PARALLEL_MAKE = ""
+inherit autotools vala
 
 SRC_URI = "${FREESMARTPHONE_GIT}/libfso-glib.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
-
-FILES_${PN}-dev += "${datadir}/gir-1.0/*.gir"
diff --git a/recipes/freesmartphone/libgsm0710_git.bb b/recipes/freesmartphone/libgsm0710_git.bb
index 6b78c9f922..2c78789d9b 100644
--- a/recipes/freesmartphone/libgsm0710_git.bb
+++ b/recipes/freesmartphone/libgsm0710_git.bb
@@ -9,4 +9,4 @@ PR = "r0"
 SRC_URI = "${FREESMARTPHONE_GIT}/libgsm0710.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
 
-inherit autotools_stage pkgconfig vala
+inherit autotools vala
diff --git a/recipes/freesmartphone/libgsm0710mux_git.bb b/recipes/freesmartphone/libgsm0710mux_git.bb
index f85be3c238..fe94d21fdd 100644
--- a/recipes/freesmartphone/libgsm0710mux_git.bb
+++ b/recipes/freesmartphone/libgsm0710mux_git.bb
@@ -11,4 +11,4 @@ PR = "r0"
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/libgsm0710mux"
 
-inherit autotools_stage pkgconfig vala
+inherit autotools vala
diff --git a/recipes/freesmartphone/libpersistence_git.bb b/recipes/freesmartphone/libpersistence_git.bb
index 0550045aed..ab1892e246 100644
--- a/recipes/freesmartphone/libpersistence_git.bb
+++ b/recipes/freesmartphone/libpersistence_git.bb
@@ -13,4 +13,4 @@ SRC_URI = "\
 "
 S = "${WORKDIR}/git"
 
-inherit autotools_stage pkgconfig vala
+inherit autotools vala
diff --git a/recipes/freesmartphone/mdbus2_git.bb b/recipes/freesmartphone/mdbus2_git.bb
index 76af519d4b..dd0336c60c 100644
--- a/recipes/freesmartphone/mdbus2_git.bb
+++ b/recipes/freesmartphone/mdbus2_git.bb
@@ -12,8 +12,4 @@ PE = "1"
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/tools/mdbus2"
 
-do_stage() {
-	:
-}
-
-inherit autotools_stage vala
+inherit autotools vala
diff --git a/recipes/freesmartphone/mioctl_git.bb b/recipes/freesmartphone/mioctl_git.bb
index 56bb1c42af..e09c424b51 100644
--- a/recipes/freesmartphone/mioctl_git.bb
+++ b/recipes/freesmartphone/mioctl_git.bb
@@ -10,8 +10,4 @@ PR = "r0"
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/tools/mioctl"
 
-do_stage() {
-	:
-}
-
 inherit autotools vala
diff --git a/recipes/freesmartphone/mkdump_git.bb b/recipes/freesmartphone/mkdump_git.bb
index 4d7be38947..b31f896a7d 100644
--- a/recipes/freesmartphone/mkdump_git.bb
+++ b/recipes/freesmartphone/mkdump_git.bb
@@ -16,8 +16,3 @@ SRC_URI = "\
 S = "${WORKDIR}/git/tools/mkdump"
 
 inherit autotools vala
-
-do_stage() {
-	:
-}
-
diff --git a/recipes/freesmartphone/msmcommd_git.bb b/recipes/freesmartphone/msmcommd_git.bb
index 7177e50fc1..14fb627dbc 100644
--- a/recipes/freesmartphone/msmcommd_git.bb
+++ b/recipes/freesmartphone/msmcommd_git.bb
@@ -12,9 +12,7 @@ PE = "1"
 SRC_URI = "${FREESMARTPHONE_GIT}/msmcomm.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
 
-inherit autotools_stage vala
-
-PARALLEL_MAKE = ""
+inherit autotools vala
 
 PACKAGES =+ "${PN}-lib ${PN}-term"
 FILES_${PN}-lib = "${libdir}/lib*.so.*"
diff --git a/recipes/freesmartphone/mterm2_git.bb b/recipes/freesmartphone/mterm2_git.bb
index f459a4ab65..a99f848f39 100644
--- a/recipes/freesmartphone/mterm2_git.bb
+++ b/recipes/freesmartphone/mterm2_git.bb
@@ -14,10 +14,6 @@ SRC_URI = "\
 "
 S = "${WORKDIR}/git/tools/mterm2"
 
-do_stage() {
-	:
-}
-
 inherit autotools vala
 
 FILES_${PN} += "${datadir}"
diff --git a/recipes/freesmartphone/zhone2_git.bb b/recipes/freesmartphone/zhone2_git.bb
index 11402b4649..440b922dac 100644
--- a/recipes/freesmartphone/zhone2_git.bb
+++ b/recipes/freesmartphone/zhone2_git.bb
@@ -3,7 +3,7 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "x11"
 LICENSE = "GPLv2"
-DEPENDS = "edje-native vala-native evas ecore edje libeflvala libfsobasics libfsoframework libfso-glib"
+DEPENDS = "edje-native evas ecore edje libeflvala libfsobasics libfsoframework libfso-glib"
 SRCREV = "1e3dca8a407f4e69636c47d9f22b31f8ae718d5a"
 PV = "2.0.0+gitr${SRCPV}"
 PR = "r2"
@@ -18,7 +18,7 @@ SRC_URI[splash.md5sum] = "e198d5c83cc47a216562e435df0e03c3"
 SRC_URI[splash.sha256sum] = "3e41bcf4ea50ab7406d3833e412a78ddb9afaab4b0a8cca1bf93755d1ce9a215"
 S = "${WORKDIR}/git/zhone2"
 
-inherit autotools_stage update-rc.d
+inherit autotools update-rc.d vala
 
 INITSCRIPT_NAME = "zhone2"
 INITSCRIPT_PARAMS = "defaults 40"
diff --git a/recipes/libgee/libgee_git.bb b/recipes/libgee/libgee_git.bb
index 69b66913aa..83d156d649 100644
--- a/recipes/libgee/libgee_git.bb
+++ b/recipes/libgee/libgee_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "libgee is a collection library providing GObject-based interfaces
 and classes for commonly used data structures."
 HOMEPAGE = "http://live.gnome.org/Libgee"
 SECTION = "libs"
-DEPENDS = "glib-2.0 vala-native"
+DEPENDS = "glib-2.0"
 DEPENDS_virtclass-native = "glib-2.0-native"
 LICENSE = "LGPL"
 SRCREV = "9a3d48187d87b0ed151a339a9b05f6f4eefb0922"
@@ -14,6 +14,6 @@ SRC_URI = "\
 "
 S = "${WORKDIR}/git"
 
-inherit autotools_stage pkgconfig vala
+inherit autotools vala
 
 BBCLASSEXTEND = "native"