From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: Anton Mikanovich <amikan@ilbers.de>
Subject: [PATCH v8 10/20] meta: update overrides syntax
Date: Wed, 25 Jan 2023 21:23:27 +0200 [thread overview]
Message-ID: <20230125192337.86869-11-amikan@ilbers.de> (raw)
In-Reply-To: <20230125192337.86869-1-amikan@ilbers.de>
This is the result of scripts/contrib/convert-overrides.py run.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
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 | 14 ++---
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.203.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 | 36 ++++++-------
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 | 30 +++++------
meta/conf/bitbake.conf | 18 +++----
meta/conf/distro/debian-common.conf | 20 +++----
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.inc | 4 +-
.../sbuild-chroot/sbuild-chroot-host.bb | 2 +-
.../sbuild-chroot/sbuild-chroot.inc | 4 +-
meta/recipes-kernel/kselftest/kselftest.inc | 2 +-
meta/recipes-kernel/linux-module/module.inc | 2 +-
meta/recipes-kernel/linux/linux-custom.inc | 10 ++--
45 files changed, 155 insertions(+), 155 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 2ba2c75..2613969 100644
--- a/meta-isar/conf/distro/raspios-bullseye.conf
+++ b/meta-isar/conf/distro/raspios-bullseye.conf
@@ -4,7 +4,7 @@
# Copyright (C) 2022 ilbers GmbH
BASE_DISTRO = "raspios"
-BASE_DISTRO_arm64 = "debian"
+BASE_DISTRO:arm64 = "debian"
HOST_BASE_DISTRO ?= "debian"
@@ -13,15 +13,15 @@ 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"
DISTRO_GCC = "10"
diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf
index eb7a1e8..6292501 100644
--- a/meta-isar/conf/distro/ubuntu-focal.conf
+++ b/meta-isar/conf/distro/ubuntu-focal.conf
@@ -10,8 +10,8 @@ BASE_DISTRO_CODENAME = "focal"
HOST_BASE_DISTRO = "${BASE_DISTRO}"
-DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}-ports.list"
-HOST_DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${HOST_DISTRO}.list conf/distro/${HOST_DISTRO}-ports.list"
+DISTRO_APT_SOURCES:arm64 ?= "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}-ports.list"
+HOST_DISTRO_APT_SOURCES:arm64 ?= "conf/distro/${HOST_DISTRO}.list conf/distro/${HOST_DISTRO}-ports.list"
# that is what debootstrap_1.0.118ubuntu1 does anyways
DISTRO_DEBOOTSTRAP_SCRIPT = "/usr/share/debootstrap/scripts/gutsy"
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 a1be5e5..0c76825 100644
--- a/meta-isar/conf/machine/qemuamd64.conf
+++ b/meta-isar/conf/machine/qemuamd64.conf
@@ -4,19 +4,19 @@
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}"
-WKS_FILE_debian-bullseye ?= "sdimage-efi-btrfs"
-IMAGER_INSTALL_remove_debian-bullseye = "${GRUB_BOOTLOADER_INSTALL}"
-IMAGER_INSTALL_append_debian-bullseye = " ${SYSTEMD_BOOTLOADER_INSTALL} btrfs-progs"
-IMAGE_PREINSTALL_append_debian-bullseye = " btrfs-progs"
+WKS_FILE:debian-bullseye ?= "sdimage-efi-btrfs"
+IMAGER_INSTALL:remove:debian-bullseye = "${GRUB_BOOTLOADER_INSTALL}"
+IMAGER_INSTALL:append:debian-bullseye = " ${SYSTEMD_BOOTLOADER_INSTALL} btrfs-progs"
+IMAGE_PREINSTALL:append:debian-bullseye = " btrfs-progs"
IMAGE_INSTALL += "sshd-regen-keys"
IMAGE_INSTALL += "expand-on-first-boot"
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 0b9ecb6..ce533ee 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"
IMAGER_INSTALL += "${SYSTEMD_BOOTLOADER_INSTALL}"
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.203.bb b/meta-isar/recipes-kernel/linux/linux-mainline_5.4.203.bb
index 3313cf7..76f73f0 100644
--- a/meta-isar/recipes-kernel/linux/linux-mainline_5.4.203.bb
+++ b/meta-isar/recipes-kernel/linux/linux-mainline_5.4.203.bb
@@ -19,12 +19,12 @@ SRC_URI[sha256sum] = "fc933f5b13066cfa54aacb5e86747a167bad1d8d23972e4a03ab5ee36c
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 d19e2a9..ad28f7b 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -13,7 +13,7 @@ inherit deb-dl-dir
DEPENDS ?= ""
RPROVIDES ?= "${PROVIDES}"
-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 ?= ""
@@ -187,7 +187,7 @@ addtask prepare_build after do_patch do_transform_template before do_dpkg_build
do_prepare_build[deptask] = "do_deploy_deb"
do_prepare_build[depends] = "${SCHROOT_DEP}"
-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 b1d7b24..1647374 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 f034152..8135fc8 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 c1a8c77..d528503 100644
--- a/meta/classes/dpkg.bbclass
+++ b/meta/classes/dpkg.bbclass
@@ -19,7 +19,7 @@ def expand_sbuild_pt_additions(d):
cmds += 'sbuild_export ' + var + ' "' + varval + '"\n'
return cmds
-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 04b4a18..f049394 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:
@@ -310,7 +310,7 @@ python() {
# image rootfs reproducible. Otherwise changes of SOURCE_DATE_EPOCH would
# invalidate the SSTATE entries for most packages, even if they don't use the
# global SOURCE_DATE_EPOCH variable.
-rootfs_install_pkgs_install_prepend() {
+rootfs_install_pkgs_install:prepend() {
if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then
export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}"
fi
diff --git a/meta/classes/imagetypes.bbclass b/meta/classes/imagetypes.bbclass
index 7da8117..dccf719 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_OPTIONS ?= ""
-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 ff6e10b..bd75128 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', d.getVar('TASK_USE_SUDO'))
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 24a7b85..5f0df48 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"
@@ -144,7 +144,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 3247f53..06e1e7d 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -74,7 +74,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 3feada2..0a98ea0 100644
--- a/meta/classes/sdk.bbclass
+++ b/meta/classes/sdk.bbclass
@@ -56,41 +56,41 @@ python __anonymous() {
}
# 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 --reflink=auto ${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
@@ -132,7 +132,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 20fd133..77fc79b 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}:${BASE_DISTRO_CODENAME}: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 5139c7d..886768c 100644
--- a/meta/conf/distro/debian-common.conf
+++ b/meta/conf/distro/debian-common.conf
@@ -23,19 +23,19 @@ 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"
-GRUB_DEBIAN_SB_CHAIN_amd64 = "grub-efi-amd64-signed shim-signed"
-GRUB_DEBIAN_SB_MOK_amd64 = "shim-helpers-amd64-signed"
+GRUB_DEBIAN_SB_CHAIN:amd64 = "grub-efi-amd64-signed shim-signed"
+GRUB_DEBIAN_SB_MOK:amd64 = "shim-helpers-amd64-signed"
SYSLINUX_BOOTLOADER_INSTALL = "syslinux syslinux-common"
SYSTEMD_BOOTLOADER_INSTALL = "systemd:${DISTRO_ARCH}"
-SYSTEMD_BOOTLOADER_INSTALL_debian-bookworm = "systemd-boot-efi:${DISTRO_ARCH}"
-SYSTEMD_BOOTLOADER_INSTALL_debian-sid-ports = "systemd-boot-efi:${DISTRO_ARCH}"
+SYSTEMD_BOOTLOADER_INSTALL:debian-bookworm = "systemd-boot-efi:${DISTRO_ARCH}"
+SYSTEMD_BOOTLOADER_INSTALL:debian-sid-ports = "systemd-boot-efi:${DISTRO_ARCH}"
-COMPAT_DISTRO_ARCH_amd64 = "i386"
-COMPAT_DISTRO_ARCH_arm64 = "armhf"
+COMPAT_DISTRO_ARCH:amd64 = "i386"
+COMPAT_DISTRO_ARCH:arm64 = "armhf"
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 8e14b9d..99d75e2 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://locale \
file://chroot-setup.sh"
@@ -24,12 +24,12 @@ 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 = ",ca-certificates"
+DISTRO_BOOTSTRAP_BASE_PACKAGES:append:gnupg = ",gnupg"
+DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = ",ca-certificates"
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')}"
BOOTSTRAP_BASE_DISTRO = "${@d.getVar('HOST_BASE_DISTRO' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else 'BASE_DISTRO')}"
-FILESEXTRAPATHS_append = ":${BBPATH}"
+FILESEXTRAPATHS:append = ":${BBPATH}"
inherit deb-dl-dir
@@ -185,7 +185,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 \
@@ -195,7 +195,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.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc
index 82fcfbf..f74896f 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 \
@@ -30,7 +30,7 @@ BUILDCHROOT_PREINSTALL ?= " \
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-host.bb b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
index c001572..d2e23d5 100644
--- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
+++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb
@@ -18,7 +18,7 @@ SBUILD_CHROOT_PREINSTALL ?= " \
crossbuild-essential-${DISTRO_ARCH} \
"
-SBUILD_CHROOT_PREINSTALL_riscv64 ?= " \
+SBUILD_CHROOT_PREINSTALL:riscv64 ?= " \
${SBUILD_CHROOT_PREINSTALL_COMMON} \
gcc-riscv64-linux-gnu \
g++-riscv64-linux-gnu \
diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc
index 9336c0c..fb061da 100644
--- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc
+++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc
@@ -28,7 +28,7 @@ python() {
' libstdc++-{}-dev:{}'.format(distro_gcc, compat_arch))
}
-SBUILD_CHROOT_COMPAT_PREINSTALL_compat-arch = " \
+SBUILD_CHROOT_COMPAT_PREINSTALL:compat-arch = " \
libc6-dev:${COMPAT_DISTRO_ARCH} \
crossbuild-essential-${COMPAT_DISTRO_ARCH}"
@@ -48,7 +48,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 a9e5d3d..76ad860 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 6c539c0..2b71dd8 100644
--- a/meta/recipes-kernel/linux/linux-custom.inc
+++ b/meta/recipes-kernel/linux/linux-custom.inc
@@ -31,8 +31,8 @@ KERNEL_DEBIAN_DEPENDS ?= "initramfs-tools | linux-initramfs-tool, \
linux-base (>= 4.3~),"
LIBSSL_DEP = "libssl3"
-LIBSSL_DEP_buster = "libssl1.1"
-LIBSSL_DEP_bullseye = "libssl1.1"
+LIBSSL_DEP:buster = "libssl1.1"
+LIBSSL_DEP:bullseye = "libssl1.1"
KERNEL_HEADERS_DEBIAN_DEPENDS ?= "libc6, \
${LIBSSL_DEP},"
@@ -47,7 +47,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
@@ -138,7 +138,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}/
@@ -209,6 +209,6 @@ EOF
fi
}
-dpkg_runbuild_prepend() {
+dpkg_runbuild:prepend() {
dpkg_configure_kernel
}
--
2.34.1
next prev parent reply other threads:[~2023-01-25 19:23 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-25 19:23 [PATCH v8 00/20] Migrate to Bitbake 2.0 Anton Mikanovich
2023-01-25 19:23 ` [PATCH v8 01/20] meta: change deprecated parse calls Anton Mikanovich
2023-01-25 19:23 ` [PATCH v8 02/20] scripts/contrib: add override conversion script Anton Mikanovich
2023-01-25 19:23 ` [PATCH v8 03/20] scripts/contrib: configure " Anton Mikanovich
2023-01-25 19:23 ` [PATCH v8 04/20] meta-isar: set default branch names Anton Mikanovich
2023-01-25 19:23 ` [PATCH v8 05/20] meta: remove non recommended syntax Anton Mikanovich
2023-01-25 19:23 ` [PATCH v8 06/20] bitbake: update to Bitbake 2.0.5 Anton Mikanovich
2023-01-25 19:23 ` [PATCH v8 07/20] meta: update bitbake variables Anton Mikanovich
2023-01-25 19:23 ` [PATCH v8 08/20] bitbake.conf: align hash vars with openembedded Anton Mikanovich
2023-01-25 19:23 ` [PATCH v8 09/20] meta: mark network and sudo tasks Anton Mikanovich
2023-01-25 19:23 ` Anton Mikanovich [this message]
2023-01-25 19:23 ` [PATCH v8 11/20] sstate: update bbclass Anton Mikanovich
2023-01-25 19:23 ` [PATCH v8 12/20] bitbake.conf: declare default XZ and ZSTD options Anton Mikanovich
2023-01-25 19:23 ` [PATCH v8 13/20] Revert "devshell: Use different termination test to avoid warnings" Anton Mikanovich
2023-01-25 19:23 ` [PATCH v8 14/20] meta: align with OE-core libraries update Anton Mikanovich
2023-01-25 19:23 ` [PATCH v8 15/20] Revert "Revert "devshell: Use different termination test to avoid warnings"" Anton Mikanovich
2023-01-25 19:23 ` [PATCH v8 16/20] CI: adapt tests to syntax change Anton Mikanovich
2023-01-25 19:23 ` [PATCH v8 17/20] isar-sstate: adapt sstate maintenance script Anton Mikanovich
2023-01-25 19:23 ` [PATCH v8 18/20] doc: require zstd tool Anton Mikanovich
2023-01-25 19:23 ` [PATCH v8 19/20] RECIPE-API-CHANGELOG: add tips after bitbake version update Anton Mikanovich
2023-01-25 19:23 ` [PATCH v8 20/20] docs: update override syntax Anton Mikanovich
2023-01-25 23:43 ` [PATCH v8 00/20] Migrate to Bitbake 2.0 Roberto A. Foglietta
2023-01-26 7:29 ` Anton Mikanovich
2023-01-26 13:23 ` Roberto A. Foglietta
2023-01-26 19:59 ` Henning Schild
2023-01-27 4:09 ` Roberto A. Foglietta
2023-01-31 11:26 ` Uladzimir Bely
2023-02-01 6:17 ` Uladzimir Bely
2023-02-02 9:02 ` Florian Bezdeka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230125192337.86869-11-amikan@ilbers.de \
--to=amikan@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox