From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7128378901610364928 X-Received: by 2002:a63:5f8c:0:b0:41c:5f9f:9ab9 with SMTP id t134-20020a635f8c000000b0041c5f9f9ab9mr5761324pgb.579.1659705066060; Fri, 05 Aug 2022 06:11:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:3b43:b0:1f5:35a6:600a with SMTP id t3-20020a17090a3b4300b001f535a6600als5535203pjf.3.-pod-canary-gmail; Fri, 05 Aug 2022 06:11:04 -0700 (PDT) X-Google-Smtp-Source: AA6agR49HEPUpw4tpZ4a959Z7hr7dCfHtNIh+Pdm/P5B/uwGQDLTpsdLnewvbZQmfeR2HOeP02JC X-Received: by 2002:a17:90b:30d4:b0:1f3:bfa:4c88 with SMTP id hi20-20020a17090b30d400b001f30bfa4c88mr7656600pjb.53.1659705064618; Fri, 05 Aug 2022 06:11:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659705064; cv=none; d=google.com; s=arc-20160816; b=ek+dA0kvL02tSeUh5tkt2OJn9rpmpWqd7jaEzGQqdtuvvbXwgii5mWOKQb+h1qVvng DIGrdudpgxm0riIwsEhOobI+7Hh8sPSiOP/Rxd02atr4eg/gcBfYhj93GldJ0VfRQBqc yqxaFqH50m0Qz9W7cSpeFOUD7ihiDakflVU0w5uDvltX6ormLbsrZmsUf/fyU8noDBVE AAOfcrsPNt5AFvf6c2koOqYnzGbpxXgS8uNrme+PY42rSVAAhaS7dLA7Hg4e87hvl/ux lb+D7XWNqMS9/Fr5Kpe1v0mPymkJjWNLg8hh1YmtCHb+ImU3QLI11cNMmHxzBoOHIWO3 qowg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=oPjloKF/IgUfvrntm3lZ3OeaZ7PiRwqjqn+6pbSYHUw=; b=lZ1ckTrWa3/gjGmG/MC1vKruAFebz558ttaxbhJdlWVNTQScMKLitfKklvzBbo1NTK oqcux2hRkKtmlb0jzg3GyKa4C33izwe3QXHEYH+hipYodeCUp6cXGiDZKNGt6VtfG770 0pVac2Zjjdet/h+7H+RiwOnj93G91Pvx30PbYDjMZtsjknbfDUJpyLnDECN16Zo3YbMg a4eDo5cv9kgXQ/hAlh+J+dMdvB9bMmZiH4xIACGL5icGmIqNqgbYoyVX9D50SLSL+M+i eTWyfzsVBtgdNOTBF/TZwFhTQezBeCiUcuC6kShV9wQbf9PzdfuZRJiSAGawT0oJFhcR 7SCA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id b29-20020a63931d000000b0041c3351d9aasi87692pge.1.2022.08.05.06.11.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Aug 2022 06:11:04 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from alena-nb.promwad.com (mm-183-76-214-37.mgts.dynamic.pppoe.byfly.by [37.214.76.183] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 275DAhHv009685 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 5 Aug 2022 15:11:01 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 11/21] meta: update overrides syntax Date: Fri, 5 Aug 2022 16:10:25 +0300 Message-Id: <20220805131035.22844-12-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220805131035.22844-1-amikan@ilbers.de> References: <20220805131035.22844-1-amikan@ilbers.de> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: Ff4R7P1iYf4E This is the result of scripts/contrib/convert-overrides.py run. Signed-off-by: Anton Mikanovich --- meta-isar/classes/rpi-sdimg.bbclass | 4 +- meta-isar/classes/ubi-ubifs-img.bbclass | 6 +-- meta-isar/conf/distro/raspios-bullseye.conf | 8 +-- meta-isar/conf/distro/ubuntu-focal.conf | 4 +- meta-isar/conf/machine/de0-nano-soc.conf | 4 +- meta-isar/conf/machine/hikey.conf | 2 +- meta-isar/conf/machine/phyboard-mira.conf | 2 +- meta-isar/conf/machine/qemuamd64.conf | 6 +-- meta-isar/conf/machine/qemuarm64.conf | 2 +- meta-isar/conf/machine/qemuriscv64.conf | 2 +- meta-isar/conf/machine/stm32mp15x.conf | 4 +- .../conf/multiconfig/qemuamd64-bullseye.conf | 2 +- .../conf/multiconfig/qemuarm-bookworm.conf | 2 +- .../recipes-app/hello-isar/hello-isar.bb | 2 +- meta-isar/recipes-app/libhello/libhello.bb | 2 +- .../bootconfig-rpi/bootconfig-rpi.bb | 6 +-- .../optee-os/optee-os-stm32mp15x_3.11.0.bb | 2 +- .../linux/linux-cip_4.4.166-cip29.bb | 2 +- .../linux/linux-mainline_5.4.70.bb | 4 +- .../linux/linux-phy_5.10.76-phy4.bb | 2 +- meta/classes/dpkg-base.bbclass | 4 +- meta/classes/dpkg-gbp.bbclass | 2 +- meta/classes/dpkg-prebuilt.bbclass | 2 +- meta/classes/dpkg.bbclass | 2 +- meta/classes/image.bbclass | 34 ++++++------ meta/classes/imagetypes.bbclass | 54 +++++++++---------- meta/classes/imagetypes_container.bbclass | 4 +- meta/classes/imagetypes_vm.bbclass | 10 ++-- meta/classes/imagetypes_wic.bbclass | 4 +- meta/classes/rootfs.bbclass | 2 +- meta/classes/sdk.bbclass | 32 +++++------ meta/conf/bitbake.conf | 18 +++---- meta/conf/distro/debian-common.conf | 16 +++--- meta/conf/distro/debian-stretch.conf | 4 +- meta/lib/oe/sstatesig.py | 2 +- meta/recipes-bsp/barebox/barebox.inc | 2 +- meta/recipes-bsp/optee-os/optee-os-custom.inc | 2 +- .../trusted-firmware-a-custom.inc | 2 +- meta/recipes-bsp/u-boot/u-boot-custom.inc | 2 +- .../isar-bootstrap/isar-bootstrap.inc | 12 ++--- .../buildchroot/buildchroot-host.bb | 2 +- .../buildchroot/buildchroot.inc | 6 +-- .../sbuild-chroot/sbuild-chroot.inc | 2 +- meta/recipes-kernel/kselftest/kselftest.inc | 2 +- meta/recipes-kernel/linux-module/module.inc | 2 +- meta/recipes-kernel/linux/linux-custom.inc | 10 ++-- 46 files changed, 151 insertions(+), 151 deletions(-) diff --git a/meta-isar/classes/rpi-sdimg.bbclass b/meta-isar/classes/rpi-sdimg.bbclass index 508c4bc..d8163a4 100644 --- a/meta-isar/classes/rpi-sdimg.bbclass +++ b/meta-isar/classes/rpi-sdimg.bbclass @@ -3,7 +3,7 @@ # # Based on SD class from meta-raspberrypi -IMAGE_TYPEDEP_rpi_sdimg = "wic" +IMAGE_TYPEDEP:rpi_sdimg = "wic" WKS_FILE ?= "rpi-sdimg" @@ -19,6 +19,6 @@ IMAGE_BOOT_FILES ?= "${IMAGE_ROOTFS}/boot/*.*;./ \ IMAGE_INSTALL += "bootconfig-${MACHINE}" -python do_wic_image_prepend() { +python do_wic_image:prepend() { bb.warn("rpi-sdimg image type is deprecated, please change to wic.") } diff --git a/meta-isar/classes/ubi-ubifs-img.bbclass b/meta-isar/classes/ubi-ubifs-img.bbclass index 7a917b4..2b412f9 100644 --- a/meta-isar/classes/ubi-ubifs-img.bbclass +++ b/meta-isar/classes/ubi-ubifs-img.bbclass @@ -5,10 +5,10 @@ # # SPDX-License-Identifier: MIT -IMAGE_TYPEDEP_ubi_ubifs = "ubi" -IMAGE_TYPEDEP_ubi += "ubifs fit" +IMAGE_TYPEDEP:ubi_ubifs = "ubi" +IMAGE_TYPEDEP:ubi += "ubifs fit" -IMAGE_CMD_ubi_ubifs() { +IMAGE_CMD:ubi_ubifs() { # we need to produce output (with extension .ubi-ubifs), # so just create a symlink ln -sf ${IMAGE_FULLNAME}.ubi ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.ubi-ubifs diff --git a/meta-isar/conf/distro/raspios-bullseye.conf b/meta-isar/conf/distro/raspios-bullseye.conf index 5e4a09c..6116b54 100644 --- a/meta-isar/conf/distro/raspios-bullseye.conf +++ b/meta-isar/conf/distro/raspios-bullseye.conf @@ -4,20 +4,20 @@ # Copyright (C) 2022 ilbers GmbH BASE_DISTRO = "raspios" -BASE_DISTRO_arm64 = "debian" +BASE_DISTRO:arm64 = "debian" BASE_DISTRO_CODENAME = "bullseye" HOST_DISTRO ?= "debian-bullseye" HOST_DISTRO_APT_SOURCES ?= "conf/distro/${HOST_DISTRO}.list" DISTRO_APT_SOURCES ?= "conf/distro/raspios-bullseye.list" -DISTRO_APT_SOURCES_arm64 ?= "conf/distro/raspios-bullseye-64.list" +DISTRO_APT_SOURCES:arm64 ?= "conf/distro/raspios-bullseye-64.list" DISTRO_BOOTSTRAP_KEYS = "http://raspbian.raspberrypi.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de" -DISTRO_BOOTSTRAP_KEYS_arm64 = "" +DISTRO_BOOTSTRAP_KEYS:arm64 = "" DISTRO_KERNELS ?= "kernel kernel7 kernel7l kernel8" THIRD_PARTY_APT_KEYS += "http://archive.raspberrypi.org/debian/raspberrypi.gpg.key;sha256sum=76603890d82a492175caf17aba68dc73acb1189c9fd58ec0c19145dfa3866d56" -COMPAT_DISTRO_ARCH_arm64 = "armhf" +COMPAT_DISTRO_ARCH:arm64 = "armhf" diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf index 4dfa201..a39db1b 100644 --- a/meta-isar/conf/distro/ubuntu-focal.conf +++ b/meta-isar/conf/distro/ubuntu-focal.conf @@ -8,8 +8,8 @@ require conf/distro/debian-common.conf BASE_DISTRO = "ubuntu" DISTRO_APT_SOURCES ?= "conf/distro/${DISTRO}.list" -DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${DISTRO}-ports.list" -HOST_DISTRO_APT_SOURCES_append_arm64 = " ${DISTRO_APT_SOURCES}" +DISTRO_APT_SOURCES:arm64 ?= "conf/distro/${DISTRO}-ports.list" +HOST_DISTRO_APT_SOURCES:append:arm64 = " ${DISTRO_APT_SOURCES}" BASE_DISTRO_CODENAME = "focal" diff --git a/meta-isar/conf/machine/de0-nano-soc.conf b/meta-isar/conf/machine/de0-nano-soc.conf index 55343e9..30d5800 100644 --- a/meta-isar/conf/machine/de0-nano-soc.conf +++ b/meta-isar/conf/machine/de0-nano-soc.conf @@ -8,8 +8,8 @@ DISTRO_ARCH ?= "armhf" KERNEL_NAME ?= "mainline" PREFERRED_PROVIDER_u-boot-de0-nano-soc = "u-boot-de0-nano-soc" -U_BOOT_CONFIG_de0-nano-soc = "socfpga_de0_nano_soc_defconfig" -U_BOOT_BIN_de0-nano-soc = "u-boot-with-spl.sfp" +U_BOOT_CONFIG:de0-nano-soc = "socfpga_de0_nano_soc_defconfig" +U_BOOT_BIN:de0-nano-soc = "u-boot-with-spl.sfp" IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "de0-nano-soc.wks.in" diff --git a/meta-isar/conf/machine/hikey.conf b/meta-isar/conf/machine/hikey.conf index 7f9cccb..a606992 100644 --- a/meta-isar/conf/machine/hikey.conf +++ b/meta-isar/conf/machine/hikey.conf @@ -11,4 +11,4 @@ IMAGE_FSTYPES = "wic" WKS_FILE ?= "hikey" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" -IMAGE_PREINSTALL_append = " firmware-ti-connectivity" +IMAGE_PREINSTALL:append = " firmware-ti-connectivity" diff --git a/meta-isar/conf/machine/phyboard-mira.conf b/meta-isar/conf/machine/phyboard-mira.conf index ac42084..82e6534 100644 --- a/meta-isar/conf/machine/phyboard-mira.conf +++ b/meta-isar/conf/machine/phyboard-mira.conf @@ -10,7 +10,7 @@ KERNEL_NAME ?= "phy" MACHINE_SERIAL ?= "ttymxc0" BAUDRATE_TTY ?= "115200" -IMAGE_TYPEDEP_ubi += "ubifs" +IMAGE_TYPEDEP:ubi += "ubifs" MKUBIFS_ARGS := "-m 0x800 -e 0x1f000 -c 8012" UBINIZE_ARGS = "-vv -m 0x800 -p 0x20000" diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index eca2628..9a9b6e9 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -4,14 +4,14 @@ DISTRO_ARCH ?= "amd64" KERNEL_NAME ?= "amd64" -KERNEL_NAME_ubuntu-focal ?= "generic" +KERNEL_NAME:ubuntu-focal ?= "generic" IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" -WKS_FILE_ubuntu-focal ?= "sdimage-efi-sd" -IMAGER_INSTALL_remove_ubuntu-focal = "${GRUB_BOOTLOADER_INSTALL}" +WKS_FILE:ubuntu-focal ?= "sdimage-efi-sd" +IMAGER_INSTALL:remove:ubuntu-focal = "${GRUB_BOOTLOADER_INSTALL}" IMAGE_INSTALL += "sshd-regen-keys" diff --git a/meta-isar/conf/machine/qemuarm64.conf b/meta-isar/conf/machine/qemuarm64.conf index b30fad4..718e20f 100644 --- a/meta-isar/conf/machine/qemuarm64.conf +++ b/meta-isar/conf/machine/qemuarm64.conf @@ -4,7 +4,7 @@ DISTRO_ARCH ?= "arm64" KERNEL_NAME ?= "arm64" -KERNEL_NAME_ubuntu-focal ?= "generic" +KERNEL_NAME:ubuntu-focal ?= "generic" IMAGE_FSTYPES ?= "ext4" diff --git a/meta-isar/conf/machine/qemuriscv64.conf b/meta-isar/conf/machine/qemuriscv64.conf index cd04d87..f7a7c8d 100644 --- a/meta-isar/conf/machine/qemuriscv64.conf +++ b/meta-isar/conf/machine/qemuriscv64.conf @@ -22,4 +22,4 @@ MACHINE_SERIAL ?= "ttyS0" BAUDRATE_TTY ?= "115200" # when enabled, rebuilding the initramfs fails with out-of-space error -IMAGE_INSTALL_remove = "enable-fsck" +IMAGE_INSTALL:remove = "enable-fsck" diff --git a/meta-isar/conf/machine/stm32mp15x.conf b/meta-isar/conf/machine/stm32mp15x.conf index 62de7dd..4fa4051 100644 --- a/meta-isar/conf/machine/stm32mp15x.conf +++ b/meta-isar/conf/machine/stm32mp15x.conf @@ -8,8 +8,8 @@ DISTRO_ARCH ?= "armhf" KERNEL_NAME ?= "mainline" PREFERRED_PROVIDER_u-boot-stm32mp15x = "u-boot-stm32mp15x" -U_BOOT_CONFIG_stm32mp15x = "stm32mp15_trusted_defconfig" -U_BOOT_BIN_stm32mp15x = "u-boot.stm32" +U_BOOT_CONFIG:stm32mp15x = "stm32mp15_trusted_defconfig" +U_BOOT_BIN:stm32mp15x = "u-boot.stm32" IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "stm32mp15x.wks.in" diff --git a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf index 13d870d..1c1326c 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf @@ -3,4 +3,4 @@ MACHINE ?= "qemuamd64" DISTRO ?= "debian-bullseye" -IMAGE_FSTYPES_append = " cpio.gz tar.gz" +IMAGE_FSTYPES:append = " cpio.gz tar.gz" diff --git a/meta-isar/conf/multiconfig/qemuarm-bookworm.conf b/meta-isar/conf/multiconfig/qemuarm-bookworm.conf index c82abf3..9b79499 100644 --- a/meta-isar/conf/multiconfig/qemuarm-bookworm.conf +++ b/meta-isar/conf/multiconfig/qemuarm-bookworm.conf @@ -3,7 +3,7 @@ MACHINE ?= "qemuarm" DISTRO ?= "debian-bookworm" -IMAGE_FSTYPES_append = " wic" +IMAGE_FSTYPES:append = " wic" WKS_FILE ?= "sdimage-efi-sd" IMAGE_PREINSTALL += "${SYSTEMD_BOOTLOADER_PREINSTALL}" diff --git a/meta-isar/recipes-app/hello-isar/hello-isar.bb b/meta-isar/recipes-app/hello-isar/hello-isar.bb index e2e6962..39ddecb 100644 --- a/meta-isar/recipes-app/hello-isar/hello-isar.bb +++ b/meta-isar/recipes-app/hello-isar/hello-isar.bb @@ -21,6 +21,6 @@ SRC_URI = " \ SRCREV = "a18c14cc11ce6b003f3469e89223cffb4016861d" # NOTE: This is just to test 32-bit building on 64-bit archs. -PACKAGE_ARCH_compat-arch = "${COMPAT_DISTRO_ARCH}" +PACKAGE_ARCH:compat-arch = "${COMPAT_DISTRO_ARCH}" inherit dpkg diff --git a/meta-isar/recipes-app/libhello/libhello.bb b/meta-isar/recipes-app/libhello/libhello.bb index 2ec7372..3770fdb 100644 --- a/meta-isar/recipes-app/libhello/libhello.bb +++ b/meta-isar/recipes-app/libhello/libhello.bb @@ -14,6 +14,6 @@ SRC_URI = "git://github.com/ilbers/libhello.git;protocol=https;branch=master;des SRCREV = "98f2e41e7d05ab8d19b0c5d160b104b725c8fd93" # NOTE: This is just to test 32-bit building on 64-bit archs. -PACKAGE_ARCH_compat-arch = "${COMPAT_DISTRO_ARCH}" +PACKAGE_ARCH:compat-arch = "${COMPAT_DISTRO_ARCH}" inherit dpkg diff --git a/meta-isar/recipes-bsp/bootconfig-rpi/bootconfig-rpi.bb b/meta-isar/recipes-bsp/bootconfig-rpi/bootconfig-rpi.bb index 648c728..9ca1287 100644 --- a/meta-isar/recipes-bsp/bootconfig-rpi/bootconfig-rpi.bb +++ b/meta-isar/recipes-bsp/bootconfig-rpi/bootconfig-rpi.bb @@ -13,9 +13,9 @@ TEMPLATE_VARS = "MACHINE_SERIAL BAUDRATE_TTY" TEMPLATE_FILES = "cmdline.txt.tmpl" # Exceptions for RPi1 -SRC_URI_append_rpi = " file://postinst" -SRC_URI_remove_rpi = "file://cmdline.txt.tmpl" -TEMPLATE_FILES_remove_rpi = "cmdline.txt.tmpl" +SRC_URI:append:rpi = " file://postinst" +SRC_URI:remove:rpi = "file://cmdline.txt.tmpl" +TEMPLATE_FILES:remove:rpi = "cmdline.txt.tmpl" PN = "bootconfig-${MACHINE}" diff --git a/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb b/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb index 8436dcb..08676be 100644 --- a/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb +++ b/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb @@ -20,7 +20,7 @@ OPTEE_BINARIES = "tee-header_v2.stm32 tee-pageable_v2.stm32 tee-pager_v2.stm32" # Set version manually to PV, the tarball does not contain any hint. # Alternative: pull from git and add git as build dependency. -dpkg_runbuild_prepend() { +dpkg_runbuild:prepend() { grep -q "^export TEE_IMPL_VERSION" ${S}/debian/rules || cat << EOF >> ${S}/debian/rules diff --git a/meta-isar/recipes-kernel/linux/linux-cip_4.4.166-cip29.bb b/meta-isar/recipes-kernel/linux/linux-cip_4.4.166-cip29.bb index b1a45df..4e8fc08 100644 --- a/meta-isar/recipes-kernel/linux/linux-cip_4.4.166-cip29.bb +++ b/meta-isar/recipes-kernel/linux/linux-cip_4.4.166-cip29.bb @@ -13,4 +13,4 @@ SRC_URI += " \ SRCREV = "af3adf9f9c633ac0e1d68487d7fad22285dda8a3" -KERNEL_DEFCONFIG_qemuamd64 = "x86_64_defconfig" +KERNEL_DEFCONFIG:qemuamd64 = "x86_64_defconfig" diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb b/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb index 644535e..a82a179 100644 --- a/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb +++ b/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb @@ -19,12 +19,12 @@ SRC_URI[sha256sum] = "c0b3d8085c5ba235df38b00b740e053659709e8a5ca21957a239f6bc22 S = "${WORKDIR}/linux-${ARCHIVE_VERSION}" -KERNEL_DEFCONFIG_qemuamd64 = "x86_64_defconfig" +KERNEL_DEFCONFIG:qemuamd64 = "x86_64_defconfig" LINUX_VERSION_EXTENSION = "-isar" # For testing purposes only -dpkg_configure_kernel_append() { +dpkg_configure_kernel:append() { grep -q "# CONFIG_MTD is not set" ${S}/debian/rules || cat << EOF | sed -i '/^override_dh_auto_build/ r /dev/stdin' ${S}/debian/rules if ! grep "# CONFIG_MTD is not set" \$(O)/.config && \\ diff --git a/meta-isar/recipes-kernel/linux/linux-phy_5.10.76-phy4.bb b/meta-isar/recipes-kernel/linux/linux-phy_5.10.76-phy4.bb index 84609a0..2a39141 100644 --- a/meta-isar/recipes-kernel/linux/linux-phy_5.10.76-phy4.bb +++ b/meta-isar/recipes-kernel/linux/linux-phy_5.10.76-phy4.bb @@ -7,7 +7,7 @@ SRC_URI[sha256sum] = "ce0cff708da9f3dca1f6f8d6c433589fd5a5ea8db9e33114f44497ecf8 S = "${WORKDIR}/linux-mainline-${PV}" -KBUILD_DEPENDS_append = "lzop" +KBUILD_DEPENDS:append = "lzop" KERNEL_DEFCONFIG = "imx_v6_v7_defconfig" diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 8158fd0..1166a54 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -13,7 +13,7 @@ inherit deb-dl-dir DEPENDS ?= "" -DEPENDS_append_riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE', True) == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}" +DEPENDS:append:riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE', True) == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}" DEB_BUILD_PROFILES ?= "" DEB_BUILD_OPTIONS ?= "" @@ -214,7 +214,7 @@ dpkg_undo_mounts() { sudo rmdir ${BUILDROOT} } -do_prepare_build_append() { +do_prepare_build:append() { # Make a local copy of isar-apt repo that is not affected by other parallel builds mkdir -p ${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH} rm -rf ${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/* diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass index 68172b3..f272ef9 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -13,7 +13,7 @@ GBP_EXTRA_OPTIONS ?= "--git-pristine-tar" SCHROOT_MOUNTS = "${WORKDIR}:${PP} ${GITDIR}:/home/.git-downloads" -dpkg_runbuild_prepend() { +dpkg_runbuild:prepend() { sh -c " cd ${WORKDIR}/${PPS} gbp buildpackage --git-ignore-new --git-builder=/bin/true ${GBP_EXTRA_OPTIONS} diff --git a/meta/classes/dpkg-prebuilt.bbclass b/meta/classes/dpkg-prebuilt.bbclass index 97e1e2d..c220690 100644 --- a/meta/classes/dpkg-prebuilt.bbclass +++ b/meta/classes/dpkg-prebuilt.bbclass @@ -5,7 +5,7 @@ inherit dpkg-base -python do_unpack_prepend() { +python do_unpack:prepend() { # enforce unpack=false src_uri = (d.getVar('SRC_URI', False) or '').split() if len(src_uri) == 0: diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 67b5aac..b2ed683 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -7,7 +7,7 @@ PACKAGE_ARCH ?= "${DISTRO_ARCH}" DPKG_PREBUILD_ENV_FILE="${WORKDIR}/dpkg_prebuild.env" -do_prepare_build_append() { +do_prepare_build:append() { env > ${DPKG_PREBUILD_ENV_FILE} } diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 59921c9..d60d733 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -86,7 +86,7 @@ ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" ROOTFS_DPKGSTATUS_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" ROOTFS_PACKAGE_SUFFIX ?= "${PN}-${DISTRO}-${MACHINE}" -ROOTFS_POSTPROCESS_COMMAND_prepend = "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', 'cache_deb_src', '', d)} " +ROOTFS_POSTPROCESS_COMMAND:prepend = "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', 'cache_deb_src', '', d)} " inherit rootfs inherit sdk @@ -136,7 +136,7 @@ def get_image_basetypes(d): # be backwards-compatible bt = bt[:-len('-img')] bb.warn("IMAGE_TYPE '{0}-img' is deprecated. Please use '{0}' instead.".format(bt)) - deps = (d.getVar('IMAGE_TYPEDEP_' + bt.replace('-', '_').replace('.', '_')) or '').split() + deps = (d.getVar('IMAGE_TYPEDEP:' + bt.replace('-', '_').replace('.', '_')) or '').split() ret = set([bt]) for dep in deps: ret |= recurse(dep) @@ -180,8 +180,8 @@ python() { if t not in basetypes[bt]: basetypes[bt].append(t) t_clean = t.replace('-', '_').replace('.', '_') - deps = (d.getVar('IMAGE_TYPEDEP_' + t_clean) or '').split() - vardeps.add('IMAGE_TYPEDEP_' + t_clean) + deps = (d.getVar('IMAGE_TYPEDEP:' + t_clean) or '').split() + vardeps.add('IMAGE_TYPEDEP:' + t_clean) if bt not in typedeps: typedeps[bt] = set() for dep in deps: @@ -213,7 +213,7 @@ python() { localdata.delVar('DATETIME') localdata.delVar('DATE') localdata.delVar('TMPDIR') - vardepsexclude = (d.getVarFlag('IMAGE_CMD_' + bt_clean, 'vardepsexclude', True) or '').split() + vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + bt_clean, 'vardepsexclude', True) or '').split() for dep in vardepsexclude: localdata.delVar(dep) @@ -223,30 +223,30 @@ python() { bb.fatal("IMAGE_TYPE '%s' requires these arguments: %s" % (image_type, ', '.join(required_args))) # imager install - for dep in (d.getVar('IMAGER_INSTALL_' + bt_clean) or '').split(): + for dep in (d.getVar('IMAGER_INSTALL:' + bt_clean) or '').split(): imager_install.add(dep) - for dep in (d.getVar('IMAGER_BUILD_DEPS_' + bt_clean) or '').split(): + for dep in (d.getVar('IMAGER_BUILD_DEPS:' + bt_clean) or '').split(): imager_build_deps.add(dep) # construct image command cmds.append('\timage_do_mounts') - image_cmd = localdata.getVar('IMAGE_CMD_' + bt_clean) + image_cmd = localdata.getVar('IMAGE_CMD:' + bt_clean) if image_cmd: localdata.setVar('type', bt) cmds.append(localdata.expand(image_cmd)) cmds.append(localdata.expand('\tsudo chown $(id -u):$(id -g) ${IMAGE_FILE_HOST}')) else: bb.fatal("No IMAGE_CMD for %s" % bt) - vardeps.add('IMAGE_CMD_' + bt_clean) - d.delVarFlag('IMAGE_CMD_' + bt_clean, 'func') - task_deps = d.getVarFlag('IMAGE_CMD_' + bt_clean, 'depends') + vardeps.add('IMAGE_CMD:' + bt_clean) + d.delVarFlag('IMAGE_CMD:' + bt_clean, 'func') + task_deps = d.getVarFlag('IMAGE_CMD:' + bt_clean, 'depends') - image_src = localdata.getVar('IMAGE_SRC_URI_' + bt_clean) + image_src = localdata.getVar('IMAGE_SRC_URI:' + bt_clean) if image_src: d.appendVar("SRC_URI", ' ' + image_src) - image_tmpl_files = localdata.getVar('IMAGE_TEMPLATE_FILES_' + bt_clean) - image_tmpl_vars = localdata.getVar('IMAGE_TEMPLATE_VARS_' + bt_clean) + image_tmpl_files = localdata.getVar('IMAGE_TEMPLATE_FILES:' + bt_clean) + image_tmpl_vars = localdata.getVar('IMAGE_TEMPLATE_VARS:' + bt_clean) if image_tmpl_files: d.appendVar("TEMPLATE_FILES", ' ' + image_tmpl_files) if image_tmpl_vars: @@ -261,12 +261,12 @@ python() { t = t[:-len(c) - 1] create_conversions(t) localdata.setVar('type', t) - cmd = '\t' + localdata.getVar('CONVERSION_CMD_' + c) + cmd = '\t' + localdata.getVar('CONVERSION_CMD:' + c) if cmd not in cmds: cmds.append(cmd) cmds.append(localdata.expand('\tsudo chown $(id -u):$(id -g) ${IMAGE_FILE_HOST}.%s' % c)) - vardeps.add('CONVERSION_CMD_' + c) - for dep in (localdata.getVar('CONVERSION_DEPS_' + c) or '').split(): + vardeps.add('CONVERSION_CMD:' + c) + for dep in (localdata.getVar('CONVERSION_DEPS:' + c) or '').split(): conversion_install.add(dep) # remove temporary image files if t not in image_types: diff --git a/meta/classes/imagetypes.bbclass b/meta/classes/imagetypes.bbclass index 1e8e223..f7df704 100644 --- a/meta/classes/imagetypes.bbclass +++ b/meta/classes/imagetypes.bbclass @@ -4,19 +4,19 @@ # SPDX-License-Identifier: MIT #image type: tar -IMAGER_INSTALL_tar = "tar" +IMAGER_INSTALL:tar = "tar" TAR_OPTIIONS ?= "" -IMAGE_CMD_tar() { +IMAGE_CMD:tar() { ${SUDO_CHROOT} tar ${TAR_OPTIONS} -cvSf \ ${IMAGE_FILE_CHROOT} --one-file-system -C ${PP_ROOTFS} . } # image type: ext4 -IMAGER_INSTALL_ext4 += "e2fsprogs" +IMAGER_INSTALL:ext4 += "e2fsprogs" MKE2FS_ARGS ?= "-t ext4" -IMAGE_CMD_ext4() { +IMAGE_CMD:ext4() { truncate -s ${ROOTFS_SIZE}K '${IMAGE_FILE_HOST}' ${SUDO_CHROOT} /sbin/mke2fs ${MKE2FS_ARGS} \ @@ -24,10 +24,10 @@ IMAGE_CMD_ext4() { } # image type: cpio -IMAGER_INSTALL_cpio += "cpio" +IMAGER_INSTALL:cpio += "cpio" CPIO_IMAGE_FORMAT ?= "newc" -IMAGE_CMD_cpio() { +IMAGE_CMD:cpio() { ${SUDO_CHROOT} \ sh -c "cd ${PP_ROOTFS}; /usr/bin/find . | \ /usr/bin/cpio -H ${CPIO_IMAGE_FORMAT} -o > \ @@ -37,16 +37,16 @@ IMAGE_CMD_cpio() { # image type: fit MKIMAGE_ARGS ??= "" FIT_IMAGE_SOURCE ??= "fitimage.its" -IMAGER_INSTALL_fit += "u-boot-tools device-tree-compiler" +IMAGER_INSTALL:fit += "u-boot-tools device-tree-compiler" -IMAGE_SRC_URI_fit = "file://${FIT_IMAGE_SOURCE}.tmpl" -IMAGE_TEMPLATE_FILES_fit = "${FIT_IMAGE_SOURCE}.tmpl" -IMAGE_TEMPLATE_VARS_fit = "KERNEL_IMG INITRD_IMG DTB_IMG" +IMAGE_SRC_URI:fit = "file://${FIT_IMAGE_SOURCE}.tmpl" +IMAGE_TEMPLATE_FILES:fit = "${FIT_IMAGE_SOURCE}.tmpl" +IMAGE_TEMPLATE_VARS:fit = "KERNEL_IMG INITRD_IMG DTB_IMG" # Default fit image deploy path (inside imager) FIT_IMG ?= "${PP_DEPLOY}/${IMAGE_FULLNAME}.fit" -IMAGE_CMD_fit() { +IMAGE_CMD:fit() { if [ ! -e "${WORKDIR}/${FIT_IMAGE_SOURCE}" ]; then die "FIT_IMAGE_SOURCE does not contain fitimage source file" fi @@ -54,11 +54,11 @@ IMAGE_CMD_fit() { ${SUDO_CHROOT} /usr/bin/mkimage ${MKIMAGE_ARGS} \ -f '${PP_WORK}/${FIT_IMAGE_SOURCE}' '${IMAGE_FILE_CHROOT}' } -IMAGE_CMD_fit[depends] = "${PN}:do_transform_template" +IMAGE_CMD:fit[depends] = "${PN}:do_transform_template" # image type: ubifs -IMAGER_INSTALL_ubifs += "mtd-utils" -IMAGE_CMD_REQUIRED_ARGS_ubifs = "MKUBIFS_ARGS" +IMAGER_INSTALL:ubifs += "mtd-utils" +IMAGE_CMD_REQUIRED_ARGS:ubifs = "MKUBIFS_ARGS" # Default UBIFS image deploy path (inside imager) UBIFS_IMG ?= "${PP_DEPLOY}/${IMAGE_FULLNAME}.ubifs" @@ -66,23 +66,23 @@ UBIFS_IMG ?= "${PP_DEPLOY}/${IMAGE_FULLNAME}.ubifs" # glibc bug 23960 https://sourceware.org/bugzilla/show_bug.cgi?id=23960 # should not use QEMU on armhf target with mkfs.ubifs < v2.1.3 THIS_ISAR_CROSS_COMPILE := "${ISAR_CROSS_COMPILE}" -ISAR_CROSS_COMPILE_armhf = "${@bb.utils.contains('IMAGE_BASETYPES', 'ubifs', '1', '${THIS_ISAR_CROSS_COMPILE}', d)}" +ISAR_CROSS_COMPILE:armhf = "${@bb.utils.contains('IMAGE_BASETYPES', 'ubifs', '1', '${THIS_ISAR_CROSS_COMPILE}', d)}" -IMAGE_CMD_ubifs() { +IMAGE_CMD:ubifs() { ${SUDO_CHROOT} /usr/sbin/mkfs.ubifs ${MKUBIFS_ARGS} \ -r '${PP_ROOTFS}' '${IMAGE_FILE_CHROOT}' } # image type: ubi -IMAGER_INSTALL_ubi += "mtd-utils" -IMAGE_CMD_REQUIRED_ARGS_ubi = "UBINIZE_ARGS" +IMAGER_INSTALL:ubi += "mtd-utils" +IMAGE_CMD_REQUIRED_ARGS:ubi = "UBINIZE_ARGS" UBINIZE_CFG ??= "ubinize.cfg" -IMAGE_SRC_URI_ubi = "file://${UBINIZE_CFG}.tmpl" -IMAGE_TEMPLATE_FILES_ubi = "${UBINIZE_CFG}.tmpl" -IMAGE_TEMPLATE_VARS_ubi = "KERNEL_IMG INITRD_IMG DTB_IMG UBIFS_IMG FIT_IMG" +IMAGE_SRC_URI:ubi = "file://${UBINIZE_CFG}.tmpl" +IMAGE_TEMPLATE_FILES:ubi = "${UBINIZE_CFG}.tmpl" +IMAGE_TEMPLATE_VARS:ubi = "KERNEL_IMG INITRD_IMG DTB_IMG UBIFS_IMG FIT_IMG" -IMAGE_CMD_ubi() { +IMAGE_CMD:ubi() { if [ ! -e "${WORKDIR}/${UBINIZE_CFG}" ]; then die "UBINIZE_CFG does not contain ubinize config file." fi @@ -90,18 +90,18 @@ IMAGE_CMD_ubi() { ${SUDO_CHROOT} /usr/sbin/ubinize ${UBINIZE_ARGS} \ -o '${IMAGE_FILE_CHROOT}' '${PP_WORK}/${UBINIZE_CFG}' } -IMAGE_CMD_ubi[depends] = "${PN}:do_transform_template" +IMAGE_CMD:ubi[depends] = "${PN}:do_transform_template" # image conversions IMAGE_CONVERSIONS = "gz xz" -CONVERSION_CMD_gz = "${SUDO_CHROOT} sh -c 'gzip -f -9 -n -c --rsyncable ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.gz'" -CONVERSION_DEPS_gz = "gzip" +CONVERSION_CMD:gz = "${SUDO_CHROOT} sh -c 'gzip -f -9 -n -c --rsyncable ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.gz'" +CONVERSION_DEPS:gz = "gzip" XZ_MEMLIMIT ?= "50%" XZ_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}" XZ_THREADS[vardepvalue] = "1" XZ_OPTIONS ?= "--memlimit=${XZ_MEMLIMIT} --threads=${XZ_THREADS}" XZ_OPTIONS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS" -CONVERSION_CMD_xz = "${SUDO_CHROOT} sh -c 'xz -c ${XZ_OPTIONS} ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.xz'" -CONVERSION_DEPS_xz = "xz-utils" +CONVERSION_CMD:xz = "${SUDO_CHROOT} sh -c 'xz -c ${XZ_OPTIONS} ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.xz'" +CONVERSION_DEPS:xz = "xz-utils" diff --git a/meta/classes/imagetypes_container.bbclass b/meta/classes/imagetypes_container.bbclass index ba09beb..8882ac5 100644 --- a/meta/classes/imagetypes_container.bbclass +++ b/meta/classes/imagetypes_container.bbclass @@ -17,8 +17,8 @@ python() { return for t in d.getVar('CONTAINER_TYPES').split(): t_clean = t.replace('-', '_').replace('.', '_') - d.setVar('IMAGE_CMD_' + t_clean, 'convert_container %s "${CONTAINER_IMAGE_NAME}" "${IMAGE_FILE_HOST}"' % t) - d.setVar('IMAGE_FULLNAME_' + t_clean, '${PN}-${DISTRO}-${DISTRO_ARCH}') + d.setVar('IMAGE_CMD:' + t_clean, 'convert_container %s "${CONTAINER_IMAGE_NAME}" "${IMAGE_FILE_HOST}"' % t) + d.setVar('IMAGE_FULLNAME:' + t_clean, '${PN}-${DISTRO}-${DISTRO_ARCH}') d.appendVarFlag('do_containerize', 'network', '1') bb.build.addtask('containerize', 'do_image_' + t_clean, 'do_image_tools', d) } diff --git a/meta/classes/imagetypes_vm.bbclass b/meta/classes/imagetypes_vm.bbclass index fb1284b..81ef866 100644 --- a/meta/classes/imagetypes_vm.bbclass +++ b/meta/classes/imagetypes_vm.bbclass @@ -8,12 +8,12 @@ inherit buildchroot USING_OVA = "${@bb.utils.contains('IMAGE_BASETYPES', 'ova', '1', '0', d)}" -FILESEXTRAPATHS_prepend := "${LAYERDIR_core}/classes/vm-img:" +FILESEXTRAPATHS:prepend := "${LAYERDIR_core}/classes/vm-img:" OVF_TEMPLATE_FILE ?= "vm-img-virtualbox.ovf.tmpl" SRC_URI += "${@'file://${OVF_TEMPLATE_FILE}' if d.getVar('USING_OVA') == '1' else ''}" -IMAGE_TYPEDEP_ova = "wic" -IMAGER_INSTALL_ova += "qemu-utils gawk uuid-runtime" +IMAGE_TYPEDEP:ova = "wic" +IMAGER_INSTALL:ova += "qemu-utils gawk uuid-runtime" # virtual machine disk settings SOURCE_IMAGE_FILE ?= "${IMAGE_FULLNAME}.wic" @@ -71,7 +71,7 @@ TEMPLATE_FILES += "${@'${OVF_TEMPLATE_FILE}' if d.getVar('USING_OVA') == '1' els TEMPLATE_VARS += "${OVA_VARS}" do_image_ova[prefuncs] += "convert_wic" -IMAGE_CMD_ova() { +IMAGE_CMD:ova() { if [ ! ${VIRTUAL_MACHINE_IMAGE_TYPE} = "vmdk" ]; then exit 0 fi @@ -102,4 +102,4 @@ IMAGE_CMD_ova() { tar -uvf ${PP_DEPLOY}/${OVA_NAME}.ova -C ${PP_DEPLOY} ${VIRTUAL_MACHINE_IMAGE_FILE} EOSUDO } -IMAGE_CMD_ova[depends] = "${PN}:do_transform_template" +IMAGE_CMD:ova[depends] = "${PN}:do_transform_template" diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass index dd2268f..50e9f1d 100644 --- a/meta/classes/imagetypes_wic.bbclass +++ b/meta/classes/imagetypes_wic.bbclass @@ -85,7 +85,7 @@ python () { inherit buildchroot -IMAGER_INSTALL_wic += "${WIC_IMAGER_INSTALL}" +IMAGER_INSTALL:wic += "${WIC_IMAGER_INSTALL}" # wic comes with reasonable defaults, and the proper interface is the wks file ROOTFS_EXTRA ?= "0" @@ -143,7 +143,7 @@ check_for_wic_warnings() { } do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" -IMAGE_CMD_wic() { +IMAGE_CMD:wic() { wic_do_mounts generate_wic_image check_for_wic_warnings diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index cd827bd..aeec56a 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -73,7 +73,7 @@ rootfs_do_qemu() { } BOOTSTRAP_SRC = "${DEPLOY_DIR_BOOTSTRAP}/${ROOTFS_DISTRO}-host_${DISTRO}-${DISTRO_ARCH}" -BOOTSTRAP_SRC_${ROOTFS_ARCH} = "${DEPLOY_DIR_BOOTSTRAP}/${ROOTFS_DISTRO}-${ROOTFS_ARCH}" +BOOTSTRAP_SRC:${ROOTFS_ARCH} = "${DEPLOY_DIR_BOOTSTRAP}/${ROOTFS_DISTRO}-${ROOTFS_ARCH}" rootfs_prepare[weight] = "25" rootfs_prepare(){ diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass index 32ee2de..09eecd8 100644 --- a/meta/classes/sdk.bbclass +++ b/meta/classes/sdk.bbclass @@ -42,44 +42,44 @@ SDK_PREINSTALL += " \ equivs" TOOLCHAIN = "${@'crossbuild-essential-${DISTRO_ARCH}' if d.getVar('ISAR_CROSS_COMPILE', True) == '1' else 'build-essential'}" -TOOLCHAIN_append_compat-arch = " crossbuild-essential-${COMPAT_DISTRO_ARCH}" +TOOLCHAIN:append:compat-arch = " crossbuild-essential-${COMPAT_DISTRO_ARCH}" # rootfs/image overrides for the SDK -ROOTFS_ARCH_class-sdk = "${HOST_ARCH}" -ROOTFS_DISTRO_class-sdk = "${HOST_DISTRO}" -ROOTFS_PACKAGES_class-sdk = "sdk-files ${TOOLCHAIN} ${SDK_PREINSTALL} ${SDK_INSTALL}" -ROOTFS_FEATURES_append_class-sdk = " clean-package-cache generate-manifest export-dpkg-status" -ROOTFS_MANIFEST_DEPLOY_DIR_class-sdk = "${DEPLOY_DIR_SDKCHROOT}" -ROOTFS_DPKGSTATUS_DEPLOY_DIR_class-sdk = "${DEPLOY_DIR_SDKCHROOT}" +ROOTFS_ARCH:class-sdk = "${HOST_ARCH}" +ROOTFS_DISTRO:class-sdk = "${HOST_DISTRO}" +ROOTFS_PACKAGES:class-sdk = "sdk-files ${TOOLCHAIN} ${SDK_PREINSTALL} ${SDK_INSTALL}" +ROOTFS_FEATURES:append:class-sdk = " clean-package-cache generate-manifest export-dpkg-status" +ROOTFS_MANIFEST_DEPLOY_DIR:class-sdk = "${DEPLOY_DIR_SDKCHROOT}" +ROOTFS_DPKGSTATUS_DEPLOY_DIR:class-sdk = "${DEPLOY_DIR_SDKCHROOT}" -IMAGE_FSTYPES_class-sdk = "${SDK_FORMATS}" +IMAGE_FSTYPES:class-sdk = "${SDK_FORMATS}" # bitbake dependencies SDKDEPENDS += "sdk-files ${SDK_INSTALL}" -SDKDEPENDS_append_riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE', True) == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}" -DEPENDS_class-sdk = "${SDKDEPENDS}" +SDKDEPENDS:append:riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE', True) == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}" +DEPENDS:class-sdk = "${SDKDEPENDS}" SDKROOTFSDEPENDS = "" -SDKROOTFSDEPENDS_class-sdk = "${BPN}:do_rootfs" +SDKROOTFSDEPENDS:class-sdk = "${BPN}:do_rootfs" do_rootfs_install[depends] += "${SDKROOTFSDEPENDS}" SDKROOTFSVARDEPS = "" -SDKROOTFSVARDEPS_class-sdk = "SDK_INCLUDE_ISAR_APT" +SDKROOTFSVARDEPS:class-sdk = "SDK_INCLUDE_ISAR_APT" do_rootfs_install[vardeps] += "${SDKROOTFSVARDEPS}" # additional SDK steps -ROOTFS_CONFIGURE_COMMAND_append_class-sdk = " ${@'rootfs_configure_isar_apt_dir' if d.getVar('SDK_INCLUDE_ISAR_APT') == '1' else ''}" +ROOTFS_CONFIGURE_COMMAND:append:class-sdk = " ${@'rootfs_configure_isar_apt_dir' if d.getVar('SDK_INCLUDE_ISAR_APT') == '1' else ''}" rootfs_configure_isar_apt_dir() { # Copy isar-apt instead of mounting: sudo cp -Trpfx ${REPO_ISAR_DIR}/${DISTRO} ${ROOTFSDIR}/isar-apt } -ROOTFS_POSTPROCESS_COMMAND_prepend_class-sdk = "sdkchroot_configscript " +ROOTFS_POSTPROCESS_COMMAND:prepend:class-sdk = "sdkchroot_configscript " sdkchroot_configscript () { sudo chroot ${ROOTFSDIR} /configscript.sh ${DISTRO_ARCH} } -ROOTFS_POSTPROCESS_COMMAND_append_class-sdk = " sdkchroot_finalize" +ROOTFS_POSTPROCESS_COMMAND:append:class-sdk = " sdkchroot_finalize" sdkchroot_finalize() { if [ "${SDK_INCLUDE_ISAR_APT}" = "0" ]; then # Remove isar-apt repo entry @@ -121,7 +121,7 @@ do_deploy_sdkchroot() { ln -Tfsr "${ROOTFSDIR}" "${SDKCHROOT_DIR}" } -CLEANFUNCS_class-sdk = "clean_deploy" +CLEANFUNCS:class-sdk = "clean_deploy" clean_deploy() { rm -f "${SDKCHROOT_DIR}" } diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 52a06e0..2de89e7 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -63,21 +63,21 @@ SCHROOT_TARGET_DIR = "${DEPLOY_DIR}/schroot-target/${DISTRO}-${DISTRO_ARCH}" SDKCHROOT_DIR = "${DEPLOY_DIR_SDKCHROOT}/${BPN}-${DISTRO}-${MACHINE}" CACHE = "${TMPDIR}/cache" KERNEL_FILE ?= "vmlinuz" -KERNEL_FILE_mipsel ?= "vmlinux" -KERNEL_FILE_riscv64 ?= "vmlinux" -KERNEL_FILE_arm64 ?= "vmlinux" +KERNEL_FILE:mipsel ?= "vmlinux" +KERNEL_FILE:riscv64 ?= "vmlinux" +KERNEL_FILE:arm64 ?= "vmlinux" OVERRIDES = "${DISTRO_ARCH}:${COMPAT_OVERRIDE}:${MACHINE}:${DISTRO}:forcevariable" FILESOVERRIDES = "${DISTRO_ARCH}:${MACHINE}" COMPAT_OVERRIDE = "${@'compat-arch' if d.getVar('ISAR_ENABLE_COMPAT_ARCH') == '1' else ''}" # Setting default QEMU_ARCH variables for different DISTRO_ARCH: -QEMU_ARCH_amd64 = "x86_64" -QEMU_ARCH_i386 = "i386" -QEMU_ARCH_armhf = "arm" -QEMU_ARCH_arm64 = "aarch64" -QEMU_ARCH_mipsel = "mipsel" -QEMU_ARCH_riscv64 = "riscv64" +QEMU_ARCH:amd64 = "x86_64" +QEMU_ARCH:i386 = "i386" +QEMU_ARCH:armhf = "arm" +QEMU_ARCH:arm64 = "aarch64" +QEMU_ARCH:mipsel = "mipsel" +QEMU_ARCH:riscv64 = "riscv64" # Codename of the repository created by the caching class DEBDISTRONAME ?= "isar" diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf index 9203b34..41b1d8f 100644 --- a/meta/conf/distro/debian-common.conf +++ b/meta/conf/distro/debian-common.conf @@ -21,16 +21,16 @@ WIC_IMAGER_INSTALL = "parted \ tar \ fdisk" -GRUB_BOOTLOADER_INSTALL_amd64 = "grub-efi-amd64-bin" -GRUB_BOOTLOADER_INSTALL_i386 = "grub-efi-ia32-bin" -GRUB_BOOTLOADER_INSTALL_armhf = "grub-efi-arm-bin" -GRUB_BOOTLOADER_INSTALL_arm64 = "grub-efi-arm64-bin" +GRUB_BOOTLOADER_INSTALL:amd64 = "grub-efi-amd64-bin" +GRUB_BOOTLOADER_INSTALL:i386 = "grub-efi-ia32-bin" +GRUB_BOOTLOADER_INSTALL:armhf = "grub-efi-arm-bin" +GRUB_BOOTLOADER_INSTALL:arm64 = "grub-efi-arm64-bin" SYSLINUX_BOOTLOADER_INSTALL = "syslinux syslinux-common" SYSTEMD_BOOTLOADER_PREINSTALL = "systemd" -SYSTEMD_BOOTLOADER_PREINSTALL_debian-bookworm = "systemd-boot" -SYSTEMD_BOOTLOADER_PREINSTALL_debian-sid-ports = "systemd-boot" +SYSTEMD_BOOTLOADER_PREINSTALL:debian-bookworm = "systemd-boot" +SYSTEMD_BOOTLOADER_PREINSTALL:debian-sid-ports = "systemd-boot" -COMPAT_DISTRO_ARCH_amd64 = "i386" -COMPAT_DISTRO_ARCH_arm64 = "armhf" +COMPAT_DISTRO_ARCH:amd64 = "i386" +COMPAT_DISTRO_ARCH:arm64 = "armhf" diff --git a/meta/conf/distro/debian-stretch.conf b/meta/conf/distro/debian-stretch.conf index 8b38fa5..fe62523 100644 --- a/meta/conf/distro/debian-stretch.conf +++ b/meta/conf/distro/debian-stretch.conf @@ -13,5 +13,5 @@ DISTRO_KERNELS ?= "4kc-malta 586 5kc-malta 686 686-pae amd64 arm64 armmp \ rt-686-pae rt-amd64 s390x" WIC_IMAGER_INSTALL += "python3" -WIC_IMAGER_INSTALL_remove = "fdisk" -WIC_IMAGER_INSTALL_remove = "python3-distutils" +WIC_IMAGER_INSTALL:remove = "fdisk" +WIC_IMAGER_INSTALL:remove = "python3-distutils" diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 1a526db..71a74fb 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -59,7 +59,7 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCaches): return False # Kernel modules are well namespaced. We don't want to depend on the kernel's checksum - # if we're just doing an RRECOMMENDS_xxx = "kernel-module-*", not least because the checksum + # if we're just doing an RRECOMMENDS:xxx = "kernel-module-*", not least because the checksum # is machine specific. # Therefore if we're not a kernel or a module recipe (inheriting the kernel classes) # and we reccomend a kernel-module, we exclude the dependency. diff --git a/meta/recipes-bsp/barebox/barebox.inc b/meta/recipes-bsp/barebox/barebox.inc index 5896d60..2999113 100644 --- a/meta/recipes-bsp/barebox/barebox.inc +++ b/meta/recipes-bsp/barebox/barebox.inc @@ -14,7 +14,7 @@ BAREBOX_BUILD_DIR ?= "build" BAREBOX_VERSION_EXTENSION ?= "" BAREBOX_ENV ?= "" -FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/files:" +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" SRC_URI += "file://rules.tmpl \ file://version.cfg.tmpl \ file://defaultenv.cfg.tmpl" diff --git a/meta/recipes-bsp/optee-os/optee-os-custom.inc b/meta/recipes-bsp/optee-os/optee-os-custom.inc index 23612d8..d48827a 100644 --- a/meta/recipes-bsp/optee-os/optee-os-custom.inc +++ b/meta/recipes-bsp/optee-os/optee-os-custom.inc @@ -7,7 +7,7 @@ inherit dpkg -FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/files:" +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" SRC_URI += "file://debian/" diff --git a/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc b/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc index 64153c6..052d9a4 100644 --- a/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc +++ b/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc @@ -7,7 +7,7 @@ inherit dpkg -FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/files:" +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" SRC_URI += "file://debian/" diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc index 2af7ada..876eb36 100644 --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc @@ -5,7 +5,7 @@ # # SPDX-License-Identifier: MIT -FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/files:" +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" DESCRIPTION ?= "Custom U-Boot" diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index e8831b0..05e502f 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -7,7 +7,7 @@ LICENSE = "gpl-2.0" LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" -FILESPATH_prepend := "${THISDIR}/files:" +FILESPATH:prepend := "${THISDIR}/files:" SRC_URI = " \ file://isar-apt-fallback.conf \ file://locale \ @@ -25,11 +25,11 @@ DISTRO_BOOTSTRAP_KEYFILES = "" THIRD_PARTY_APT_KEYFILES = "" DEPLOY_ISAR_BOOTSTRAP ?= "" DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales" -DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg = ",gnupg" -DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = "${@https_support(d)}" +DISTRO_BOOTSTRAP_BASE_PACKAGES:append:gnupg = ",gnupg" +DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = "${@https_support(d)}" DISTRO_VARS_PREFIX ?= "${@'HOST_' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else ''}" BOOTSTRAP_DISTRO = "${@d.getVar('HOST_DISTRO' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else 'DISTRO')}" -FILESEXTRAPATHS_append = ":${BBPATH}" +FILESEXTRAPATHS:append = ":${BBPATH}" inherit deb-dl-dir @@ -191,7 +191,7 @@ def get_distro_needs_https_support(d): else: return "" -OVERRIDES_append = ":${@get_distro_needs_https_support(d)}" +OVERRIDES:append = ":${@get_distro_needs_https_support(d)}" def get_distro_needs_gpg_support(d): if d.getVar("DISTRO_BOOTSTRAP_KEYS") or \ @@ -201,7 +201,7 @@ def get_distro_needs_gpg_support(d): else: return "" -OVERRIDES_append = ":${@get_distro_needs_gpg_support(d)}" +OVERRIDES:append = ":${@get_distro_needs_gpg_support(d)}" def get_distro_source(d): return get_distro_primary_source_entry(d)[0] diff --git a/meta/recipes-devtools/buildchroot/buildchroot-host.bb b/meta/recipes-devtools/buildchroot/buildchroot-host.bb index d8498a5..ae1ca24 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot-host.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot-host.bb @@ -16,7 +16,7 @@ BUILDCHROOT_PREINSTALL ?= " \ libc6:${DISTRO_ARCH} \ crossbuild-essential-${DISTRO_ARCH}" -BUILDCHROOT_PREINSTALL_riscv64 ?= " \ +BUILDCHROOT_PREINSTALL:riscv64 ?= " \ ${BUILDCHROOT_PREINSTALL_COMMON} \ libc6:${DISTRO_ARCH} \ gcc-riscv64-linux-gnu \ diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc index c3067ad..8084b95 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.inc +++ b/meta/recipes-devtools/buildchroot/buildchroot.inc @@ -6,7 +6,7 @@ LICENSE = "gpl-2.0" LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" -FILESPATH_prepend := "${THISDIR}/files:" +FILESPATH:prepend := "${THISDIR}/files:" SRC_URI = "file://configscript.sh \ file://build.sh \ file://common.sh \ @@ -23,7 +23,7 @@ ROOTFS_MANIFEST_DEPLOY_DIR = "${DEPLOY_DIR_BUILDCHROOT}" ROOTFS_DPKGSTATUS_DEPLOY_DIR = "${DEPLOY_DIR_BUILDCHROOT}" ROOTFS_FEATURES += "generate-manifest export-dpkg-status" -BUILDCHROOT_COMPAT_PREINSTALL_compat-arch = " \ +BUILDCHROOT_COMPAT_PREINSTALL:compat-arch = " \ libc6:${COMPAT_DISTRO_ARCH} \ crossbuild-essential-${COMPAT_DISTRO_ARCH}" @@ -42,7 +42,7 @@ BUILDCHROOT_PREINSTALL_COMMON = " \ equivs \ adduser" -rootfs_do_mounts_append() { +rootfs_do_mounts:append() { sudo -s <<'EOSUDO' set -e mkdir -p '${BUILDCHROOT_DIR}/downloads' diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc index 4688da1..f4abf73 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -28,7 +28,7 @@ ROOTFSDIR = "${SBUILD_CHROOT_DIR}" ROOTFS_PACKAGES = "${SBUILD_CHROOT_PREINSTALL}" # We don't need /etc/apt/sources.list.d/isar-apt.list' while it's handled by sbuild -ROOTFS_CONFIGURE_COMMAND_remove = "rootfs_configure_isar_apt" +ROOTFS_CONFIGURE_COMMAND:remove = "rootfs_configure_isar_apt" DEPLOY_SCHROOT = "${@d.getVar('SCHROOT_' + d.getVar('SBUILD_VARIANT').upper() + '_DIR')}" diff --git a/meta/recipes-kernel/kselftest/kselftest.inc b/meta/recipes-kernel/kselftest/kselftest.inc index 3a0b055..03f37f1 100644 --- a/meta/recipes-kernel/kselftest/kselftest.inc +++ b/meta/recipes-kernel/kselftest/kselftest.inc @@ -7,7 +7,7 @@ inherit dpkg -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" # Some test-cases like memfd compilation failed in cross-compilation. # Force native compilation for now to have consistent output across diff --git a/meta/recipes-kernel/linux-module/module.inc b/meta/recipes-kernel/linux-module/module.inc index b20ec32..7bef0dc 100644 --- a/meta/recipes-kernel/linux-module/module.inc +++ b/meta/recipes-kernel/linux-module/module.inc @@ -5,7 +5,7 @@ # # SPDX-License-Identifier: MIT -FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/files:" +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" DESCRIPTION ?= "Custom kernel module ${PN}" diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 55bf041..bd24707 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -30,8 +30,8 @@ KERNEL_DEBIAN_DEPENDS ?= "initramfs-tools | linux-initramfs-tool, \ linux-base (>= 4.3~)," LIBSSL_DEP = "libssl1.1" -LIBSSL_DEP_debian-sid = "libssl3" -LIBSSL_DEP_debian-sid-ports = "libssl3" +LIBSSL_DEP:debian-sid = "libssl3" +LIBSSL_DEP:debian-sid-ports = "libssl3" KERNEL_HEADERS_DEBIAN_DEPENDS ?= "libc6, \ ${LIBSSL_DEP}," @@ -46,7 +46,7 @@ LINUX_VERSION_EXTENSION ?= "" KERNEL_DEFCONFIG ??= "" # Add our template meta-data to the sources -FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/files:" +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" SRC_URI += "file://debian" # Variables and files that make our templates @@ -136,7 +136,7 @@ def get_additional_build_profiles(d): DEB_BUILD_PROFILES += "${@get_additional_build_profiles(d)}" -do_prepare_build_prepend() { +do_prepare_build:prepend() { # copy meta-data over to source tree rm -rf ${S}/debian cp -r ${WORKDIR}/debian ${S}/ @@ -207,6 +207,6 @@ EOF fi } -dpkg_runbuild_prepend() { +dpkg_runbuild:prepend() { dpkg_configure_kernel } -- 2.17.1