From c61dc077bbd81260e4f167fa2251643ba0ba6974 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 29 Jul 2021 17:04:53 +0200 Subject: Convert to new override syntax This is the result of automated script (0.9.1) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Martin Jansa --- meta-oe/recipes-kernel/bpftool/bpftool.bb | 4 +- .../broadcom-bt-firmware_12.0.1.1105_p2.bb | 46 +++++++++++----------- meta-oe/recipes-kernel/cpupower/cpupower.bb | 4 +- meta-oe/recipes-kernel/crash/crash_7.2.9.bb | 34 ++++++++-------- .../intel-speed-select/intel-speed-select.bb | 2 +- .../kernel-selftest/kernel-selftest.bb | 20 +++++----- meta-oe/recipes-kernel/kpatch/kpatch.inc | 12 +++--- meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb | 8 ++-- meta-oe/recipes-kernel/linux/linux.inc | 8 ++-- .../makedumpfile/makedumpfile_1.6.9.bb | 4 +- .../minicoredumper/minicoredumper_2.0.1.bb | 10 ++--- meta-oe/recipes-kernel/oprofile/oprofile_1.4.0.bb | 16 ++++---- meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb | 4 +- meta-oe/recipes-kernel/spidev-test/spidev-test.bb | 2 +- .../recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb | 2 +- meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb | 4 +- 16 files changed, 90 insertions(+), 90 deletions(-) (limited to 'meta-oe/recipes-kernel') diff --git a/meta-oe/recipes-kernel/bpftool/bpftool.bb b/meta-oe/recipes-kernel/bpftool/bpftool.bb index f0696db59b..76a749644b 100644 --- a/meta-oe/recipes-kernel/bpftool/bpftool.bb +++ b/meta-oe/recipes-kernel/bpftool/bpftool.bb @@ -25,7 +25,7 @@ SECURITY_CFLAGS = "" do_configure[depends] += "virtual/kernel:do_shared_workdir" COMPATIBLE_HOST = "(x86_64).*-linux" -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' do_compile() { oe_runmake @@ -37,7 +37,7 @@ do_install() { PACKAGE_ARCH = "${MACHINE_ARCH}" -python do_package_prepend() { +python do_package:prepend() { d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) } diff --git a/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb b/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb index e861ddb723..bc00e3d326 100644 --- a/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb +++ b/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb @@ -47,30 +47,30 @@ PACKAGES =+ " \ ${PN}-license \ " -RDEPENDS_${PN}-bcm20702a1 = "${PN}-license" -RDEPENDS_${PN}-bcm20702b0 = "${PN}-license" -RDEPENDS_${PN}-bcm20703a1 = "${PN}-license" -RDEPENDS_${PN}-bcm43142a0 = "${PN}-license" -RDEPENDS_${PN}-bcm4335c0 = "${PN}-license" -RDEPENDS_${PN}-bcm4350c5 = "${PN}-license" -RDEPENDS_${PN}-bcm4356a2 = "${PN}-license" -RDEPENDS_${PN}-bcm4371c2 = "${PN}-license" - -FILES_${PN}-bcm20702a1 = "${nonarch_base_libdir}/firmware/brcm/BCM20702A1*hcd" -FILES_${PN}-bcm20702b0 = "${nonarch_base_libdir}/firmware/brcm/BCM20702B0*hcd" -FILES_${PN}-bcm20703a1 = "${nonarch_base_libdir}/firmware/brcm/BCM20703A1*hcd" -FILES_${PN}-bcm43142a0 = "${nonarch_base_libdir}/firmware/brcm/BCM43142A0*hcd" -FILES_${PN}-bcm4335c0 = "${nonarch_base_libdir}/firmware/brcm/BCM4335C0*hcd" -FILES_${PN}-bcm4350c5 = "${nonarch_base_libdir}/firmware/brcm/BCM4350C5*hcd" -FILES_${PN}-bcm4356a2 = "${nonarch_base_libdir}/firmware/brcm/BCM4356A2*hcd" -FILES_${PN}-bcm4371c2 = "${nonarch_base_libdir}/firmware/brcm/BCM4371C2*hcd" -FILES_${PN}-license += "${nonarch_base_libdir}/firmware/brcm/LICENSE.broadcom_bcm20702" - -FILES_${PN} += "${nonarch_base_libdir}/firmware/brcm/*" -RDEPENDS_${PN} += "${PN}-license" +RDEPENDS:${PN}-bcm20702a1 = "${PN}-license" +RDEPENDS:${PN}-bcm20702b0 = "${PN}-license" +RDEPENDS:${PN}-bcm20703a1 = "${PN}-license" +RDEPENDS:${PN}-bcm43142a0 = "${PN}-license" +RDEPENDS:${PN}-bcm4335c0 = "${PN}-license" +RDEPENDS:${PN}-bcm4350c5 = "${PN}-license" +RDEPENDS:${PN}-bcm4356a2 = "${PN}-license" +RDEPENDS:${PN}-bcm4371c2 = "${PN}-license" + +FILES:${PN}-bcm20702a1 = "${nonarch_base_libdir}/firmware/brcm/BCM20702A1*hcd" +FILES:${PN}-bcm20702b0 = "${nonarch_base_libdir}/firmware/brcm/BCM20702B0*hcd" +FILES:${PN}-bcm20703a1 = "${nonarch_base_libdir}/firmware/brcm/BCM20703A1*hcd" +FILES:${PN}-bcm43142a0 = "${nonarch_base_libdir}/firmware/brcm/BCM43142A0*hcd" +FILES:${PN}-bcm4335c0 = "${nonarch_base_libdir}/firmware/brcm/BCM4335C0*hcd" +FILES:${PN}-bcm4350c5 = "${nonarch_base_libdir}/firmware/brcm/BCM4350C5*hcd" +FILES:${PN}-bcm4356a2 = "${nonarch_base_libdir}/firmware/brcm/BCM4356A2*hcd" +FILES:${PN}-bcm4371c2 = "${nonarch_base_libdir}/firmware/brcm/BCM4371C2*hcd" +FILES:${PN}-license += "${nonarch_base_libdir}/firmware/brcm/LICENSE.broadcom_bcm20702" + +FILES:${PN} += "${nonarch_base_libdir}/firmware/brcm/*" +RDEPENDS:${PN} += "${PN}-license" # Make broadcom-bt-firmware depend on all of the split-out packages. -python populate_packages_prepend () { +python populate_packages:prepend () { firmware_pkgs = oe.utils.packages_filter_out_system(d) - d.appendVar('RDEPENDS_broadcom-bt-firmware', ' ' + ' '.join(firmware_pkgs)) + d.appendVar('RDEPENDS:broadcom-bt-firmware', ' ' + ' '.join(firmware_pkgs)) } diff --git a/meta-oe/recipes-kernel/cpupower/cpupower.bb b/meta-oe/recipes-kernel/cpupower/cpupower.bb index cf70eb2c87..c31ccbb4a9 100644 --- a/meta-oe/recipes-kernel/cpupower/cpupower.bb +++ b/meta-oe/recipes-kernel/cpupower/cpupower.bb @@ -26,9 +26,9 @@ do_install() { PACKAGE_ARCH = "${MACHINE_ARCH}" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" -python do_package_prepend() { +python do_package:prepend() { d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) } diff --git a/meta-oe/recipes-kernel/crash/crash_7.2.9.bb b/meta-oe/recipes-kernel/crash/crash_7.2.9.bb index 0b6883a49a..c2d83cb4f0 100644 --- a/meta-oe/recipes-kernel/crash/crash_7.2.9.bb +++ b/meta-oe/recipes-kernel/crash/crash_7.2.9.bb @@ -38,13 +38,13 @@ UPSTREAM_CHECK_URI = "https://github.com/crash-utility/crash/releases" inherit gettext BBCLASSEXTEND = "native cross" -TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}" +TARGET_CC_ARCH:append = " ${SELECTED_OPTIMIZATION}" # crash 7.1.3 and before don't support mips64/riscv64 -COMPATIBLE_HOST_riscv64 = "null" -COMPATIBLE_HOST_riscv32 = "null" -COMPATIBLE_HOST_mipsarchn64 = "null" -COMPATIBLE_HOST_mipsarchn32 = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" +COMPATIBLE_HOST:mipsarchn64 = "null" +COMPATIBLE_HOST:mipsarchn32 = "null" EXTRA_OEMAKE = 'RPMPKG="${PV}" \ @@ -54,20 +54,20 @@ EXTRA_OEMAKE = 'RPMPKG="${PV}" \ LDFLAGS="${LDFLAGS}" \ ' -EXTRA_OEMAKE_class-cross = 'RPMPKG="${PV}" \ +EXTRA_OEMAKE:class-cross = 'RPMPKG="${PV}" \ GDB_TARGET="${BUILD_SYS} --target=${TARGET_SYS}" \ GDB_HOST="${BUILD_SYS}" \ GDB_MAKE_JOBS="${PARALLEL_MAKE}" \ ' -EXTRA_OEMAKE_append_class-native = " LDFLAGS='${BUILD_LDFLAGS}'" -EXTRA_OEMAKE_append_class-cross = " LDFLAGS='${BUILD_LDFLAGS}'" +EXTRA_OEMAKE:append:class-native = " LDFLAGS='${BUILD_LDFLAGS}'" +EXTRA_OEMAKE:append:class-cross = " LDFLAGS='${BUILD_LDFLAGS}'" do_configure() { : } -do_compile_prepend() { +do_compile:prepend() { case ${TARGET_ARCH} in aarch64*) ARCH=ARM64 ;; arm*) ARCH=ARM ;; @@ -87,7 +87,7 @@ do_compile() { oe_runmake ${EXTRA_OEMAKE} RECIPE_SYSROOT=${RECIPE_SYSROOT} } -do_install_prepend () { +do_install:prepend () { install -d ${D}${bindir} install -d ${D}/${mandir}/man8 install -d ${D}${includedir}/crash @@ -96,25 +96,25 @@ do_install_prepend () { install -m 0644 ${S}/defs.h ${D}${includedir}/crash } -do_install_class-target () { +do_install:class-target () { oe_runmake DESTDIR=${D} install } -do_install_class-native () { +do_install:class-native () { oe_runmake DESTDIR=${D}${STAGING_DIR_NATIVE} install } -do_install_class-cross () { +do_install:class-cross () { install -m 0755 ${S}/crash ${D}/${bindir} } -RDEPENDS_${PN} += "liblzma" -RDEPENDS_${PN}_class-native = "" -RDEPENDS_${PN}_class-cross = "" +RDEPENDS:${PN} += "liblzma" +RDEPENDS:${PN}:class-native = "" +RDEPENDS:${PN}:class-cross = "" # Causes gcc to get stuck and eat all available memory in qemuarm builds # jenkins 15161 100 12.5 10389596 10321284 ? R 11:40 28:17 /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.2/cc1 -quiet -I . -I . -I ./common -I ./config -I ./../include/opcode -I ./../opcodes/.. -I ./../readline/.. -I ../bfd -I ./../bfd -I ./../include -I ../libdecnumber -I ./../libdecnumber -I ./gnulib/import -I build-gnulib/import -isysroot /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm -MMD eval.d -MF .deps/eval.Tpo -MP -MT eval.o -D LOCALEDIR="/usr/local/share/locale" -D CRASH_MERGE -D HAVE_CONFIG_H -D TUI=1 eval.c -quiet -dumpbase eval.c -march=armv5te -mthumb -mthumb-interwork -mtls-dialect=gnu -auxbase-strip eval.o -g -O2 -Wall -Wpointer-arith -Wformat-nonliteral -Wno-pointer-sign -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts -Wmissing-prototypes -Wdeclaration-after-statement -Wempty-body -feliminate-unused-debug-types -o - ARM_INSTRUCTION_SET = "arm" # http://errors.yoctoproject.org/Errors/Details/186964/ -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' diff --git a/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb b/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb index 53f6de1068..109a46c4dd 100644 --- a/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb +++ b/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb @@ -9,7 +9,7 @@ LICENSE = "GPLv2" inherit kernelsrc COMPATIBLE_HOST = '(x86_64|i.86).*-linux' -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' do_populate_lic[depends] += "virtual/kernel:do_patch" diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 11cf935c73..d0f246b934 100644 --- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://../COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS = "rsync-native llvm-native" # for musl libc -SRC_URI_append_libc-musl = "\ +SRC_URI:append:libc-musl = "\ file://userfaultfd.patch \ " SRC_URI += "file://run-ptest \ @@ -19,17 +19,17 @@ SRC_URI += "file://run-ptest \ # bpf was added in 4.10 with: https://github.com/torvalds/linux/commit/5aa5bd14c5f8660c64ceedf14a549781be47e53d # if you have older kernel than that you need to remove it from PACKAGECONFIG PACKAGECONFIG ??= "firmware" -PACKAGECONFIG_remove_x86 = "bpf" -PACKAGECONFIG_remove_arm = "bpf vm" +PACKAGECONFIG:remove:x86 = "bpf" +PACKAGECONFIG:remove:arm = "bpf vm" # host ptrace.h is used to compile BPF target but mips ptrace.h is needed # progs/loop1.c:21:9: error: incomplete definition of type 'struct user_pt_regs' # m = PT_REGS_RC(ctx); # vm tests need libhugetlbfs starting 5.8+ (https://lkml.org/lkml/2020/4/22/1654) -PACKAGECONFIG_remove_qemumips = "bpf vm" +PACKAGECONFIG:remove:qemumips = "bpf vm" # riscv does not support libhugetlbfs yet -PACKAGECONFIG_remove_riscv64 = "vm" -PACKAGECONFIG_remove_riscv32 = "vm" +PACKAGECONFIG:remove:riscv64 = "vm" +PACKAGECONFIG:remove:riscv32 = "vm" PACKAGECONFIG[bpf] = ",,elfutils libcap libcap-ng rsync-native," PACKAGECONFIG[firmware] = ",,libcap, bash" @@ -125,14 +125,14 @@ remove_unrelated() { PACKAGE_ARCH = "${MACHINE_ARCH}" INHIBIT_PACKAGE_DEBUG_SPLIT="1" -FILES_${PN} += "/usr/kernel-selftest" +FILES:${PN} += "/usr/kernel-selftest" -RDEPENDS_${PN} += "python3" +RDEPENDS:${PN} += "python3" # tools/testing/selftests/vm/Makefile doesn't respect LDFLAGS and tools/testing/selftests/Makefile explicitly overrides to empty -INSANE_SKIP_${PN} += "ldflags" +INSANE_SKIP:${PN} += "ldflags" SECURITY_CFLAGS = "" -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' # It has native clang/llvm dependency, poky distro is reluctant to include them as deps # this helps with world builds on AB diff --git a/meta-oe/recipes-kernel/kpatch/kpatch.inc b/meta-oe/recipes-kernel/kpatch/kpatch.inc index 1f70f72054..9e626179f5 100644 --- a/meta-oe/recipes-kernel/kpatch/kpatch.inc +++ b/meta-oe/recipes-kernel/kpatch/kpatch.inc @@ -32,22 +32,22 @@ PACKAGES =+ "kpatch-build" PROVIDES += "kpatch-build" COMPATIBLE_HOST = "(x86_64).*-linux" -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" -RDEPENDS_${PN} = "bash binutils" -RDEPENDS_kpatch-build = "bash glibc-utils" +RDEPENDS:${PN} = "bash binutils" +RDEPENDS:kpatch-build = "bash glibc-utils" -FILES_${PN} = " \ +FILES:${PN} = " \ ${sbindir}/kpatch \ ${systemd_system_unitdir}/kpatch.service \ ${mandir}/man1/kpatch.1.gz \ ${sysconfdir}/init/kpatch.conf \ " -FILES_kpatch-build = " \ +FILES:kpatch-build = " \ ${bindir}/kpatch-build \ ${libexecdir}/* \ ${datadir}/kpatch \ ${mandir}/man1/kpatch-build.1.gz \ " -SYSTEMD_SERVICE_${PN} = "kpatch.service" +SYSTEMD_SERVICE:${PN} = "kpatch.service" diff --git a/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb b/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb index 8ffc99f91b..e476370e05 100644 --- a/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb +++ b/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb @@ -21,10 +21,10 @@ SRC_URI[sha256sum] = "5da5f8872bde14b3634c9688d980f68bda28b510268723cc12973eedba UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/perfmon2/files/libpfm4/" EXTRA_OEMAKE = "DESTDIR=\"${D}\" PREFIX=\"${prefix}\" LIBDIR=\"${libdir}\" LDCONFIG=\"true\"" -EXTRA_OEMAKE_append_powerpc = " ARCH=\"powerpc\"" -EXTRA_OEMAKE_append_powerpc64 = " ARCH=\"powerpc\" BITMODE=\"64\"" -EXTRA_OEMAKE_append_powerpc64le = " ARCH=\"powerpc\" BITMODE=\"64\"" -EXTRA_OEMAKE_append_aarch64 = " ARCH=\"arm64\"" +EXTRA_OEMAKE:append:powerpc = " ARCH=\"powerpc\"" +EXTRA_OEMAKE:append:powerpc64 = " ARCH=\"powerpc\" BITMODE=\"64\"" +EXTRA_OEMAKE:append:powerpc64le = " ARCH=\"powerpc\" BITMODE=\"64\"" +EXTRA_OEMAKE:append:aarch64 = " ARCH=\"arm64\"" S = "${WORKDIR}/libpfm-${PV}" diff --git a/meta-oe/recipes-kernel/linux/linux.inc b/meta-oe/recipes-kernel/linux/linux.inc index 9f14370cd8..f134244762 100644 --- a/meta-oe/recipes-kernel/linux/linux.inc +++ b/meta-oe/recipes-kernel/linux/linux.inc @@ -34,7 +34,7 @@ kernel_conf_variable() { fi } -do_configure_prepend() { +do_configure:prepend() { echo "" > ${B}/.config CONF_SED_SCRIPT="" @@ -117,15 +117,15 @@ do_configure_prepend() { yes '' | oe_runmake -C ${S} O=${B} oldconfig } -do_configure_append() { +do_configure:append() { if test -e scripts/Makefile.fwinst ; then sed -i -e "s:-m0644:-m 0644:g" scripts/Makefile.fwinst fi } -do_install_append() { +do_install:append() { oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}/src/linux-${KERNEL_VERSION} ARCH=$ARCH } PACKAGES =+ "kernel-headers" -FILES_kernel-headers = "${exec_prefix}/src/linux*" +FILES:kernel-headers = "${exec_prefix}/src/linux*" diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.9.bb b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.9.bb index 79bad0a01c..cf34d34d93 100644 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.9.bb +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.9.bb @@ -14,14 +14,14 @@ SRCBRANCH ?= "master" SRCREV = "a9ad811c15e769c8e6d8d915a05cebc32f2ea2f5" DEPENDS = "bzip2 zlib elfutils xz" -RDEPENDS_${PN}-tools = "perl ${PN}" +RDEPENDS:${PN}-tools = "perl ${PN}" # arm and aarch64 would compile but has never been tested upstream. mips would not compile. # COMPATIBLE_HOST = "(x86_64|i.86|powerpc|arm|aarch64).*-linux" PACKAGES =+ "${PN}-tools" -FILES_${PN}-tools = "${bindir}/*.pl" +FILES:${PN}-tools = "${bindir}/*.pl" SRC_URI = "\ git://github.com/makedumpfile/makedumpfile;branch=${SRCBRANCH} \ diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb index 6a04e78919..1b578d33bb 100644 --- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb +++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb @@ -21,14 +21,14 @@ SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https \ S = "${WORKDIR}/git" -SYSTEMD_SERVICE_${PN} = "minicoredumper.service" +SYSTEMD_SERVICE:${PN} = "minicoredumper.service" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "minicoredumper" -INITSCRIPT_PARAMS_${PN} = "defaults 89" +INITSCRIPT_NAME:${PN} = "minicoredumper" +INITSCRIPT_PARAMS:${PN} = "defaults 89" -do_install_append() { +do_install:append() { rmdir ${D}${localstatedir}/run install -d ${D}/${sysconfdir}/minicoredumper cp -rf ${S}/etc/* ${D}/${sysconfdir}/ @@ -44,4 +44,4 @@ do_install_append() { } # http://errors.yoctoproject.org/Errors/Details/186966/ -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' diff --git a/meta-oe/recipes-kernel/oprofile/oprofile_1.4.0.bb b/meta-oe/recipes-kernel/oprofile/oprofile_1.4.0.bb index 7a18446823..ee37b6c6b7 100644 --- a/meta-oe/recipes-kernel/oprofile/oprofile_1.4.0.bb +++ b/meta-oe/recipes-kernel/oprofile/oprofile_1.4.0.bb @@ -11,11 +11,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ SECTION = "devel" DEPENDS = "popt binutils" -DEPENDS_append_powerpc64 = " libpfm4" -DEPENDS_append_powerpc64le = " libpfm4" +DEPENDS:append:powerpc64 = " libpfm4" +DEPENDS:append:powerpc64le = " libpfm4" -COMPATIBLE_HOST_riscv64 = "null" -COMPATIBLE_HOST_riscv32 = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://acinclude.m4 \ @@ -68,8 +68,8 @@ do_install_ptest() { libutil++/tests/file_manip_tests.o ${D}${PTEST_PATH}/libutil++/tests } -RDEPENDS_${PN} = "binutils-symlinks" +RDEPENDS:${PN} = "binutils-symlinks" -FILES_${PN} = "${bindir} ${libdir}/${BPN}/lib*${SOLIBS} ${datadir}/${BPN}" -FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la" -FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a" +FILES:${PN} = "${bindir} ${libdir}/${BPN}/lib*${SOLIBS} ${datadir}/${BPN}" +FILES:${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la" +FILES:${PN}-staticdev += "${libdir}/${BPN}/lib*.a" diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb index 4d7a1b2d45..06a02bb1c3 100644 --- a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb +++ b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb @@ -30,6 +30,6 @@ do_install() { install -Dm 0755 ${S}/analyze_suspend.py ${D}${bindir}/analyze_suspend.py } -RDEPENDS_${PN} += "python3-core python3-threading python3-datetime python3-compression" -RPROVIDES_${PN} = "analyze-suspend" +RDEPENDS:${PN} += "python3-core python3-threading python3-datetime python3-compression" +RPROVIDES:${PN} = "analyze-suspend" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-kernel/spidev-test/spidev-test.bb b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb index 974cb1e93c..3907ed59f3 100644 --- a/meta-oe/recipes-kernel/spidev-test/spidev-test.bb +++ b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb @@ -22,7 +22,7 @@ do_install() { PACKAGE_ARCH = "${MACHINE_ARCH}" -python do_package_prepend() { +python do_package:prepend() { d.setVar('PKGV', d.getVar("KERNEL_VERSION", True).split("-")[0]) } diff --git a/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb b/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb index 906ca2c1f3..2735ee78a5 100644 --- a/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb +++ b/meta-oe/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb @@ -16,4 +16,4 @@ do_install() { mv ${D}/${libdir}/traceevent/plugins/*.so ${D}${libdir}/traceevent/plugins/${BPN}/ } -FILES_${PN} += "${libdir}/traceevent/plugins" +FILES:${PN} += "${libdir}/traceevent/plugins" diff --git a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb index 48c72140c8..c9f946459e 100644 --- a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb +++ b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb @@ -14,7 +14,7 @@ processors." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://../COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" SRC_URI += "\ file://COPYING \ @@ -38,7 +38,7 @@ EXTRA_OEMAKE = '\ # do_configure() is invoked so we can safely copy from it. # do_configure[depends] += "virtual/kernel:do_shared_workdir" -do_configure_prepend() { +do_configure:prepend() { mkdir -p ${S} cp -r ${STAGING_KERNEL_DIR}/arch/x86/include/asm/msr-index.h ${S} cp -r ${STAGING_KERNEL_DIR}/arch/x86/include/asm/intel-family.h ${S} -- cgit 1.2.3-korg