When XILINX_WITH_ESW is set to anything but XSCT, fix a number of failures
as well as prevent any .bb files from this layer from being run with a
reasonable error message.

Signed-off-by: Mark Hatle <[email protected]>
---
 classes-recipe/check_xsct_enabled.bbclass                   | 4 ++++
 classes-recipe/xsctapp.bbclass                              | 2 ++
 .../esw-baremetal-hello-world/esw-baremetal-hello-world.bb  | 2 +-
 .../esw-freertos-hello-world/esw-freertos-hello-world.bb    | 2 +-
 recipes-bsp/bitstream/bitstream-extraction_git.bb           | 2 +-
 recipes-bsp/bitstream/bitstream-microblaze_1.0.bb           | 2 +-
 recipes-bsp/device-tree/device-tree.inc                     | 3 +++
 recipes-bsp/fsboot/fs-boot_git.bb                           | 2 +-
 recipes-bsp/hdf/external-hdf_2022.1.bb                      | 6 +++---
 recipes-bsp/hdf/external-hdf_2022.2.bb                      | 6 +++---
 recipes-bsp/hdf/external-hdf_2023.1.bb                      | 6 +++---
 recipes-bsp/hdf/external-hdf_2023.2.bb                      | 6 +++---
 recipes-bsp/hdf/external-hdf_2024.1.bb                      | 6 +++---
 recipes-bsp/hdf/hdf-repository-2023.1.inc                   | 6 +++---
 recipes-bsp/hdf/hdf-repository_2023.2.inc                   | 6 +++---
 recipes-bsp/hdf/hdf-repository_2024.1.inc                   | 6 +++---
 recipes-bsp/imgrcry/imgrcry-make_2023.1.bb                  | 2 +-
 recipes-bsp/imgrcry/imgrcry-make_2023.2.bb                  | 2 +-
 recipes-bsp/imgrcry/imgrcry-make_2024.1.bb                  | 2 +-
 recipes-bsp/imgrcry/imgrcry_git.bb                          | 2 +-
 recipes-bsp/imgsel/imgsel_git.bb                            | 2 +-
 recipes-openamp/examples/openamp-fw.inc                     | 2 +-
 recipes-utils/mb-realoc/mb-realoc.bb                        | 2 +-
 recipes-utils/xsct/xsct-native.bb                           | 6 +++++-
 scripts/hdf-repository-generate-srcuri.sh                   | 6 +++---
 25 files changed, 53 insertions(+), 40 deletions(-)
 create mode 100644 classes-recipe/check_xsct_enabled.bbclass

