summaryrefslogtreecommitdiffstats
path: root/meta/classes-recipe
diff options
context:
space:
mode:
authorJoshua Watt <JPEWhacker@gmail.com>2024-07-03 07:59:20 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-07-13 23:28:31 +0100
commit26038959319c0b8b3098afdc5d39a4ddfb31a500 (patch)
treeab00f483d60a3ad855f561d74161c71cbba071bf /meta/classes-recipe
parent69d7d74ac91f841db9ed4285b09c79fbcf1c133c (diff)
downloadpoky-26038959319c0b8b3098afdc5d39a4ddfb31a500.tar.gz
classes-recipe/image_types: Add SPDX_IMAGE_PURPOSE to images
Adds the variable overrides to set the SPDX image purpose for various image types (From OE-Core rev: e1a8f59462d88c92dfdb3632ca95ded094c9472a) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe')
-rw-r--r--meta/classes-recipe/image_types.bbclass2
-rw-r--r--meta/classes-recipe/image_types_wic.bbclass1
2 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass
index 2f948ecbf8..506b9934cb 100644
--- a/meta/classes-recipe/image_types.bbclass
+++ b/meta/classes-recipe/image_types.bbclass
@@ -146,6 +146,7 @@ IMAGE_CMD:vfat = "oe_mkvfatfs ${EXTRA_IMAGECMD}"
146IMAGE_CMD_TAR ?= "tar" 146IMAGE_CMD_TAR ?= "tar"
147# ignore return code 1 "file changed as we read it" as other tasks(e.g. do_image_wic) may be hardlinking rootfs 147# ignore return code 1 "file changed as we read it" as other tasks(e.g. do_image_wic) may be hardlinking rootfs
148IMAGE_CMD:tar = "${IMAGE_CMD_TAR} --sort=name --format=posix --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}.tar -C ${IMAGE_ROOTFS} . || [ $? -eq 1 ]" 148IMAGE_CMD:tar = "${IMAGE_CMD_TAR} --sort=name --format=posix --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}.tar -C ${IMAGE_ROOTFS} . || [ $? -eq 1 ]"
149SPDX_IMAGE_PURPOSE:tar = "archive"
149 150
150do_image_cpio[cleandirs] += "${WORKDIR}/cpio_append" 151do_image_cpio[cleandirs] += "${WORKDIR}/cpio_append"
151IMAGE_CMD:cpio () { 152IMAGE_CMD:cpio () {
@@ -167,6 +168,7 @@ IMAGE_CMD:cpio () {
167 fi 168 fi
168 fi 169 fi
169} 170}
171SPDX_IMAGE_PURPOSE:cpio = "archive"
170 172
171UBI_VOLNAME ?= "${MACHINE}-rootfs" 173UBI_VOLNAME ?= "${MACHINE}-rootfs"
172UBI_VOLTYPE ?= "dynamic" 174UBI_VOLTYPE ?= "dynamic"
diff --git a/meta/classes-recipe/image_types_wic.bbclass b/meta/classes-recipe/image_types_wic.bbclass
index cf3be909b3..86f40633eb 100644
--- a/meta/classes-recipe/image_types_wic.bbclass
+++ b/meta/classes-recipe/image_types_wic.bbclass
@@ -91,6 +91,7 @@ IMAGE_CMD:wic () {
91 mv "$build_wic/$(basename "${wks%.wks}")"*.${IMAGER} "$out.wic" 91 mv "$build_wic/$(basename "${wks%.wks}")"*.${IMAGER} "$out.wic"
92} 92}
93IMAGE_CMD:wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES TOPDIR" 93IMAGE_CMD:wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES TOPDIR"
94SPDX_IMAGE_PURPOSE:wic = "diskImage"
94do_image_wic[cleandirs] = "${WORKDIR}/build-wic" 95do_image_wic[cleandirs] = "${WORKDIR}/build-wic"
95 96
96PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/build-wic" 97PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/build-wic"