diff --git a/meta-openeuler/conf/distro/openeuler.conf b/meta-openeuler/conf/distro/openeuler.conf index 5d4e8b302af81cff43dee501a95c68f8c0eca5ba..032970c1c9a565c9fcfbac80205b84392c58132f 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}" diff --git a/meta-openeuler/recipes-core/images/openeuler-image.bb b/meta-openeuler/recipes-core/images/openeuler-image.bb index 5ab642ee1d6f19478909f4c0daa4793759946814..c5e04b279695c11694f2aeeb017a0bcaf13906c0 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 4aea1c31fc67d2811dbc697a02865aefa648bee0..5c30d390ffde0102dce2a3fbb9ff693ba8638725 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 }