diff --git a/classes-recipe/check_xsct_enabled.bbclass 
b/classes-recipe/check_xsct_enabled.bbclass
new file mode 100644
index 0000000..816caaa
--- /dev/null
+++ b/classes-recipe/check_xsct_enabled.bbclass
@@ -0,0 +1,4 @@
+python() {
+    if d.getVar('XILINX_WITH_ESW') != 'xsct':
+        raise bb.parse.SkipRecipe("This package requires xsct, which is not 
enabled.  XILINX_WITH_ESW set to '%s'." % d.getVar('XILINX_WITH_ESW'))
+}
diff --git a/classes-recipe/xsctapp.bbclass b/classes-recipe/xsctapp.bbclass
index 48275c2..f0e4ce3 100644
--- a/classes-recipe/xsctapp.bbclass
+++ b/classes-recipe/xsctapp.bbclass
@@ -7,6 +7,8 @@
 
 S = "${UNPACKDIR}/git"
 
+XILINX_XSCT_VERSION ??= 
"${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}"
+
 ESW_VER ?= "${XILINX_XSCT_VERSION}"
 
 inherit xlnx-embeddedsw xsctbase image-artifact-names
diff --git 
a/recipes-apps/esw-baremetal-hello-world/esw-baremetal-hello-world.bb 
b/recipes-apps/esw-baremetal-hello-world/esw-baremetal-hello-world.bb
index 75a481f..40113a1 100644
--- a/recipes-apps/esw-baremetal-hello-world/esw-baremetal-hello-world.bb
+++ b/recipes-apps/esw-baremetal-hello-world/esw-baremetal-hello-world.bb
@@ -2,7 +2,7 @@ SUMMARY = "Hello World baremetal Application for both APU and 
RPU using XSCT"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = 
"file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-inherit xsct_baremetal_app
+inherit check_xsct_enabled xsct_baremetal_app
 
 SRC_URI = "${EMBEDDEDSW_SRCURI}"
 S = "${UNPACKDIR}/git"
diff --git a/recipes-apps/esw-freertos-hello-world/esw-freertos-hello-world.bb 
b/recipes-apps/esw-freertos-hello-world/esw-freertos-hello-world.bb
index 5c926d1..dc19870 100644
--- a/recipes-apps/esw-freertos-hello-world/esw-freertos-hello-world.bb
+++ b/recipes-apps/esw-freertos-hello-world/esw-freertos-hello-world.bb
@@ -2,7 +2,7 @@ SUMMARY = "Hello World FreeRTOS Application for RPU using XSCT"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = 
"file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-inherit xsct_freertos_app
+inherit check_xsct_enabled xsct_freertos_app
 
 SRC_URI = "${EMBEDDEDSW_SRCURI}"
 S = "${UNPACKDIR}/git"
diff --git a/recipes-bsp/bitstream/bitstream-extraction_git.bb 
b/recipes-bsp/bitstream/bitstream-extraction_git.bb
index 7340c69..13ae1c9 100644
--- a/recipes-bsp/bitstream/bitstream-extraction_git.bb
+++ b/recipes-bsp/bitstream/bitstream-extraction_git.bb
@@ -9,7 +9,7 @@ PROVIDES = "virtual/bitstream"
 
 PACKAGE_ARCH ?= "${MACHINE_ARCH}"
 
-inherit xsctbit deploy image-artifact-names
+inherit check_xsct_enabled xsctbit deploy image-artifact-names
 
 S = "${UNPACKDIR}"
 
diff --git a/recipes-bsp/bitstream/bitstream-microblaze_1.0.bb 
b/recipes-bsp/bitstream/bitstream-microblaze_1.0.bb
index df10573..b97dee7 100644
--- a/recipes-bsp/bitstream/bitstream-microblaze_1.0.bb
+++ b/recipes-bsp/bitstream/bitstream-microblaze_1.0.bb
@@ -8,7 +8,7 @@ LICENSE = "BSD-3-Clause"
 
 DEPENDS = "virtual/fsboot virtual/bitstream"
 
-inherit deploy
+inherit check_xsct_enabled deploy
 
 COMPATIBLE_MACHINE ?= "^$"
 COMPATIBLE_MACHINE:microblaze = ".*"
diff --git a/recipes-bsp/device-tree/device-tree.inc 
b/recipes-bsp/device-tree/device-tree.inc
index 154b17a..ad9e8d1 100644
--- a/recipes-bsp/device-tree/device-tree.inc
+++ b/recipes-bsp/device-tree/device-tree.inc
@@ -2,4 +2,7 @@ REPO ??= 
"git://github.com/Xilinx/device-tree-xlnx.git;protocol=https"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}"
 SRC_URI:append = " ${REPO};${BRANCHARG}"
 
+XILINX_RELEASE_VERION ??= "v2024.1"
+XILINX_XSCT_VERSION ??= 
"${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}"
+
 require device-tree-${XILINX_XSCT_VERSION}.inc
diff --git a/recipes-bsp/fsboot/fs-boot_git.bb 
b/recipes-bsp/fsboot/fs-boot_git.bb
index f9a7f1f..ba97c9b 100644
--- a/recipes-bsp/fsboot/fs-boot_git.bb
+++ b/recipes-bsp/fsboot/fs-boot_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "FS-BOOT generator"
 
 PROVIDES = "virtual/fsboot"
 
