From 4f2a9ac1084ff345147ab23e3e5519a1957a180b Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 6 Mar 2019 12:58:47 +0100 Subject: tdx-image-fstype: drop include tdx_version.conf Variables from tdx_version.conf are now provided by the distro. Add defaults in case someone uses tdx-image-fstype without our distro. Signed-off-by: Max Krummenacher --- recipes-images/images/tdx-image-fstype.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes-images/images/tdx-image-fstype.inc b/recipes-images/images/tdx-image-fstype.inc index fb0191f..1f4a415 100644 --- a/recipes-images/images/tdx-image-fstype.inc +++ b/recipes-images/images/tdx-image-fstype.inc @@ -1,7 +1,5 @@ #create the deployment directory-tree -include conf/tdx_version.conf - PV = "${TDX_VER_PACKAGE_MIN}" IMAGE_DIR = "${IMAGE_NAME}_${TDX_VER_ITEM}" IMAGE_ROOTFS = "${WORKDIR}/${IMAGE_DIR}/rootfs" @@ -202,3 +200,8 @@ addtask imagedeploy after do_image before do_image_complete # make sure to rerun do_rootfs before do_imagedeploy is executed do_imagedeploy[vardep] = "do_rootfs" + +# defaults +TDX_VER_PACKAGE_MIN ??= "nodistro" +TDX_VER_PACKAGE ??= "nodistro" +TDX_VER_ITEM ??= "nodistro" -- cgit v1.2.3