From fd9e78919a064a927a3dbc8de204d74fe8559066 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 14 Aug 2021 13:16:35 +0200 Subject: layer: convert to new override syntax This is the result of automated script (0.9.3) conversion: +# meta-toradex-distro +vars = vars + ["preempt-rt","tdx","upstream"] +# meta-toradex-* machines +vars = vars + ["apalis-","colibri-","verdin-","tegra124"] +# meta-freescale +vars = vars + ["imx","mx6","mx7","mx8","use-mainline-bsp","use-nxp-bsp"] ../openembedded-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Max Krummenacher --- classes/image_type_tezi.bbclass | 30 ++++++++++++++--------------- classes/toradex-devicetree.bbclass | 8 ++++---- classes/toradex-kernel-config.bbclass | 2 +- classes/toradex-kernel-localversion.bbclass | 2 +- classes/toradex-u-boot-localversion.bbclass | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'classes') diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index ca73768..b6d7017 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -5,12 +5,12 @@ # Since it also generates the image.json description file it is rather # interwind with the boot flow which is U-Boot target specific. -WKS_FILE_DEPENDS_append = " tezi-metadata virtual/dtb" +WKS_FILE_DEPENDS:append = " tezi-metadata virtual/dtb" DEPENDS += "${WKS_FILE_DEPENDS}" IMAGE_BOOT_FILES_REMOVE = "${@make_dtb_boot_files(d) if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else ''}" -IMAGE_BOOT_FILES_REMOVE_apalis-tk1 = "${@ d.getVar('KERNEL_DEVICETREE') if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else ''}" -IMAGE_BOOT_FILES_append = " overlays.txt ${@'' if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else 'overlays/*;overlays/'}" -IMAGE_BOOT_FILES_remove = "${IMAGE_BOOT_FILES_REMOVE}" +IMAGE_BOOT_FILES_REMOVE:apalis-tk1 = "${@ d.getVar('KERNEL_DEVICETREE') if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else ''}" +IMAGE_BOOT_FILES:append = " overlays.txt ${@'' if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else 'overlays/*;overlays/'}" +IMAGE_BOOT_FILES:remove = "${IMAGE_BOOT_FILES_REMOVE}" RM_WORK_EXCLUDE += "${PN}" @@ -20,9 +20,9 @@ TDX_MATRIX_BUILD_TIME ??= "${DATETIME}" TDX_MATRIX_BUILD_TIME[vardepsexclude] = "DATETIME" EMMCDEV = "mmcblk0" -EMMCDEV_verdin-imx8mp = "emmc" +EMMCDEV:verdin-imx8mp = "emmc" EMMCDEVBOOT0 = "mmcblk0boot0" -EMMCDEVBOOT0_verdin-imx8mp = "emmc-boot0" +EMMCDEVBOOT0:verdin-imx8mp = "emmc-boot0" TEZI_VERSION ?= "${DISTRO_VERSION}" TEZI_DATE ?= "${TDX_MATRIX_BUILD_TIME}" TEZI_IMAGE_NAME ?= "${IMAGE_NAME}" @@ -35,7 +35,7 @@ TEZI_AUTO_INSTALL ??= "false" TEZI_BOOT_SUFFIX ??= "${@'bootfs.tar.xz' if oe.types.boolean('${TEZI_USE_BOOTFILES}') else ''}" TEZI_CONFIG_FORMAT ??= "2" # Require newer Tezi for mx8 Socs with the u-boot environment bugfix -TEZI_CONFIG_FORMAT_mx8 ??= "4" +TEZI_CONFIG_FORMAT:mx8 ??= "4" TORADEX_FLASH_TYPE ??= "emmc" UBOOT_BINARY_TEZI_EMMC ?= "${UBOOT_BINARY}" UBOOT_BINARY_TEZI_RAWNAND ?= "${UBOOT_BINARY}" @@ -45,7 +45,7 @@ UBOOT_ENV_TEZI_RAWNAND ?= "${UBOOT_ENV_TEZI}" # use DISTRO_FLAVOUR to append to the image name displayed in TEZI DISTRO_FLAVOUR ??= "" -SUMMARY_append = "${DISTRO_FLAVOUR}" +SUMMARY:append = "${DISTRO_FLAVOUR}" TEZI_EULA_URL ?= "https://www.nxp.com/docs/en/disclaimer/LA_OPT_NXP_SW.html" export TEZI_EULA_URL @@ -53,10 +53,10 @@ export TEZI_EULA_URL # Append tar command to store uncompressed image size to ${T}. # If a custom rootfs type is used make sure this file is created # before compression. -IMAGE_CMD_tar_append = "; du -ks ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar | cut -f 1 > ${T}/image-size${IMAGE_NAME_SUFFIX}" -CONVERSION_CMD_tar_append = "; du -ks ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar | cut -f 1 > ${T}/image-size.${type}" -CONVERSION_CMD_tar = "touch ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}; ${IMAGE_CMD_TAR} --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar -C ${TAR_IMAGE_ROOTFS} . || [ $? -eq 1 ]" -CONVERSIONTYPES_append = " tar" +IMAGE_CMD:tar:append = "; du -ks ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar | cut -f 1 > ${T}/image-size${IMAGE_NAME_SUFFIX}" +CONVERSION_CMD:tar:append = "; du -ks ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar | cut -f 1 > ${T}/image-size.${type}" +CONVERSION_CMD:tar = "touch ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}; ${IMAGE_CMD_TAR} --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar -C ${TAR_IMAGE_ROOTFS} . || [ $? -eq 1 ]" +CONVERSIONTYPES:append = " tar" def get_uncompressed_size(d, type): path = os.path.join(d.getVar('T'), "image-size.%s" % type) @@ -363,15 +363,15 @@ tezi_deploy_bootfs_files[cleandirs] += "${WORKDIR}/bootfs" tezi_deploy_bootfs_files[vardeps] += "IMAGE_BOOT_FILES" TAR_IMAGE_ROOTFS_task-image-bootfs = "${WORKDIR}/bootfs" -IMAGE_CMD_bootfs () { +IMAGE_CMD:bootfs () { : } TEZI_IMAGE_BOOTFS_PREFUNCS ??= "tezi_deploy_bootfs_files" do_image_bootfs[prefuncs] += "${TEZI_IMAGE_BOOTFS_PREFUNCS}" TEZI_IMAGE_TEZIIMG_PREFUNCS ??= "rootfs_tezi_run_json" -IMAGE_TYPEDEP_teziimg += "${TEZI_BOOT_SUFFIX} ${TEZI_ROOT_SUFFIX}" -IMAGE_CMD_teziimg () { +IMAGE_TYPEDEP:teziimg += "${TEZI_BOOT_SUFFIX} ${TEZI_ROOT_SUFFIX}" +IMAGE_CMD:teziimg () { bbnote "Create Toradex Easy Installer tarball" # Copy image json file to ${WORKDIR}/image-json diff --git a/classes/toradex-devicetree.bbclass b/classes/toradex-devicetree.bbclass index 4deb850..4cb30e9 100644 --- a/classes/toradex-devicetree.bbclass +++ b/classes/toradex-devicetree.bbclass @@ -41,9 +41,9 @@ DT_FILES_PATH = "${WORKDIR}/machine-overlays" # The machine specific recipes start with MACHINE_PREFIX}[_-] MACHINE_PREFIX = "${MACHINE}" -MACHINE_PREFIX_colibri-imx7-emmc = "colibri-imx7" -MACHINE_PREFIX_apalis-imx8x-v11a = "apalis-imx8x" -MACHINE_PREFIX_colibri-imx8x-v10b = "colibri-imx8x" +MACHINE_PREFIX:colibri-imx7-emmc = "colibri-imx7" +MACHINE_PREFIX:apalis-imx8x-v11a = "apalis-imx8x" +MACHINE_PREFIX:colibri-imx8x-v10b = "colibri-imx8x" do_collect_overlays () { if [ -z "${TEZI_EXTERNAL_KERNEL_DEVICETREE}" ] ; then @@ -67,7 +67,7 @@ do_collect_overlays[cleandirs] = "${DT_FILES_PATH}" addtask collect_overlays after do_patch before do_configure -do_deploy_append () { +do_deploy:append () { install -d ${DEPLOYDIR}/overlays if [ -d ${DEPLOYDIR}/devicetree ]; then cp ${DEPLOYDIR}/devicetree/* ${DEPLOYDIR}/overlays diff --git a/classes/toradex-kernel-config.bbclass b/classes/toradex-kernel-config.bbclass index 8c3ad71..9c0cd32 100644 --- a/classes/toradex-kernel-config.bbclass +++ b/classes/toradex-kernel-config.bbclass @@ -1,5 +1,5 @@ # Assign a config variable in ${B}/.config. -# Should be called in do_configure_append only. +# Should be called in do_configure:append only. # # $1 - config variable to be set # $2 - value [n/y/value] diff --git a/classes/toradex-kernel-localversion.bbclass b/classes/toradex-kernel-localversion.bbclass index 319ba96..a60b3a6 100644 --- a/classes/toradex-kernel-localversion.bbclass +++ b/classes/toradex-kernel-localversion.bbclass @@ -16,7 +16,7 @@ TDX_VERSION ??= "0" SCMVERSION ??= "y" LOCALVERSION ?= "-${TDX_VERSION}" -kernel_do_configure_append() { +kernel_do_configure:append() { kernel_configure_variable LOCALVERSION "\"${LOCALVERSION}\"" if [ "${SCMVERSION}" = "y" ]; then diff --git a/classes/toradex-u-boot-localversion.bbclass b/classes/toradex-u-boot-localversion.bbclass index 3ad86db..844cb0e 100644 --- a/classes/toradex-u-boot-localversion.bbclass +++ b/classes/toradex-u-boot-localversion.bbclass @@ -17,7 +17,7 @@ LOCALVERSION ??= "-${TDX_VERSION}" UBOOT_LOCALVERSION = "${LOCALVERSION}" -do_compile_prepend() { +do_compile:prepend() { if [ "${SCMVERSION}" = "y" ]; then head=`cd ${S} ; git rev-parse --verify --short=12 HEAD 2> /dev/null` printf "%s+git.%s" "${UBOOT_LOCALVERSION}" $head > ${S}/.scmversion -- cgit v1.2.3