-inherit xsctfsboot xsctyaml deploy
+inherit check_xsct_enabled xsctfsboot xsctyaml deploy
 
 MB_BAREMETAL_TOOLCHAIN_PATH_ADD = 
"${XILINX_SDK_TOOLCHAIN}/gnu/microblaze/lin/bin:"
 PATH =. "${MB_BAREMETAL_TOOLCHAIN_PATH_ADD}"
diff --git a/recipes-bsp/hdf/external-hdf_2022.1.bb 
b/recipes-bsp/hdf/external-hdf_2022.1.bb
index 29edf3a..23c384f 100644
--- a/recipes-bsp/hdf/external-hdf_2022.1.bb
+++ b/recipes-bsp/hdf/external-hdf_2022.1.bb
@@ -6,7 +6,9 @@ PROVIDES = "virtual/hdf"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-inherit deploy
+inherit check_xsct_enabled deploy
+
+HDF_MACHINE ?= "${MACHINE}"
 
 # HDF_BASE - file protocol
 # HDF_PATH - Path to git repository, or file in question
@@ -88,8 +90,6 @@ do_check() {
     fi
 }
 
-HDF_MACHINE ?= "${MACHINE}"
-
 do_install() {
     install -d ${D}/opt/xilinx/hw-design
     install -m 0644 ${HDF_NAME} ${D}/opt/xilinx/hw-design/design.${HDF_EXT}
diff --git a/recipes-bsp/hdf/external-hdf_2022.2.bb 
b/recipes-bsp/hdf/external-hdf_2022.2.bb
index 8549f2b..f0767be 100644
--- a/recipes-bsp/hdf/external-hdf_2022.2.bb
+++ b/recipes-bsp/hdf/external-hdf_2022.2.bb
@@ -8,7 +8,9 @@ INHIBIT_DEFAULT_DEPS = "1"
 
 S = "${UNPACKDIR}" 
 
-inherit deploy
+inherit check_xsct_enabled deploy
+
+HDF_MACHINE ?= "${MACHINE}"
 
 # HDF_BASE - file protocol
 # HDF_PATH - Path to git repository, or file in question
@@ -90,8 +92,6 @@ do_check() {
     fi
 }
 
-HDF_MACHINE ?= "${MACHINE}"
-
 do_install() {
     install -d ${D}/opt/xilinx/hw-design
     install -m 0644 ${HDF_NAME} ${D}/opt/xilinx/hw-design/design.${HDF_EXT}
diff --git a/recipes-bsp/hdf/external-hdf_2023.1.bb 
b/recipes-bsp/hdf/external-hdf_2023.1.bb
index 55693e2..cc5cef3 100644
--- a/recipes-bsp/hdf/external-hdf_2023.1.bb
+++ b/recipes-bsp/hdf/external-hdf_2023.1.bb
@@ -8,7 +8,9 @@ S = "${UNPACKDIR}"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-inherit deploy
+inherit check_xsct_enabled deploy
+
+HDF_MACHINE ?= "${MACHINE}"
 
 HDF_BASE ??= ""
 HDF_BASE[doc] = "Download protocol (file://, git://, http:// or https://)"
@@ -120,8 +122,6 @@ do_check() {
     fi
 }
 
-HDF_MACHINE ?= "${MACHINE}"
-
 do_install() {
     install -d ${D}/opt/xilinx/hw-design
     install -m 0644 ${HDF_NAME} ${D}/opt/xilinx/hw-design/design.${HDF_EXT}
diff --git a/recipes-bsp/hdf/external-hdf_2023.2.bb 
b/recipes-bsp/hdf/external-hdf_2023.2.bb
index f6c7976..a0261f1 100644
--- a/recipes-bsp/hdf/external-hdf_2023.2.bb
+++ b/recipes-bsp/hdf/external-hdf_2023.2.bb
@@ -8,7 +8,9 @@ INHIBIT_DEFAULT_DEPS = "1"
 
 S = "${UNPACKDIR}"
 
-inherit deploy
+inherit check_xsct_enabled deploy
+
+HDF_MACHINE ?= "${MACHINE}"
 
 HDF_BASE ??= ""
 HDF_BASE[doc] = "Download protocol (file://, git://, http:// or https://)"
@@ -120,8 +122,6 @@ do_check() {
     fi
 }
 
-HDF_MACHINE ?= "${MACHINE}"
-
 do_install() {
     install -d ${D}/opt/xilinx/hw-design
     install -m 0644 ${HDF_NAME} ${D}/opt/xilinx/hw-design/design.${HDF_EXT}
diff --git a/recipes-bsp/hdf/external-hdf_2024.1.bb 
b/recipes-bsp/hdf/external-hdf_2024.1.bb
index b1b87d1..3b10b3e 100644
--- a/recipes-bsp/hdf/external-hdf_2024.1.bb
+++ b/recipes-bsp/hdf/external-hdf_2024.1.bb
@@ -8,7 +8,9 @@ INHIBIT_DEFAULT_DEPS = "1"
 
 S = "${UNPACKDIR}" 
 
-inherit deploy
+inherit check_xsct_enabled deploy
+
+HDF_MACHINE ?= "${MACHINE}"
 
 HDF_BASE ??= ""
 HDF_BASE[doc] = "Download protocol (file://, git://, http:// or https://)"
@@ -120,8 +122,6 @@ do_check() {
     fi
 }
 
-HDF_MACHINE ?= "${MACHINE}"
-
 do_install() {
     install -d ${D}/opt/xilinx/hw-design
     install -m 0644 ${HDF_NAME} ${D}/opt/xilinx/hw-design/design.${HDF_EXT}
diff --git a/recipes-bsp/hdf/hdf-repository-2023.1.inc 
b/recipes-bsp/hdf/hdf-repository-2023.1.inc
index 2cc3521..559f269 100644
--- a/recipes-bsp/hdf/hdf-repository-2023.1.inc
+++ b/recipes-bsp/hdf/hdf-repository-2023.1.inc
@@ -5,9 +5,9 @@
 HDF_BASE_DEFAULT := '${HDF_BASE}'
 HDF_PATH_DEFAULT := '${HDF_PATH}'
 BRANCHARG_DEFAULT := '${BRANCHARG}'
-HDF_BASE ??= "${@d.getVarFlag('HDF_BASE', d.getVar('HDF_MACHINE')) or 
'${HDF_BASE_DEFAULT}'}"
-HDF_PATH ??= "${@d.getVarFlag('HDF_PATH', d.getVar('HDF_MACHINE')) or 
'${HDF_PATH_DEFAULT}'}"
-BRANCHARG ??= "${@d.getVarFlag('BRANCHARG', d.getVar('HDF_MACHINE')) or 
'${BRANCHARG_DEFAULT}'}"
+HDF_BASE ??= "${@d.getVarFlag('HDF_BASE', d.getVar('HDF_MACHINE') or 
'undefined') or '${HDF_BASE_DEFAULT}'}"
+HDF_PATH ??= "${@d.getVarFlag('HDF_PATH', d.getVar('HDF_MACHINE') or 
'undefined') or '${HDF_PATH_DEFAULT}'}"
+BRANCHARG ??= "${@d.getVarFlag('BRANCHARG', d.getVar('HDF_MACHINE') or 
'undefined') or '${BRANCHARG_DEFAULT}'}"
 
 # ac701-microblazeel
 HDF_BASE[ac701-microblazeel] = 'https://'
