From 0584f638797a816b29b909d4611d5a099df7bbc1 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Sat, 31 Jul 2021 17:47:03 +0800 Subject: Convert to new override syntax Use the convert-overrides.py to convert to new syntax and manually fix some additional changes. Signed-off-by: Anuj Mittal --- recipes-core/images/core-image-minimal-initramfs.bbappend | 2 +- recipes-core/libxcam/libxcam_1.5.0.bb | 10 +++++----- recipes-core/microcode/intel-microcode_20210608.bb | 2 +- recipes-core/microcode/iucode-tool_2.3.1.bb | 4 ++-- recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb | 4 ++-- recipes-core/ovmf/ovmf_%.bbappend | 6 +++--- recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb | 10 +++++----- 7 files changed, 19 insertions(+), 19 deletions(-) (limited to 'recipes-core') diff --git a/recipes-core/images/core-image-minimal-initramfs.bbappend b/recipes-core/images/core-image-minimal-initramfs.bbappend index 132f15b5..90ac28fd 100644 --- a/recipes-core/images/core-image-minimal-initramfs.bbappend +++ b/recipes-core/images/core-image-minimal-initramfs.bbappend @@ -1,2 +1,2 @@ # Add i915 graphics firmware -PACKAGE_INSTALL_append_intel-x86-common = " linux-firmware-i915" +PACKAGE_INSTALL:append:intel-x86-common = " linux-firmware-i915" diff --git a/recipes-core/libxcam/libxcam_1.5.0.bb b/recipes-core/libxcam/libxcam_1.5.0.bb index fcd14bd4..33d7d803 100644 --- a/recipes-core/libxcam/libxcam_1.5.0.bb +++ b/recipes-core/libxcam/libxcam_1.5.0.bb @@ -11,7 +11,7 @@ SRCREV = "231a1d5243cd45c7a6b511b667f1ec52178fdda8" SRC_URI = "git://github.com/intel/libxcam.git;branch=1.5.0; \ " -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" PACKAGECONFIG ??= " gst \ ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gles", "", d)} \ @@ -27,12 +27,12 @@ PACKAGECONFIG[gles] = "--enable-gles, --disable-gles, virtual/mesa" PACKAGECONFIG[vulkan] = "--enable-vulkan, --disable-vulkan, vulkan-loader virtual/mesa" PACKAGECONFIG[dnn] = "--enable-dnn, --disable-dnn," -do_install_append () { +do_install:append () { install -d ${D}${bindir}/libxcam cp -r ${WORKDIR}/build/tests/.libs/* ${D}${bindir}/libxcam/ } -FILES_${PN} += "${libdir}/gstreamer-*/*.so" -FILES_${PN}-test = "${bindir}/libxcam/*" +FILES:${PN} += "${libdir}/gstreamer-*/*.so" +FILES:${PN}-test = "${bindir}/libxcam/*" PACKAGES =+ "${PN}-test" -RDEPENDS_${PN}-test =+ "bash" +RDEPENDS:${PN}-test =+ "bash" diff --git a/recipes-core/microcode/intel-microcode_20210608.bb b/recipes-core/microcode/intel-microcode_20210608.bb index 8a53421f..0487b219 100644 --- a/recipes-core/microcode/intel-microcode_20210608.bb +++ b/recipes-core/microcode/intel-microcode_20210608.bb @@ -63,6 +63,6 @@ addtask deploy before do_build after do_compile PACKAGES = "${PN}" -FILES_${PN} = "${nonarch_base_libdir}" +FILES:${PN} = "${nonarch_base_libdir}" UPSTREAM_CHECK_GITTAGREGEX = "^microcode-(?P(\d+)[a-z]*)$" diff --git a/recipes-core/microcode/iucode-tool_2.3.1.bb b/recipes-core/microcode/iucode-tool_2.3.1.bb index df74a8e9..1d45f9a7 100644 --- a/recipes-core/microcode/iucode-tool_2.3.1.bb +++ b/recipes-core/microcode/iucode-tool_2.3.1.bb @@ -16,10 +16,10 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://iucode_tool.c;beginline=1;endline=15;md5=71eeab3190360ff0267101b570874756" -DEPENDS_append_libc-musl = " argp-standalone" +DEPENDS:append:libc-musl = " argp-standalone" SRC_URI = "https://gitlab.com/iucode-tool/releases/raw/master/iucode-tool_${PV}.tar.xz" -SRC_URI_append_libc-musl = " file://0001-Makefile.am-Add-arg-parse-library-for-MUSL-support.patch" +SRC_URI:append:libc-musl = " file://0001-Makefile.am-Add-arg-parse-library-for-MUSL-support.patch" SRC_URI[md5sum] = "63b33cc0ea1f8c73b443412abbf39d6f" SRC_URI[sha256sum] = "12b88efa4d0d95af08db05a50b3dcb217c0eb2bfc67b483779e33d498ddb2f95" diff --git a/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb b/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb index b20f6e58..ca3cfc15 100644 --- a/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb +++ b/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb @@ -1,10 +1,10 @@ require recipes-core/ovmf/ovmf-shell-image.bb -WKS_SEARCH_PATH_append = ":${COREBASE}/meta/recipes-core/ovmf" +WKS_SEARCH_PATH:append = ":${COREBASE}/meta/recipes-core/ovmf" QB_DRIVE_TYPE = "/dev/vd" -do_image_append() { +do_image:append() { cat > ${IMAGE_ROOTFS}/startup.nsh << EOF EnrollDefaultKeys reset diff --git a/recipes-core/ovmf/ovmf_%.bbappend b/recipes-core/ovmf/ovmf_%.bbappend index bbf5fa32..34a9dd1b 100644 --- a/recipes-core/ovmf/ovmf_%.bbappend +++ b/recipes-core/ovmf/ovmf_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend:intel-x86-common := "${THISDIR}/files:" -SRC_URI_append_intel-x86-common = " \ +SRC_URI:append:intel-x86-common = " \ file://0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch \ " -PACKAGECONFIG_append_intel-x86-common = " secureboot" +PACKAGECONFIG:append:intel-x86-common = " secureboot" diff --git a/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb b/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb index 65303bff..617369fd 100644 --- a/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb +++ b/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb @@ -1,18 +1,18 @@ require recipes-core/zlib/zlib_1.2.11.bb -FILESEXTRAPATHS_append = ":${COREBASE}/meta/recipes-core/zlib/zlib" +FILESEXTRAPATHS:append = ":${COREBASE}/meta/recipes-core/zlib/zlib" SUMMARY = "Zlib Compression Library (Intel-tuned)" PROVIDES = "zlib" -SRC_URI_remove = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz" -SRC_URI_prepend = "git://github.com/jtkukunas/zlib.git;protocol=git " +SRC_URI:remove = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz" +SRC_URI:prepend = "git://github.com/jtkukunas/zlib.git;protocol=git " SRCREV = "a43a247bfa16ec5368747b5b64f11ea5ca033010" S = "${WORKDIR}/git" -RPROVIDES_${PN} += "zlib" -RPROVIDES_${PN}-ptest += "zlib-ptest" +RPROVIDES:${PN} += "zlib" +RPROVIDES:${PN}-ptest += "zlib-ptest" UPSTREAM_CHECK_GITTAGREGEX = "^v(?P(\d+(\.\d+)+)_jtkv(\d+(\.\d+)+))$" -- cgit v1.2.3-54-g00ecf