summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Bollo <jose.bollo@iot.bzh>2018-09-10 14:13:41 +0200
committerJosé Bollo <jose.bollo@iot.bzh>2018-09-14 14:20:02 +0200
commit8a4a59f9cbab1d43f07f1ff1c2c965202e36dc08 (patch)
treecd0befc3e55bfc5bf559311811ebd1bab193b271
parentc0b3f329cdd673cccedf0fb2d0e7c83e9b7e1630 (diff)
af-main & af-binder: Set version from AGLVERSION
Change-Id: Ie1ff83f007d9d8d819829540d51e576f088c97eb Signed-off-by: Jose Bollo <jose.bollo@iot.bzh>
-rw-r--r--meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_git.bb (renamed from meta-app-framework/recipes-core/af-binder/af-binder-devtools-native_1.0.bb)0
-rw-r--r--meta-app-framework/recipes-core/af-binder/af-binder_git.bb (renamed from meta-app-framework/recipes-core/af-binder/af-binder_1.0.bb)0
-rw-r--r--meta-app-framework/recipes-core/af-binder/af-binder_git.inc (renamed from meta-app-framework/recipes-core/af-binder/af-binder_1.0.inc)5
-rw-r--r--meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_git.bb (renamed from meta-app-framework/recipes-core/af-binder/nativesdk-af-binder-devtools_1.0.bb)0
-rw-r--r--meta-app-framework/recipes-core/af-main/af-main_git.bb (renamed from meta-app-framework/recipes-core/af-main/af-main_1.0.bb)2
-rw-r--r--meta-app-framework/recipes-core/af-main/af-main_git.inc (renamed from meta-app-framework/recipes-core/af-main/af-main_1.0.inc)0
-rw-r--r--meta-app-framework/recipes-core/af-main/nativesdk-af-main_git.bb (renamed from meta-app-framework/recipes-core/af-main/nativesdk-af-main_1.0.bb)1
7 files changed, 8 insertions, 0 deletions
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
index 70dafb38c..70dafb38c 100644
--- 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
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
index 91f26b894..91f26b894 100644
--- 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
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
index cca794db7..635da5b92 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
@@ -15,3 +15,8 @@ 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
index 3223dd05d..3223dd05d 100644
--- 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
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
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
index 82489488e..82489488e 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
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
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} \