diff --git a/recipes-bsp/hdf/hdf-repository_2023.2.inc 
b/recipes-bsp/hdf/hdf-repository_2023.2.inc
index 01c62eb..d9b86fd 100644
--- a/recipes-bsp/hdf/hdf-repository_2023.2.inc
+++ b/recipes-bsp/hdf/hdf-repository_2023.2.inc
@@ -5,9 +5,9 @@
 HDF_BASE_DEFAULT := '${HDF_BASE}'
 HDF_PATH_DEFAULT := '${HDF_PATH}'
 BRANCHARG_DEFAULT := '${BRANCHARG}'
-HDF_BASE ??= "${@d.getVarFlag('HDF_BASE', d.getVar('HDF_MACHINE')) or 
'${HDF_BASE_DEFAULT}'}"
-HDF_PATH ??= "${@d.getVarFlag('HDF_PATH', d.getVar('HDF_MACHINE')) or 
'${HDF_PATH_DEFAULT}'}"
-BRANCHARG ??= "${@d.getVarFlag('BRANCHARG', d.getVar('HDF_MACHINE')) or 
'${BRANCHARG_DEFAULT}'}"
+HDF_BASE ??= "${@d.getVarFlag('HDF_BASE', d.getVar('HDF_MACHINE') or 
'undefined') or '${HDF_BASE_DEFAULT}'}"
+HDF_PATH ??= "${@d.getVarFlag('HDF_PATH', d.getVar('HDF_MACHINE') or 
'undefined') or '${HDF_PATH_DEFAULT}'}"
+BRANCHARG ??= "${@d.getVarFlag('BRANCHARG', d.getVar('HDF_MACHINE') or 
'undefined') or '${BRANCHARG_DEFAULT}'}"
 
 # ac701-microblazeel
 HDF_BASE[ac701-microblazeel] = 'https://'
