vala-native: bump to 0.6.0 and make git version the default; we need a bootstrap version now though.

4 files changed, 11 insertions, 21 deletions

diff --git a/recipes/vala/vala-bootstrap-native_0.6.0.bb b/recipes/vala/vala-bootstrap-native_0.6.0.bb
new file mode 100644
index 0000000000..bc99ebf0a6
--- /dev/null
+++ b/recipes/vala/vala-bootstrap-native_0.6.0.bb
@@ -0,0 +1,4 @@
+require vala_${PV}.bb
+
+inherit native
+DEPENDS = "glib-2.0-native"
diff --git a/recipes/vala/vala-native_0.5.7.bb b/recipes/vala/vala-native_0.5.7.bb
deleted file mode 100644
index 735c93f3f6..0000000000
--- a/recipes/vala/vala-native_0.5.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require vala_${PV}.bb
-
-inherit native
-DEPENDS = "glib-2.0-native"
-
-# work around timestamp problem in tarball
-do_compile_prepend() {
-	touch gobject/gobject.vala.stamp
-}
-    
diff --git a/recipes/vala/vala-native_git.bb b/recipes/vala/vala-native_git.bb
index 66abd5e292..545849b9d3 100644
--- a/recipes/vala/vala-native_git.bb
+++ b/recipes/vala/vala-native_git.bb
@@ -1,17 +1,13 @@
-require vala_0.5.7.bb
-# vala from git always needs the latest released version to compile itself
-DEPENDS = "vala-native"
-
-SRCREV = "e7462e3ed00b75c16c11c27f6d8a640c7f35fafc"
-PV := "0.5.7+0.5.8pre02-gitr${SRCREV}"
+require vala.inc
+inherit native
 
-DEFAULT_PREFERENCE = "-1"
+DEPENDS = "glib-2.0-native"
+# vala from git always needs the latest released version to compile itself
+DEPENDS += "vala-bootstrap-native"
+PV = "0.6.0-fso1-gitr${SRCREV}"
 
 SRC_URI = "\
-  ${FREESMARTPHONE_GIT}/vala;protocol=git;branch=master \
+  ${FREESMARTPHONE_GIT}/vala-lang;protocol=git;branch=mickey/0.6/posix \
   file://static-dbus-methods.patch;patch=1 \
 "         
 S = "${WORKDIR}/git"
-
-inherit native
-DEPENDS = "glib-2.0-native"
diff --git a/recipes/vala/vala_0.5.7.bb b/recipes/vala/vala_0.6.0.bb
index 7b2b4e293c..7b2b4e293c 100644
--- a/recipes/vala/vala_0.5.7.bb
+++ b/recipes/vala/vala_0.6.0.bb