From 6fd0af4dbd3da396d41e330f9dd932e859c5f7f0 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 18 Aug 2018 14:59:17 +0000
Subject: [PATCH] luneos.inc: use new oe-core variable IMAGE_VERSION_SUFFIX

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-luneos/conf/distro/include/luneos.inc        | 15 ++-------------
 .../images/luneos-emulator-appliance.inc          | 12 ++++--------
 .../recipes-core/images/luneos-package.inc        |  7 +++----
 3 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/meta-luneos/conf/distro/include/luneos.inc b/meta-luneos/conf/distro/include/luneos.inc
index 70a5142cab..3e51550be9 100644
--- a/meta-luneos/conf/distro/include/luneos.inc
+++ b/meta-luneos/conf/distro/include/luneos.inc
@@ -53,19 +53,8 @@ WEBOS_DISTRO_PRERELEASE ?= "devel"
 WEBOS_DISTRO_BUILD_ID ?= "0-0"
 
 # use WEBOS_DISTRO_BUILD_ID.
-WEBOS_IMAGE_NAME_SUFFIX = "${@oe.utils.conditional( 'WEBOS_DISTRO_BUILD_CODENAME', '', '', '-${WEBOS_DISTRO_BUILD_CODENAME}', d) }"
-WEBOS_IMAGE_NAME_SUFFIX .= "${@oe.utils.conditional( 'WEBOS_DISTRO_BUILD_ID', 'unofficial', '', '-${WEBOS_DISTRO_BUILD_ID}', d) }"
-IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}${WEBOS_IMAGE_NAME_SUFFIX}"
-IMAGE_NAME[vardepsexclude] += "DATETIME"
-KERNEL_IMAGE_BASE_NAME = "${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}${WEBOS_IMAGE_NAME_SUFFIX}"
-KERNEL_IMAGE_BASE_NAME[vardepsexclude] += "DATETIME"
-KERNEL_IMAGE_SYMLINK_NAME = "${MACHINE}"
-MODULE_IMAGE_BASE_NAME = "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}${WEBOS_IMAGE_NAME_SUFFIX}"
-MODULE_IMAGE_BASE_NAME[vardepsexclude] += "DATETIME"
-
-# Don't rebuild the kernel (or the rootfs) images if the only thing that's changed
-# is the start time of the build or the build number.
-BB_HASHBASE_WHITELIST_append = " WEBOS_IMAGE_NAME_SUFFIX"
+IMAGE_VERSION_SUFFIX = "${@oe.utils.conditional( 'WEBOS_DISTRO_BUILD_CODENAME', '', '', '-${WEBOS_DISTRO_BUILD_CODENAME}', d) }"
+IMAGE_VERSION_SUFFIX .= "${@oe.utils.conditional( 'WEBOS_DISTRO_BUILD_ID', 'unofficial', '${DATETIME}', '-${WEBOS_DISTRO_BUILD_ID}', d) }"
 
 # Add WEBOS_DISTRO_RELEASE_CODENAME and WEBOS_DISTRO_BUILD_ID to what's displayed
 # as the "build configuration".
diff --git a/meta-luneos/recipes-core/images/luneos-emulator-appliance.inc b/meta-luneos/recipes-core/images/luneos-emulator-appliance.inc
index e4fba230f5..ea2657931f 100644
--- a/meta-luneos/recipes-core/images/luneos-emulator-appliance.inc
+++ b/meta-luneos/recipes-core/images/luneos-emulator-appliance.inc
@@ -12,18 +12,14 @@ IMAGE_BASENAME = "luneos"
 IMAGE_NAME = "${IMAGE_BASENAME}-image"
 
 ZIP_BASENAME = "${IMAGE_BASENAME}-emulator-${MACHINE}"
-ZIP_NAME = "${ZIP_BASENAME}-${DATETIME}${WEBOS_IMAGE_NAME_SUFFIX}.zip"
-ZIP_NAME[vardepsexclude] += "DATETIME"
+ZIP_NAME = "${ZIP_BASENAME}-${IMAGE_VERSION_SUFFIX}.zip"
 
 VMDK_BASENAME = "${IMAGE_BASENAME}-emulator-${MACHINE}"