diff --git a/recipes-bsp/hdf/hdf-repository_2024.1.inc 
b/recipes-bsp/hdf/hdf-repository_2024.1.inc
index 5358a4d..4d1cc2d 100644
--- a/recipes-bsp/hdf/hdf-repository_2024.1.inc
+++ b/recipes-bsp/hdf/hdf-repository_2024.1.inc
@@ -5,9 +5,9 @@
 HDF_BASE_DEFAULT := '${HDF_BASE}'
 HDF_PATH_DEFAULT := '${HDF_PATH}'
 BRANCHARG_DEFAULT := '${BRANCHARG}'
-HDF_BASE ??= "${@d.getVarFlag('HDF_BASE', d.getVar('HDF_MACHINE')) or 
'${HDF_BASE_DEFAULT}'}"
-HDF_PATH ??= "${@d.getVarFlag('HDF_PATH', d.getVar('HDF_MACHINE')) or 
'${HDF_PATH_DEFAULT}'}"
-BRANCHARG ??= "${@d.getVarFlag('BRANCHARG', d.getVar('HDF_MACHINE')) or 
'${BRANCHARG_DEFAULT}'}"
+HDF_BASE ??= "${@d.getVarFlag('HDF_BASE', d.getVar('HDF_MACHINE') or 
'undefined') or '${HDF_BASE_DEFAULT}'}"
+HDF_PATH ??= "${@d.getVarFlag('HDF_PATH', d.getVar('HDF_MACHINE') or 
'undefined') or '${HDF_PATH_DEFAULT}'}"
+BRANCHARG ??= "${@d.getVarFlag('BRANCHARG', d.getVar('HDF_MACHINE') or 
'undefined') or '${BRANCHARG_DEFAULT}'}"
 
 # ac701-microblazeel
 HDF_BASE[ac701-microblazeel] = 'https://'
diff --git a/recipes-bsp/imgrcry/imgrcry-make_2023.1.bb 
b/recipes-bsp/imgrcry/imgrcry-make_2023.1.bb
index bf0ef0f..962ca58 100644
--- a/recipes-bsp/imgrcry/imgrcry-make_2023.1.bb
+++ b/recipes-bsp/imgrcry/imgrcry-make_2023.1.bb
@@ -6,7 +6,7 @@ PROVIDES = "virtual/imgrcry"
 RCONFLICTS:${PN} = "imgrcry"
 DEPENDS += "bootgen-native fsbl-firmware"
 
