From b2ae5ea917dc237d65bf5fb046cdac4ba6ade018 Mon Sep 17 00:00:00 2001
From: lisimin <lisimin@huawei.com>
Date: Thu, 10 Mar 2022 22:14:28 +0800
Subject: [PATCH 1/2] fix build error when not set DATETIME

fix bb hash changement error when not set DATETIME

Signed-off-by: lisimin <lisimin@huawei.com>
---
 meta-openeuler/recipes-core/images/openeuler-image.bb      | 5 ++++-
 meta-openeuler/recipes-core/os-release/os-release.bbappend | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/meta-openeuler/recipes-core/images/openeuler-image.bb b/meta-openeuler/recipes-core/images/openeuler-image.bb
index 5ab642ee1d6..c5e04b27969 100644
--- a/meta-openeuler/recipes-core/images/openeuler-image.bb
+++ b/meta-openeuler/recipes-core/images/openeuler-image.bb
@@ -46,7 +46,10 @@ RPMROOTFSDEPENDS = ""
 #IMAGE_ROOTFS_SIZE ?= "8192"
 #IMAGE_ROOTFS_EXTRA_SPACE_append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "", d)}"
 
-OUTPUT_DIR = "${TOPDIR}/output/${DATETIME}"
+OUTPUTTIME = "${DATETIME}"
+# Ignore how DATETIME is computed
+OUTPUTTIME[vardepsexclude] = "DATETIME"
+OUTPUT_DIR = "${TOPDIR}/output/${OUTPUTTIME}"
 
 #No kernel-abiversion file found, cannot run depmod, aborting
 USE_DEPMOD = "0"
diff --git a/meta-openeuler/recipes-core/os-release/os-release.bbappend b/meta-openeuler/recipes-core/os-release/os-release.bbappend
index 4aea1c31fc6..5c30d390ffd 100644
--- a/meta-openeuler/recipes-core/os-release/os-release.bbappend
+++ b/meta-openeuler/recipes-core/os-release/os-release.bbappend
@@ -1,5 +1,7 @@
+BUILDTIME = "${DATETIME}"
+BUILDTIME[vardepsexclude] = "DATETIME"
 do_install_append () {
-    if [ "${DATETIME}" ]; then
-        echo ${DATETIME} > ${D}${sysconfdir}/os-revision
+    if [ "${BUILDTIME}" ]; then
+        echo ${BUILDTIME} > ${D}${sysconfdir}/os-revision
     fi
 }
-- 
Gitee


From a8e51c1be7ef64983581b8ddd034a643c1abd6cb Mon Sep 17 00:00:00 2001
From: lisimin <lisimin@huawei.com>
Date: Thu, 10 Mar 2022 22:17:04 +0800
Subject: [PATCH 2/2] update default sdk install directory

SDKPATHINSTALL is not used, delete it.
update default sdk install directory by SDKPATH

Signed-off-by: lisimin <lisimin@huawei.com>
---
 meta-openeuler/conf/distro/openeuler.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-openeuler/conf/distro/openeuler.conf b/meta-openeuler/conf/distro/openeuler.conf
index 5d4e8b302af..032970c1c9a 100644
--- a/meta-openeuler/conf/distro/openeuler.conf
+++ b/meta-openeuler/conf/distro/openeuler.conf
@@ -23,7 +23,8 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${OPENEULER_DEFAULT_DISTRO_FEATUR
 PREFERRED_VERSION_linux-openeuler ?= "5.10%"
 
 SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}"
-SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}"
+# set default sdk install directory
+SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
 
 DISTRO_EXTRA_RDEPENDS += "${OPENEULER_DEFAULT_EXTRA_RDEPENDS}"
 DISTRO_EXTRA_RRECOMMENDS += "${OPENEULER_DEFAULT_EXTRA_RRECOMMENDS}"
-- 
Gitee