-VMDK_NAME = "${VMDK_BASENAME}-${DATETIME}${WEBOS_IMAGE_NAME_SUFFIX}.vmdk"
-VMDK_NAME[vardepsexclude] += "DATETIME"
+VMDK_NAME = "${VMDK_BASENAME}-${IMAGE_VERSION_SUFFIX}.vmdk"
 
 OVF_BASENAME = "${IMAGE_BASENAME}-emulator-${MACHINE}"
-OVF_NAME = "${OVF_BASENAME}-${DATETIME}${WEBOS_IMAGE_NAME_SUFFIX}.ovf"
-OVF_NAME[vardepsexclude] += "DATETIME"
+OVF_NAME = "${OVF_BASENAME}-${IMAGE_VERSION_SUFFIX}.ovf"
 
-do_deploy[vardepsexclude] += "DATETIME"
 do_deploy() {
     if [ ! -e ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-${MACHINE}.wic.vmdk ] ; then
         bbfatal "Required base image is not available as vmdk image!"
@@ -32,7 +28,7 @@ do_deploy() {
     rm -rf ${WORKDIR}/appliance
     mkdir -p ${WORKDIR}/appliance
     sed "s/luneos-emulator-disk.vmdk/${VMDK_NAME}/g" ${WORKDIR}/luneos-emulator.ovf > ${WORKDIR}/appliance/${OVF_NAME}
-    sed -i "s/LuneOS Emulator/LuneOS ${DATETIME}${WEBOS_IMAGE_NAME_SUFFIX}/g" ${WORKDIR}/appliance/${OVF_NAME}
+    sed -i "s/LuneOS Emulator/LuneOS ${IMAGE_VERSION_SUFFIX}/g" ${WORKDIR}/appliance/${OVF_NAME}
     ln -sf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-${MACHINE}.wic.vmdk ${WORKDIR}/appliance/${VMDK_NAME}
 
     (cd ${WORKDIR}/appliance ; zip ${DEPLOY_DIR_IMAGE}/${ZIP_NAME} ${OVF_NAME} ${VMDK_NAME})
diff --git a/meta-luneos/recipes-core/images/luneos-package.inc b/meta-luneos/recipes-core/images/luneos-package.inc
index 7e6d7d86c7..94dc9ac9b8 100644
--- a/meta-luneos/recipes-core/images/luneos-package.inc
+++ b/meta-luneos/recipes-core/images/luneos-package.inc
@@ -10,10 +10,9 @@ IMAGE_BASENAME = "luneos"
 IMAGE_NAME = "${IMAGE_BASENAME}-image"
 
 ZIP_BASENAME = "${IMAGE_BASENAME}-package-${MACHINE}"
-ZIP_NAME = "${ZIP_BASENAME}-${DATETIME}${WEBOS_IMAGE_NAME_SUFFIX}"
-ZIP_NAME[vardepsexclude] += "DATETIME"
+ZIP_NAME = "${ZIP_BASENAME}-${IMAGE_VERSION_SUFFIX}"
 
-inherit webos_ports_repo
+inherit webos_ports_repo kernel-artifact-names
 
 PV = "1.0.2+git${SRCPV}"
 SRCREV = "12c8eb4d79e4504a7683b8dc18266a9c460d2537"
@@ -23,7 +22,7 @@ SRC_URI = "${WEBOS_PORTS_GIT_REPO_COMPLETE}"
 
 do_deploy() {
     IMG="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-${MACHINE}.tar.gz"
-    FASTBOOT="${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_IMAGE_SYMLINK_NAME}.fastboot"
+    FASTBOOT="${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_IMAGE_LINK_NAME}.fastboot"
     if [ ! -e $IMG ] ; then
         bbfatal "Required base image is not available as tar.gz image! $IMG doesn't exist."
     fi