From 481b5cdfef7e4c90a0a062e4b087bff32000b19a Mon Sep 17 00:00:00 2001
From: Jose Bollo <jose.bollo@iot.bzh>
Date: Mon, 10 Sep 2018 14:13:41 +0200
Subject: [PATCH] af-main & af-binder: Version Funky Flounder
Change-Id: Ie1ff83f007d9d8d819829540d51e576f088c97eb
Signed-off-by: Jose Bollo <jose.bollo@iot.bzh>
---
...der-devtools-native_1.0.bb => af-binder-devtools-native_git.bb} | 0
.../recipes-core/af-binder/{af-binder_1.0.bb => af-binder_git.bb} | 0
.../af-binder/{af-binder_1.0.inc => af-binder_git.inc} | 7 ++++++-
...-binder-devtools_1.0.bb => nativesdk-af-binder-devtools_git.bb} | 0
.../recipes-core/af-main/{af-main_1.0.bb => af-main_git.bb} | 2 ++
.../recipes-core/af-main/{af-main_1.0.inc => af-main_git.inc} | 2 +-
.../af-main/{nativesdk-af-main_1.0.bb => nativesdk-af-main_git.bb} | 1 +
7 files changed, 10 insertions(+), 2 deletions(-)
rename meta-app-framework/recipes-core/af-binder/{af-binder-devtools-native_1.0.bb => af-binder-devtools-native_git.bb} (100%)
rename meta-app-framework/recipes-core/af-binder/{af-binder_1.0.bb => af-binder_git.bb} (100%)
rename meta-app-framework/recipes-core/af-binder/{af-binder_1.0.inc => af-binder_git.inc} (88%)
rename meta-app-framework/recipes-core/af-binder/{nativesdk-af-binder-devtools_1.0.bb => nativesdk-af-binder-devtools_git.bb} (100%)
rename meta-app-framework/recipes-core/af-main/{af-main_1.0.bb => af-main_git.bb} (98%)
rename meta-app-framework/recipes-core/af-main/{af-main_1.0.inc => af-main_git.inc} (93%)
rename meta-app-framework/recipes-core/af-main/{nativesdk-af-main_1.0.bb => nativesdk-af-main_git.bb} (95%)
diff --git a/meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_1.0.bb b/meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_git.bb
similarity index 100%
rename from meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_1.0.bb
rename to meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_git.bb
diff --git a/meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb b/meta-app-framework/recipes-core/af-binder/af-binder_git.bb
similarity index 100%
rename from meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb
rename to meta-app-framework/recipes-core/af-binder/af-binder_git.bb
diff --git a/meta-app-framework/recipes-core/af-binder/af-binder_1.0.inc b/meta-app-framework/recipes-core/af-binder/af-binder_git.inc
similarity index 88%
rename from meta-app-framework/recipes-core/af-binder/af-binder_1.0.inc
rename to meta-app-framework/recipes-core/af-binder/af-binder_git.inc
index cca794db7..7f44d6b9b 100644
--- a/meta-app-framework/recipes-core/af-binder/af-binder_1.0.inc
+++ b/meta-app-framework/recipes-core/af-binder/af-binder_git.inc
@@ -9,9 +9,14 @@ LIC_FILES_CHKSUM = "file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/app-framework-binder;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "29f544ba5fa53407575b549c1d3b0a4e2619af8f"
+SRCREV = "${AGL_APP_REVISION}"
PV = "${AGL_BRANCH}+git${SRCPV}"
S = "${WORKDIR}/git"
CFLAGS_append_agl-devel = " -DAGL_DEVEL"
+
+EXTRA_OECMAKE_append = "\
+ -DAGLVERSION=${AGLVERSION} \
+"
+
diff --git a/meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_1.0.bb b/meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_git.bb
similarity index 100%
rename from meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_1.0.bb
rename to meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_git.bb
diff --git a/meta-app-framework/recipes-core/af-main/af-main_1.0.bb b/meta-app-framework/recipes-core/af-main/af-main_git.bb
similarity index 98%
rename from meta-app-framework/recipes-core/af-main/af-main_1.0.bb
rename to meta-app-framework/recipes-core/af-main/af-main_git.bb
index 8e3b1e835..041816289 100644
--- a/meta-app-framework/recipes-core/af-main/af-main_1.0.bb
+++ b/meta-app-framework/recipes-core/af-main/af-main_git.bb
@@ -20,6 +20,7 @@ EXTRA_OECMAKE_class-native = "\
-DUSE_LIBZIP=1 \
-DUSE_SIMULATION=1 \
-DUSE_SDK=1 \
+ -DAGLVERSION=${AGLVERSION} \
-Dafm_name=${afm_name} \
-Dafm_confdir=${afm_confdir} \
-Dafm_datadir=${afm_datadir} \
@@ -29,6 +30,7 @@ EXTRA_OECMAKE = "\
-DUSE_LIBZIP=1 \
-DUSE_SIMULATION=0 \
-DUSE_SDK=0 \
+ -DAGLVERSION=${AGLVERSION} \
-Dafm_name=${afm_name} \
-Dafm_confdir=${afm_confdir} \
-Dafm_datadir=${afm_datadir} \
diff --git a/meta-app-framework/recipes-core/af-main/af-main_1.0.inc b/meta-app-framework/recipes-core/af-main/af-main_git.inc
similarity index 93%
rename from meta-app-framework/recipes-core/af-main/af-main_1.0.inc
rename to meta-app-framework/recipes-core/af-main/af-main_git.inc
index 82489488e..16bd0104c 100644
--- a/meta-app-framework/recipes-core/af-main/af-main_1.0.inc
+++ b/meta-app-framework/recipes-core/af-main/af-main_git.inc
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/app-framework-main;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "c152727a73c55782b6ffb65add51d03da5ff8e3b"
+SRCREV = "${AGL_APP_REVISION}"
PV = "${AGL_BRANCH}+git${SRCPV}"
S = "${WORKDIR}/git"
diff --git a/meta-app-framework/recipes-core/af-main/nativesdk-af-main_1.0.bb b/meta-app-framework/recipes-core/af-main/nativesdk-af-main_git.bb
similarity index 95%
rename from meta-app-framework/recipes-core/af-main/nativesdk-af-main_1.0.bb
rename to meta-app-framework/recipes-core/af-main/nativesdk-af-main_git.bb
index 8d044345f..759c893c7 100644
--- a/meta-app-framework/recipes-core/af-main/nativesdk-af-main_1.0.bb
+++ b/meta-app-framework/recipes-core/af-main/nativesdk-af-main_git.bb
@@ -10,6 +10,7 @@ EXTRA_OECMAKE = "\
-DUSE_LIBZIP=1 \
-DUSE_SIMULATION=1 \
-DUSE_SDK=1 \
+ -DAGLVERSION=${AGLVERSION} \
-Dafm_name=${afm_name} \
-Dafm_confdir=${afm_confdir} \
-Dafm_datadir=${afm_datadir} \
--
2.16.6