-inherit deploy xlnx-embeddedsw xsctbase
+inherit check_xsct_enabled deploy xlnx-embeddedsw xsctbase
 
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:kria = "${MACHINE}"
diff --git a/recipes-bsp/imgrcry/imgrcry-make_2023.2.bb 
b/recipes-bsp/imgrcry/imgrcry-make_2023.2.bb
index f4c1b5f..cf23be4 100644
--- a/recipes-bsp/imgrcry/imgrcry-make_2023.2.bb
+++ b/recipes-bsp/imgrcry/imgrcry-make_2023.2.bb
@@ -3,7 +3,7 @@ PROVIDES = "virtual/imgrcry"
 RCONFLICTS:${PN} = "imgrcry"
 DEPENDS += "bootgen-native fsbl-firmware"
 
-inherit deploy xlnx-embeddedsw xsctbase image-artifact-names
+inherit check_xsct_enabled deploy xlnx-embeddedsw xsctbase image-artifact-names
 
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = 
"file://../../../../license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', 
d.getVar('BRANCH')) or '0'}"
diff --git a/recipes-bsp/imgrcry/imgrcry-make_2024.1.bb 
b/recipes-bsp/imgrcry/imgrcry-make_2024.1.bb
index f4c1b5f..cf23be4 100644
--- a/recipes-bsp/imgrcry/imgrcry-make_2024.1.bb
+++ b/recipes-bsp/imgrcry/imgrcry-make_2024.1.bb
@@ -3,7 +3,7 @@ PROVIDES = "virtual/imgrcry"
 RCONFLICTS:${PN} = "imgrcry"
 DEPENDS += "bootgen-native fsbl-firmware"
 
-inherit deploy xlnx-embeddedsw xsctbase image-artifact-names
+inherit check_xsct_enabled deploy xlnx-embeddedsw xsctbase image-artifact-names
 
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = 
"file://../../../../license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', 
d.getVar('BRANCH')) or '0'}"
diff --git a/recipes-bsp/imgrcry/imgrcry_git.bb 
b/recipes-bsp/imgrcry/imgrcry_git.bb
index 5d17817..a8e59e5 100644
--- a/recipes-bsp/imgrcry/imgrcry_git.bb
+++ b/recipes-bsp/imgrcry/imgrcry_git.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Image Recovery"
 S = "${UNPACKDIR}/git"
 PROVIDES = "virtual/imgrcry"
 DEPENDS += "bootgen-native fsbl-firmware"
-inherit xsctapp xsctyaml deploy
+inherit check_xsct_enabled xsctapp xsctyaml deploy
 
 
 COMPATIBLE_MACHINE = "^$"
diff --git a/recipes-bsp/imgsel/imgsel_git.bb b/recipes-bsp/imgsel/imgsel_git.bb
index 4571a25..ca88ec0 100644
--- a/recipes-bsp/imgsel/imgsel_git.bb
+++ b/recipes-bsp/imgsel/imgsel_git.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Image Selector"
 PROVIDES = "virtual/imgsel"
 DEPENDS += "bootgen-native"
 
-inherit xsctapp xsctyaml deploy
+inherit check_xsct_enabled xsctapp xsctyaml deploy
 
 PARALLEL_MAKE = "-j 1"
 
diff --git a/recipes-openamp/examples/openamp-fw.inc 
b/recipes-openamp/examples/openamp-fw.inc
index 681af0c..b34bc2d 100644
--- a/recipes-openamp/examples/openamp-fw.inc
+++ b/recipes-openamp/examples/openamp-fw.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "OpenAMP demo firmware"
 
 ESW_VER = "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or 
'${XILINX_XSCT_VERSION}'}"
 
