diff options
| author | Ming Liu <ming.liu@toradex.com> | 2021-12-05 11:36:00 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2022-02-18 14:22:33 +0100 |
| commit | 8d30d13e12ae0d5e43560508a6b62a179132c8e9 (patch) | |
| tree | 1b791629f438f108c1aded1baf78f0101c17678b | |
| parent | c0b021e8a3d7cb507c689ec8ac45108840319eac (diff) | |
meta: move TEZI_SHOW_EULA_LICENSE to tdx-base.inc
TEZI_SHOW_EULA_LICENSE shall be a machine global variable but not image
specific, move it to tdx-base.inc in meta-toradex-distro layer.
Torizoncore/Tezi/BSP now use the same setting of
TEZI_SHOW_EULA_LICENSE.
Related-to: TOR-2102
Signed-off-by: Ming Liu <ming.liu@toradex.com>
(cherry picked from commit 95a04d675063b714504ccc9d38f6ea71244f64e4)
| -rw-r--r-- | recipes-images/images/tdx-reference-minimal-image.bb | 8 | ||||
| -rw-r--r-- | recipes-images/images/tdx-reference-multimedia-image.bb | 9 |
2 files changed, 0 insertions, 17 deletions
diff --git a/recipes-images/images/tdx-reference-minimal-image.bb b/recipes-images/images/tdx-reference-minimal-image.bb index 3ac6196..1be5909 100644 --- a/recipes-images/images/tdx-reference-minimal-image.bb +++ b/recipes-images/images/tdx-reference-minimal-image.bb @@ -14,14 +14,6 @@ IMAGE_NAME = "${MACHINE_NAME}_${IMAGE_BASENAME}" COPY_LIC_MANIFEST ?= "1" COPY_LIC_DIRS ?= "1" -# Show Tezi EULA license -TEZI_SHOW_EULA_LICENSE ?= "1" -TEZI_SHOW_EULA_LICENSE:apalis-tk1 ?= "0" -TEZI_SHOW_EULA_LICENSE:use-mainline-bsp ?= "0" -TEZI_SHOW_EULA_LICENSE:colibri-imx6:use-mainline-bsp ?= "1" -TEZI_SHOW_EULA_LICENSE:apalis-imx6:use-mainline-bsp ?= "1" - - add_rootfs_version () { printf "${DISTRO_NAME} ${DISTRO_VERSION} (${DISTRO_CODENAME}) \\\n \\\l\n" > ${IMAGE_ROOTFS}/etc/issue printf "${DISTRO_NAME} ${DISTRO_VERSION} (${DISTRO_CODENAME}) %%h\n" > ${IMAGE_ROOTFS}/etc/issue.net diff --git a/recipes-images/images/tdx-reference-multimedia-image.bb b/recipes-images/images/tdx-reference-multimedia-image.bb index a05ae22..f96528b 100644 --- a/recipes-images/images/tdx-reference-multimedia-image.bb +++ b/recipes-images/images/tdx-reference-multimedia-image.bb @@ -8,15 +8,6 @@ inherit populate_sdk_qt5 #Prefix to the resulting deployable tarball name export IMAGE_BASENAME = "Reference-Multimedia-Image" -# Show Tezi EULA license -TEZI_SHOW_EULA_LICENSE ?= "1" -TEZI_SHOW_EULA_LICENSE:apalis-tk1 ?= "0" - -TEZI_SHOW_EULA_LICENSE:use-mainline-bsp ?= "0" -TEZI_SHOW_EULA_LICENSE:colibri-imx6:use-mainline-bsp ?= "1" -TEZI_SHOW_EULA_LICENSE:apalis-imx6:use-mainline-bsp ?= "1" - - SYSTEMD_DEFAULT_TARGET = "graphical.target" IMAGE_FEATURES += " \ |