diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/classes/image_types_wic.bbclass | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image_types_wic.bbclass')
-rw-r--r-- | meta/classes/image_types_wic.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index 49be1da77a..2f1a0b709c 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass | |||
@@ -26,7 +26,7 @@ def wks_search(files, search_path): | |||
26 | 26 | ||
27 | WIC_CREATE_EXTRA_ARGS ?= "" | 27 | WIC_CREATE_EXTRA_ARGS ?= "" |
28 | 28 | ||
29 | IMAGE_CMD_wic () { | 29 | IMAGE_CMD:wic () { |
30 | out="${IMGDEPLOYDIR}/${IMAGE_NAME}" | 30 | out="${IMGDEPLOYDIR}/${IMAGE_NAME}" |
31 | build_wic="${WORKDIR}/build-wic" | 31 | build_wic="${WORKDIR}/build-wic" |
32 | tmp_wic="${WORKDIR}/tmp-wic" | 32 | tmp_wic="${WORKDIR}/tmp-wic" |
@@ -42,7 +42,7 @@ IMAGE_CMD_wic () { | |||
42 | BUILDDIR="${TOPDIR}" PSEUDO_UNLOAD=1 wic create "$wks" --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" -o "$build_wic/" -w "$tmp_wic" ${WIC_CREATE_EXTRA_ARGS} | 42 | BUILDDIR="${TOPDIR}" PSEUDO_UNLOAD=1 wic create "$wks" --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" -o "$build_wic/" -w "$tmp_wic" ${WIC_CREATE_EXTRA_ARGS} |
43 | mv "$build_wic/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" | 43 | mv "$build_wic/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" |
44 | } | 44 | } |
45 | IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES TOPDIR" | 45 | IMAGE_CMD:wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES TOPDIR" |
46 | do_image_wic[cleandirs] = "${WORKDIR}/build-wic" | 46 | do_image_wic[cleandirs] = "${WORKDIR}/build-wic" |
47 | 47 | ||
48 | PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/build-wic" | 48 | PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/build-wic" |
@@ -60,9 +60,9 @@ do_image_wic[deptask] += "do_image_complete" | |||
60 | WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}' | 60 | WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}' |
61 | WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" | 61 | WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" |
62 | WKS_FILE_DEPENDS_BOOTLOADERS = "" | 62 | WKS_FILE_DEPENDS_BOOTLOADERS = "" |
63 | WKS_FILE_DEPENDS_BOOTLOADERS_x86 = "syslinux grub-efi systemd-boot" | 63 | WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot" |
64 | WKS_FILE_DEPENDS_BOOTLOADERS_x86-64 = "syslinux grub-efi systemd-boot" | 64 | WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux grub-efi systemd-boot" |
65 | WKS_FILE_DEPENDS_BOOTLOADERS_x86-x32 = "syslinux grub-efi" | 65 | WKS_FILE_DEPENDS_BOOTLOADERS:x86-x32 = "syslinux grub-efi" |
66 | 66 | ||
67 | WKS_FILE_DEPENDS ??= "${WKS_FILE_DEPENDS_DEFAULT} ${WKS_FILE_DEPENDS_BOOTLOADERS}" | 67 | WKS_FILE_DEPENDS ??= "${WKS_FILE_DEPENDS_DEFAULT} ${WKS_FILE_DEPENDS_BOOTLOADERS}" |
68 | 68 | ||