-inherit xsctapp xsctyaml deploy
+inherit check_xsct_enabled xsctapp xsctyaml deploy
 
 LICENSE = "BSD-3-Clause"
 
diff --git a/recipes-utils/mb-realoc/mb-realoc.bb 
b/recipes-utils/mb-realoc/mb-realoc.bb
index 23a8a9d..4e99f72 100644
--- a/recipes-utils/mb-realoc/mb-realoc.bb
+++ b/recipes-utils/mb-realoc/mb-realoc.bb
@@ -4,7 +4,7 @@ LICENSE = "CLOSED"
 
 PROVIDES = "virtual/elfrealloc"
 
-inherit deploy
+inherit check_xsct_enabled deploy
 
 FILESEXTRAPATHS:append := ":${XLNX_SCRIPTS_DIR}"
 SRC_URI:append = " file://mb-realoc"
diff --git a/recipes-utils/xsct/xsct-native.bb 
b/recipes-utils/xsct/xsct-native.bb
index 71000ac..93917fe 100644
--- a/recipes-utils/xsct/xsct-native.bb
+++ b/recipes-utils/xsct/xsct-native.bb
@@ -8,10 +8,14 @@ INHIBIT_DEFAULT_DEPS = "1"
 
 BB_STRICT_CHECKSUM = "${VALIDATE_XSCT_CHECKSUM}"
 
+# Set defaults for parsing without XSCT enabled.
+XSCT_URL ??= "https://undefined/undefined";
+XSCT_TARBALL ??= "undefined"
+
 SRC_URI = "${XSCT_URL};downloadfilename=${XSCT_TARBALL}"
 SRC_URI[sha256sum] = "${XSCT_CHECKSUM}"
 
-inherit native
+inherit check_xsct_enabled native
 
 S = "${UNPACKDIR}/Vitis"
 B = "${S}"
diff --git a/scripts/hdf-repository-generate-srcuri.sh 
b/scripts/hdf-repository-generate-srcuri.sh
index 12f0a48..90b78fb 100755
--- a/scripts/hdf-repository-generate-srcuri.sh
+++ b/scripts/hdf-repository-generate-srcuri.sh
@@ -69,9 +69,9 @@ echo "# fall back to the original default if necessary"
 echo "HDF_BASE_DEFAULT := '\${HDF_BASE}'"
 echo "HDF_PATH_DEFAULT := '\${HDF_PATH}'"
 echo "BRANCHARG_DEFAULT := '\${BRANCHARG}'"
-echo "HDF_BASE ??= \"\${@d.getVarFlag('HDF_BASE', d.getVar('HDF_MACHINE')) or 
'\${HDF_BASE_DEFAULT}'}\""
-echo "HDF_PATH ??= \"\${@d.getVarFlag('HDF_PATH', d.getVar('HDF_MACHINE')) or 
'\${HDF_PATH_DEFAULT}'}\""
-echo "BRANCHARG ??= \"\${@d.getVarFlag('BRANCHARG', d.getVar('HDF_MACHINE')) 
or '\${BRANCHARG_DEFAULT}'}\""
+echo "HDF_BASE ??= \"\${@d.getVarFlag('HDF_BASE', d.getVar('HDF_MACHINE') or 
'undefined') or '\${HDF_BASE_DEFAULT}'}\""
+echo "HDF_PATH ??= \"\${@d.getVarFlag('HDF_PATH', d.getVar('HDF_MACHINE') or 
'undefined') or '\${HDF_PATH_DEFAULT}'}\""
+echo "BRANCHARG ??= \"\${@d.getVarFlag('BRANCHARG', d.getVar('HDF_MACHINE') or 
'undefined') or '\${BRANCHARG_DEFAULT}'}\""
 
 # Downloaded but not used
 README="README.md"
-- 
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5414): 
https://lists.yoctoproject.org/g/meta-xilinx/message/5414
Mute This Topic: https://lists.yoctoproject.org/mt/106610005/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to