From 8a4a59f9cbab1d43f07f1ff1c2c965202e36dc08 Mon Sep 17 00:00:00 2001 From: Jose Bollo Date: Mon, 10 Sep 2018 14:13:41 +0200 Subject: [PATCH] af-main & af-binder: Set version from AGLVERSION Change-Id: Ie1ff83f007d9d8d819829540d51e576f088c97eb Signed-off-by: Jose Bollo --- ...inder-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 .../recipes-core/af-binder/{af-binder_1.0.inc => af-binder_git.inc} | 5 +++++ ...af-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} | 0 .../af-main/{nativesdk-af-main_1.0.bb => nativesdk-af-main_git.bb} | 1 + 7 files changed, 8 insertions(+) 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} (92%) 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} (100%) 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 92% 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..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 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 100% 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 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