From b9507ceb23d1093b955cb34e277c0fb1f07adf0b Mon Sep 17 00:00:00 2001 From: Matt Madison Date: Tue, 3 Aug 2021 08:14:15 -0700 Subject: [PATCH] meta: convert to new override syntax * Ran convert-overrides.py to generate the initial changes * Manual cleanup afterwards (which was a lot, due to our extensive use of overrides). Signed-off-by: Matt Madison --- classes/container-runtime-csv.bbclass | 8 +- classes/cuda.bbclass | 20 +-- classes/image_types_cboot.bbclass | 4 +- classes/image_types_tegra.bbclass | 34 ++--- classes/l4t_deb_pkgfeed.bbclass | 6 +- conf/machine/include/tegra-common.inc | 6 +- conf/machine/include/tegra186.inc | 2 +- conf/machine/include/tegra194.inc | 2 +- contrib/recipes-devtools/gcc-7/gcc-7.3.inc | 2 +- contrib/recipes-devtools/gcc-7/gcc-common.inc | 6 +- .../gcc-7/gcc-configure-common.inc | 30 ++--- .../gcc-7/gcc-cross-canadian.inc | 14 +- contrib/recipes-devtools/gcc-7/gcc-cross.inc | 10 +- .../gcc-7/gcc-multilib-config.inc | 2 +- .../recipes-devtools/gcc-7/gcc-runtime.inc | 122 +++++++++--------- .../recipes-devtools/gcc-7/gcc-runtime_7.3.bb | 2 +- .../recipes-devtools/gcc-7/gcc-sanitizers.inc | 56 ++++---- contrib/recipes-devtools/gcc-7/gcc-target.inc | 54 ++++---- contrib/recipes-devtools/gcc-7/gcc_7.3.bb | 4 +- .../recipes-devtools/gcc-7/libgcc-common.inc | 12 +- .../recipes-devtools/gcc-7/libgcc-initial.inc | 6 +- contrib/recipes-devtools/gcc-7/libgcc.inc | 12 +- .../recipes-devtools/gcc-7/libgfortran.inc | 8 +- contrib/recipes-devtools/gcc-8/gcc-8.3.inc | 2 +- contrib/recipes-devtools/gcc-8/gcc-common.inc | 6 +- .../gcc-8/gcc-configure-common.inc | 30 ++--- .../gcc-8/gcc-cross-canadian.inc | 16 +-- contrib/recipes-devtools/gcc-8/gcc-cross.inc | 10 +- .../gcc-8/gcc-multilib-config.inc | 2 +- .../recipes-devtools/gcc-8/gcc-runtime.inc | 112 ++++++++-------- .../recipes-devtools/gcc-8/gcc-runtime_8.3.bb | 4 +- .../recipes-devtools/gcc-8/gcc-sanitizers.inc | 56 ++++---- .../gcc-8/gcc-sanitizers_8.3.bb | 4 +- contrib/recipes-devtools/gcc-8/gcc-target.inc | 56 ++++---- contrib/recipes-devtools/gcc-8/gcc_8.3.bb | 10 +- .../recipes-devtools/gcc-8/libgcc-common.inc | 12 +- .../recipes-devtools/gcc-8/libgcc-initial.inc | 6 +- .../gcc-8/libgcc-initial_8.3.bb | 2 +- contrib/recipes-devtools/gcc-8/libgcc.inc | 12 +- contrib/recipes-devtools/gcc-8/libgcc_8.3.bb | 2 +- .../recipes-devtools/gcc-8/libgfortran.inc | 14 +- ...naro-baremetal-arm-native_7.4.1-2019.02.bb | 4 +- .../gstreamer-1.14/gst-examples_git.bb | 8 +- .../gstreamer-1.14/gst-plugins-package.inc | 26 ++-- .../gstreamer-1.14/gst-validate_1.14.4.bb | 4 +- .../gstreamer1.0-libav_1.14.4.bb | 16 +-- .../gstreamer-1.14/gstreamer1.0-meta-base.bb | 22 ++-- .../gstreamer-1.14/gstreamer1.0-omx_1.14.4.bb | 8 +- .../gstreamer1.0-plugins-bad_1.14.4.bb | 10 +- .../gstreamer1.0-plugins-base_1.14.4.bb | 6 +- .../gstreamer1.0-plugins-good_1.14.4.bb | 6 +- .../gstreamer1.0-plugins-ugly_1.14.4.bb | 4 +- .../gstreamer-1.14/gstreamer1.0-plugins.inc | 2 +- .../gstreamer1.0-python_1.14.4.bb | 6 +- .../gstreamer1.0-vaapi_1.14.4.bb | 8 +- .../gstreamer-1.14/gstreamer1.0_1.14.4.bb | 10 +- .../recipes-test/tegra-tests/gpu-burn_git.bb | 2 +- .../python3-tensorrt_7.1.3-1.bb | 2 +- .../spidev-test/spidev-test.bbappend | 4 +- .../v4l2apps/v4l-utils_%.bbappend | 18 +-- .../libusbgx/libusbgx-config.bbappend | 10 +- .../libusbgx/libusbgx_%.bbappend | 8 +- .../opencv/opencv_4.5.%.bbappend | 14 +- .../docker/docker-ce_%.bbappend | 4 +- .../libnvidia-container-tools_0.9.0.bb | 6 +- .../libtirpc126_1.2.6.bb | 2 +- .../nvidia-container-runtime_3.1.0.bb | 6 +- .../nvidia-container-toolkit_1.0.5.bb | 8 +- .../nvidia-docker/nvidia-docker_2.2.2.bb | 2 +- .../recipes-kernel/linux-tegra_%.bbappend | 4 +- recipes-bsp/alsa-state/alsa-state.bbappend | 8 +- .../arm-trusted-firmware.inc | 8 +- recipes-bsp/bootlogo/bootlogo-custom_1.0.bb | 2 +- recipes-bsp/cboot/cboot-extlinux.bb | 2 +- recipes-bsp/cboot/cboot-t18x_32.5.2.bb | 2 +- recipes-bsp/cboot/cboot-t19x_32.5.2.bb | 2 +- .../l4t-usb-device-mode.bb | 2 +- .../tegra-binaries/cboot-prebuilt_32.5.2.bb | 4 +- ...amer1.0-plugins-tegra-binaryonly_32.5.2.bb | 12 +- .../tegra-binaries/libdrm-nvdc_32.5.2.bb | 14 +- .../tegra-binaries/nv-tegra-release_32.5.2.bb | 4 +- .../tegra-argus-daemon_32.5.2.bb | 4 +- .../tegra-binaries/tegra-binaries-32.5.2.inc | 4 +- .../tegra-binaries/tegra-bootfiles_32.5.2.bb | 28 ++-- .../tegra-brcm-patchram_32.5.2.bb | 2 +- .../tegra-configs-alsa_32.5.2.bb | 6 +- .../tegra-binaries/tegra-configs_32.5.2.bb | 18 +-- .../tegra-binaries/tegra-firmware_32.5.2.bb | 44 +++---- .../tegra-binaries/tegra-flashvars_32.5.2.bb | 2 +- .../tegra-binaries/tegra-libraries_32.5.2.bb | 36 +++--- .../tegra-binaries/tegra-nvphs-base_32.5.2.bb | 10 +- .../tegra-binaries/tegra-nvphs_32.5.2.bb | 4 +- .../tegra-nvpmodel-base_32.5.2.bb | 4 +- .../tegra-binaries/tegra-nvpmodel_32.5.2.bb | 4 +- .../tegra-binaries/tegra-nvs-base_32.5.2.bb | 6 +- .../tegra-nvs-service_32.5.2.bb | 4 +- .../tegra-binaries/tegra-nvstartup_32.5.2.bb | 4 +- .../tegra-redundant-boot-base_32.5.2.bb | 22 ++-- .../tegra-redundant-boot-rollback_32.5.2.bb | 4 +- .../tegra-redundant-boot_32.5.2.bb | 12 +- .../tegra-binaries/tegra-tools_32.5.2.bb | 12 +- .../tegra-binaries/tos-prebuilt_32.5.2.bb | 4 +- .../xserver-xorg-video-nvidia.inc | 10 +- .../xserver-xorg-video-nvidia_32.5.2.bb | 2 +- .../tegra-bluetooth/tegra-bluetooth_1.0.bb | 10 +- .../tegra-bup-payload_1.0.bb | 6 +- .../tegra-sources/tegra-sources-32.5.2.inc | 2 +- recipes-bsp/tegra-wifi/tegra-wifi_1.0.bb | 4 +- .../tools/setup-nv-boot-control_1.0.bb | 10 +- recipes-bsp/tools/tegra-boot-tools_2.4.0.bb | 30 ++--- .../tools/tegra-bootpart-config_1.0.bb | 6 +- recipes-bsp/tools/tegra-eeprom-tool_1.2.0.bb | 4 +- recipes-bsp/trusty/tos-trusty.bb | 2 +- recipes-bsp/trusty/trusty-l4t.inc | 12 +- recipes-bsp/u-boot/u-boot-tegra-bootimg.inc | 6 +- recipes-bsp/u-boot/u-boot-tegra_2021.04.bb | 10 +- recipes-core/busybox/busybox_%.bbappend | 6 +- .../images/tegra-minimal-initramfs.bb | 4 +- .../initrdscripts/tegra-minimal-init_1.0.bb | 4 +- .../nativesdk-packagegroup-cuda-sdk-host.bb | 2 +- .../packagegroups/packagegroup-base.bbappend | 4 +- .../cmake/tegra-cmake-overrides_1.0.2.bb | 4 +- .../cuda/cuda-binaries-common-defs.inc | 2 +- .../cuda/cuda-command-line-tools_10.2.89-1.bb | 8 +- .../cuda/cuda-compiler_10.2.89-1.bb | 8 +- .../cuda/cuda-cudart_10.2.89-1.bb | 16 +-- recipes-devtools/cuda/cuda-cufft_10.2.89-1.bb | 4 +- .../cuda/cuda-cuobjdump_10.2.89-1.bb | 2 +- recipes-devtools/cuda/cuda-cupti_10.2.89-1.bb | 6 +- .../cuda/cuda-curand_10.2.89-1.bb | 4 +- .../cuda/cuda-cusolver_10.2.89-1.bb | 4 +- .../cuda/cuda-cusparse_10.2.89-1.bb | 4 +- .../cuda/cuda-driver_10.2.89-1.bb | 4 +- recipes-devtools/cuda/cuda-gdb_10.2.89-1.bb | 10 +- .../cuda/cuda-libraries_10.2.89-1.bb | 10 +- .../cuda/cuda-memcheck_10.2.89-1.bb | 2 +- .../cuda/cuda-misc-headers_10.2.89-1.bb | 4 +- recipes-devtools/cuda/cuda-npp_10.2.89-1.bb | 4 +- .../cuda/cuda-nvcc-headers_10.2.89-1.bb | 8 +- recipes-devtools/cuda/cuda-nvcc_10.2.89-1.bb | 14 +- .../cuda/cuda-nvdisasm_10.2.89-1.bb | 2 +- .../cuda/cuda-nvgraph_10.2.89-1.bb | 4 +- recipes-devtools/cuda/cuda-nvml_10.2.89-1.bb | 6 +- .../cuda/cuda-nvprof_10.2.89-1.bb | 2 +- .../cuda/cuda-nvprune_10.2.89-1.bb | 2 +- recipes-devtools/cuda/cuda-nvrtc_10.2.89-1.bb | 4 +- recipes-devtools/cuda/cuda-nvtx_10.2.89-1.bb | 2 +- .../cuda/cuda-samples_10.2.89-1.bb | 12 +- .../cuda/cuda-shared-binaries-10.2.89-1.inc | 20 +-- .../cuda/cuda-target-environment_1.0.bb | 6 +- .../cuda/cuda-toolkit_10.2.89-1.bb | 10 +- .../cuda/libcublas_10.2.2.89-1.bb | 10 +- .../cuda/nativesdk-cuda-environment_1.0.bb | 4 +- recipes-devtools/cudnn/cudnn_8.0.0.180-1.bb | 10 +- .../deepstream/deepstream-5.1_5.1.0-1.bb | 34 ++--- recipes-devtools/gie/tensorrt_7.1.3-1.bb | 40 +++--- .../nsight-systems-cli_2020.5.3.17.bb | 10 +- .../libvisionworks-sfm_0.90.4.501.bb | 12 +- .../libvisionworks-tracking_0.88.2.501.bb | 12 +- .../visionworks/libvisionworks_1.6.0.501.bb | 14 +- recipes-devtools/vpi/libnvvpi1_1.0.15.bb | 12 +- recipes-graphics/cairo/cairo_%.bbappend | 6 +- recipes-graphics/drm/libdrm_%.bbappend | 8 +- .../l4t-graphics-demos/l4t-graphics-demos.inc | 2 +- .../l4t-graphics-demos_32.5.1.bb | 12 +- .../l4t-nvidia-glheaders_32.5.1.bb | 2 +- recipes-graphics/libglvnd/libglvnd_1.3.3.bb | 18 +-- recipes-graphics/mesa/mesa-demos_%.bbappend | 4 +- recipes-graphics/mesa/mesa-gl_%.bbappend | 2 +- recipes-graphics/mesa/mesa_%.bbappend | 34 ++--- .../vulkan/vulkan-loader_1.2.%.bbappend | 10 +- .../vulkan/vulkan-tools_1.2.%.bbappend | 4 +- recipes-graphics/wayland/egl-wayland_1.1.7.bb | 6 +- .../wayland/eglexternalplatform_1.1.bb | 4 +- recipes-graphics/wayland/weston-init.bbappend | 8 +- .../wayland/weston_9.0.0.bbappend | 14 +- .../xorg-xserver/xserver-xorg_1.20%.bbappend | 8 +- .../xwayland/xwayland_21.1%.bbappend | 8 +- recipes-kernel/linux/kernel-devsrc.bbappend | 2 +- recipes-kernel/linux/linux-tegra_4.9.bb | 20 +-- .../argus/tegra-mmapi-32.5.1.inc | 8 +- .../argus/tegra-mmapi_32.5.1.bb | 2 +- .../gstreamer1.0-omx-tegra_1.0.0-r32.5.2.bb | 14 +- .../gstreamer1.0-plugins-good_%.bbappend | 4 +- ...-plugins-nvarguscamerasrc_1.0.0-r32.5.2.bb | 2 +- ...1.0-plugins-nvcompositor_1.14.0-r32.5.2.bb | 2 +- ...0-plugins-nvdrmvideosink_1.14.0-r32.5.2.bb | 4 +- ...amer1.0-plugins-nveglgles_1.2.3-r32.5.2.bb | 14 +- ...treamer1.0-plugins-nvtee_1.14.0-r32.5.2.bb | 2 +- ...-plugins-nvv4l2camerasrc_1.14.0-r32.5.2.bb | 2 +- ...mer1.0-plugins-nvvidconv_1.14.0-r32.5.2.bb | 2 +- ...0-plugins-nvvideo4linux2_1.14.0-r32.5.2.bb | 4 +- ...1.0-plugins-nvvideosinks_1.14.0-r32.5.2.bb | 2 +- ...treamer1.0-plugins-tegra_1.14.0-r32.5.2.bb | 4 +- .../gstreamer/nvgstapps_32.5.2.bb | 14 +- .../libv4l2/libv4l2-minimal_1.18.0.bb | 12 +- .../nvbufsurface-headers_5.1.0-1.bb | 2 +- 197 files changed, 1024 insertions(+), 1024 deletions(-) diff --git a/classes/container-runtime-csv.bbclass b/classes/container-runtime-csv.bbclass index 5f66a2f1..65cb1b51 100644 --- a/classes/container-runtime-csv.bbclass +++ b/classes/container-runtime-csv.bbclass @@ -62,9 +62,9 @@ python populate_container_csv() { } CONTAINERCSVFUNC = "" -CONTAINERCSVFUNC_tegra = "populate_container_csv" +CONTAINERCSVFUNC:tegra = "populate_container_csv" do_install[postfuncs] += "${CONTAINERCSVFUNC}" -PACKAGES_prepend_tegra = " ${CONTAINER_CSV_PKGNAME} " -FILES_${CONTAINER_CSV_PKGNAME} = "${sysconfdir}/nvidia-container-runtime" -RDEPENDS_${PN}_append_tegra = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${CONTAINER_CSV_PKGNAME}', '', d)}" +PACKAGES::prepend:tegra = " ${CONTAINER_CSV_PKGNAME} " +FILES:${CONTAINER_CSV_PKGNAME} = "${sysconfdir}/nvidia-container-runtime" +RDEPENDS:${PN}:append:tegra = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${CONTAINER_CSV_PKGNAME}', '', d)}" diff --git a/classes/cuda.bbclass b/classes/cuda.bbclass index 0ba59d91..307a885e 100644 --- a/classes/cuda.bbclass +++ b/classes/cuda.bbclass @@ -10,8 +10,8 @@ CUDA_LDFLAGS = "\ -Wl,-rpath,/usr/local/cuda-${CUDA_VERSION}/${baselib} \ " -LDFLAGS_prepend_cuda = "${TOOLCHAIN_OPTIONS} " -LDFLAGS_append_cuda = " ${CUDA_LDFLAGS}" +LDFLAGS:prepend:cuda = "${TOOLCHAIN_OPTIONS} " +LDFLAGS:append:cuda = " ${CUDA_LDFLAGS}" def cuda_extract_compiler(compiler, d, prefix='-Xcompiler '): args = d.getVar(compiler).split() @@ -49,7 +49,7 @@ CUDA_EXTRA_OECMAKE = '\ -DCUDA_TOOLKIT_ROOT_DIR=${STAGING_DIR_NATIVE}/usr/local/cuda-${CUDA_VERSION} \ -DCUDA_NVCC_FLAGS="${CUDA_NVCC_FLAGS}" \ ' -EXTRA_OECMAKE_append_cuda = " ${CUDA_EXTRA_OECMAKE}" +EXTRA_OECMAKE:append:cuda = " ${CUDA_EXTRA_OECMAKE}" export CUDA_TOOLKIT_ROOT = "${STAGING_DIR_NATIVE}/usr/local/cuda-${CUDA_VERSION}" export CUDA_NVCC_EXECUTABLE = "${CUDA_TOOLKIT_ROOT}/bin/nvcc" @@ -57,15 +57,15 @@ export CUDACXX = "${CCACHE}${CUDA_TOOLKIT_ROOT}/bin/nvcc" export CUDA_PATH = "${STAGING_DIR_HOST}/usr/local/cuda-${CUDA_VERSION}" CUDA_NATIVEDEPS = "cuda-compiler-native cuda-cudart-native" -CUDA_NATIVEDEPS_class-native = "" +CUDA_NATIVEDEPS:class-native = "" CUDA_DEPENDS = "cuda-libraries ${CUDA_NATIVEDEPS}" -DEPENDS_append_cuda = " ${CUDA_DEPENDS} ${@'tegra-cmake-overrides' if bb.data.inherits_class('cmake', d) else ''}" -PATH_prepend_cuda = "${STAGING_DIR_NATIVE}/usr/local/cuda-${CUDA_VERSION}/bin:" +DEPENDS:append:cuda = " ${CUDA_DEPENDS} ${@'tegra-cmake-overrides' if bb.data.inherits_class('cmake', d) else ''}" +PATH:prepend:cuda = "${STAGING_DIR_NATIVE}/usr/local/cuda-${CUDA_VERSION}/bin:" # The following are for the new-style (CMake 3.8+) CUDA language # support and to hook in our override of FindCUDA.cmake. -cmake_do_generate_toolchain_file_append_cuda() { +cmake_do_generate_toolchain_file:append:cuda() { cat >> ${WORKDIR}/toolchain.cmake < $destdir/flash.xml.in } -tegraflash_create_flash_config_tegra186() { +tegraflash_create_flash_config:tegra186() { local destdir="$1" local lnxfile="$2" @@ -237,7 +237,7 @@ tegraflash_create_flash_config_tegra186() { > $destdir/flash.xml.in } -tegraflash_create_flash_config_tegra194() { +tegraflash_create_flash_config:tegra194() { local destdir="$1" local lnxfile="$2" local cbotag @@ -273,7 +273,7 @@ tegraflash_create_flash_config_tegra194() { } BOOTFILES = "" -BOOTFILES_tegra210 = "\ +BOOTFILES:tegra210 = "\ eks.img \ nvtboot_recovery.bin \ nvtboot.bin \ @@ -282,7 +282,7 @@ BOOTFILES_tegra210 = "\ rp4.blob \ sc7entry-firmware.bin \ " -BOOTFILES_tegra186 = "\ +BOOTFILES:tegra186 = "\ adsp-fw.bin \ bpmp.bin \ camera-rtcpu-sce.img \ @@ -304,7 +304,7 @@ BOOTFILES_tegra186 = "\ emmc.cfg \ " -BOOTFILES_tegra194 = "\ +BOOTFILES:tegra194 = "\ adsp-fw.bin \ bpmp_t194.bin \ camera-rtcpu-rce.img \ @@ -329,7 +329,7 @@ create_tegraflash_pkg() { : } -create_tegraflash_pkg_tegra210() { +create_tegraflash_pkg:tegra210() { PATH="${STAGING_BINDIR_NATIVE}/tegra210-flash:${PATH}" rm -rf "${WORKDIR}/tegraflash" mkdir -p "${WORKDIR}/tegraflash" @@ -403,7 +403,7 @@ END cd $oldwd } -create_tegraflash_pkg_tegra186() { +create_tegraflash_pkg:tegra186() { local f PATH="${STAGING_BINDIR_NATIVE}/tegra186-flash:${PATH}" rm -rf "${WORKDIR}/tegraflash" @@ -481,7 +481,7 @@ END cd $oldwd } -create_tegraflash_pkg_tegra194() { +create_tegraflash_pkg:tegra194() { local f PATH="${STAGING_BINDIR_NATIVE}/tegra186-flash:${PATH}" rm -rf "${WORKDIR}/tegraflash" @@ -616,7 +616,7 @@ EOF chmod +x $outfile } -IMAGE_CMD_tegraflash = "create_tegraflash_pkg" +IMAGE_CMD:tegraflash = "create_tegraflash_pkg" TEGRAFLASH_PKG_DEPENDS = "${@'zip-native:do_populate_sysroot' if d.getVar('TEGRAFLASH_PACKAGE_FORMAT') == 'zip' else '${CONVERSION_DEPENDS_gz}:do_populate_sysroot'}" do_image_tegraflash[depends] += "${TEGRAFLASH_PKG_DEPENDS} dtc-native:do_populate_sysroot coreutils-native:do_populate_sysroot \ ${SOC_FAMILY}-flashtools-native:do_populate_sysroot gptfdisk-native:do_populate_sysroot \ diff --git a/classes/l4t_deb_pkgfeed.bbclass b/classes/l4t_deb_pkgfeed.bbclass index 5d8d4733..9689671a 100644 --- a/classes/l4t_deb_pkgfeed.bbclass +++ b/classes/l4t_deb_pkgfeed.bbclass @@ -5,7 +5,7 @@ L4T_DEB_FEED_BASE ??= "https://repo.download.nvidia.com/jetson" inherit l4t_bsp L4T_DEB_COMP_DEFAULT = "main" -L4T_DEB_COMP_DEFAULT_x86-64 = "r${@'.'.join(d.getVar('L4T_VERSION').split('.')[0:2])}" +L4T_DEB_COMP_DEFAULT:x86-64 = "r${@'.'.join(d.getVar('L4T_VERSION').split('.')[0:2])}" L4T_DEB_COMP ?= "${L4T_DEB_COMP_DEFAULT}" def l4t_deb_src_uri(d): @@ -45,9 +45,9 @@ SRC_URI = "${@l4t_deb_src_uri(d)}" do_unpack[depends] += "zstd-native:do_populate_sysroot" do_unpack[depends] += "tar-l4t-workaround-native:do_populate_sysroot" -EXTRANATIVEPATH_append_task-unpack = " tar-l4t-workaround-native" +EXTRANATIVEPATH:append_task-unpack = " tar-l4t-workaround-native" -do_unpack_prepend() { +do_unpack:prepend() { path = d.getVar('PATH') subpath = ':'.join([p for p in path.split(':') if 'tar-l4t-workaround-native' not in p]) os.environ['TAR_WRAPPER_STRIPPED_PATH'] = subpath diff --git a/conf/machine/include/tegra-common.inc b/conf/machine/include/tegra-common.inc index 7c0af242..6b818fed 100644 --- a/conf/machine/include/tegra-common.inc +++ b/conf/machine/include/tegra-common.inc @@ -1,7 +1,7 @@ MACHINEOVERRIDES =. "cuda:tegra:" SOC_FAMILY_PKGARCH = "${ARMPKGARCH}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}_${SOC_FAMILY}" -TEGRA_PKGARCH = "${ARMPKGARCH}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}_tegra" -PACKAGE_EXTRA_ARCHS_append = " ${TEGRA_PKGARCH} ${SOC_FAMILY_PKGARCH}" +TEGRA_PKGARCH = "${ARMPKGARCH}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU:}:tegra" +PACKAGE_EXTRA_ARCHS:append = " ${TEGRA_PKGARCH} ${SOC_FAMILY_PKGARCH}" KERNEL_IMAGETYPES ?= "Image.gz Image" KERNEL_IMAGETYPE ?= "Image.gz" @@ -35,7 +35,7 @@ PREFERRED_PROVIDER_virtual/bootlogo ?= "bootlogo-prebuilt" IMAGE_ROOTFS_ALIGNMENT ?= "4" TEGRA_BLBLOCKSIZE ?= "${@int(d.getVar('IMAGE_ROOTFS_ALIGNMENT')) * 1024}" -EXTRA_IMAGECMD_ext4 ?= "-i 4096 -b 4096" +EXTRA_IMAGECMD:ext4 ?= "-i 4096 -b 4096" IMAGE_CLASSES += "image_types_tegra" IMAGE_FSTYPES ?= "tegraflash" diff --git a/conf/machine/include/tegra186.inc b/conf/machine/include/tegra186.inc index 7e76695c..e92063f9 100644 --- a/conf/machine/include/tegra186.inc +++ b/conf/machine/include/tegra186.inc @@ -13,7 +13,7 @@ TEGRA_ESSENTIAL_EXTRA_RDEPENDS = "${@'' if d.getVar('PREFERRED_PROVIDER_virtual/ INITRAMFS_IMAGE ?= "tegra-minimal-initramfs" INITRAMFS_IMAGE_BUNDLE ?= "${@'1' if d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') else ''}" IMAGE_UBOOT ?= "${@'' if d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') else 'u-boot'}" -INITRAMFS_FSTYPES_append = "${@'' if not (d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') and d.getVar('INITRAMFS_IMAGE_BUNDLE') != '1') else ' cpio.gz.cboot cpio.gz.cboot.bup-payload'}" +INITRAMFS_FSTYPES:append = "${@'' if not (d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') and d.getVar('INITRAMFS_IMAGE_BUNDLE') != '1') else ' cpio.gz.cboot cpio.gz.cboot.bup-payload'}" TEGRA_AUDIO_DEVICE ?= "tegrahda" diff --git a/conf/machine/include/tegra194.inc b/conf/machine/include/tegra194.inc index 9aa0d781..88b2a86a 100644 --- a/conf/machine/include/tegra194.inc +++ b/conf/machine/include/tegra194.inc @@ -9,7 +9,7 @@ require conf/machine/include/arm/arch-armv8-2a.inc INITRAMFS_IMAGE ?= "tegra-minimal-initramfs" INITRAMFS_IMAGE_BUNDLE ?= "1" IMAGE_UBOOT ?= "" -INITRAMFS_FSTYPES_append = "${@'' if d.getVar('INITRAMFS_IMAGE_BUNDLE') == '1' else ' cpio.gz.cboot cpio.gz.cboot.bup-payload'}" +INITRAMFS_FSTYPES:append = "${@'' if d.getVar('INITRAMFS_IMAGE_BUNDLE') == '1' else ' cpio.gz.cboot cpio.gz.cboot.bup-payload'}" TEGRA_AUDIO_DEVICE ?= "tegrahdat194ref" diff --git a/contrib/recipes-devtools/gcc-7/gcc-7.3.inc b/contrib/recipes-devtools/gcc-7/gcc-7.3.inc index b8985527..13adbb03 100644 --- a/contrib/recipes-devtools/gcc-7/gcc-7.3.inc +++ b/contrib/recipes-devtools/gcc-7/gcc-7.3.inc @@ -97,7 +97,7 @@ JAVA = "" LTO = "--enable-lto" SSP ?= "--disable-libssp" -SSP_mingw32 = "--enable-libssp" +SSP:mingw32 = "--enable-libssp" EXTRA_OECONF_BASE = "\ ${LTO} \ diff --git a/contrib/recipes-devtools/gcc-7/gcc-common.inc b/contrib/recipes-devtools/gcc-7/gcc-common.inc index fdf0dd86..056afc2e 100644 --- a/contrib/recipes-devtools/gcc-7/gcc-common.inc +++ b/contrib/recipes-devtools/gcc-7/gcc-common.inc @@ -11,7 +11,7 @@ inherit autotools gettext texinfo BPN = "gcc" COMPILERDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}gcc:do_gcc_stash_builddir" -COMPILERDEP_class-nativesdk = "virtual/${TARGET_PREFIX}gcc-crosssdk:do_gcc_stash_builddir" +COMPILERDEP:class-nativesdk = "virtual/${TARGET_PREFIX}gcc-crosssdk:do_gcc_stash_builddir" python extract_stashed_builddir () { src = d.expand("${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}") @@ -45,7 +45,7 @@ def get_long_double_setting(bb, d): if d.getVar('TRANSLATED_TARGET_ARCH') in [ 'powerpc', 'powerpc64' ] and d.getVar('TCLIBC') in [ 'glibc' ]: return "--with-long-double-128" else: - return "--without-long-double-128 libgcc_cv_powerpc_float128=no" + return "--without-long-double-128 libgcc_cv:powerpc_float128=no" return "" def get_gcc_multiarch_setting(bb, d): @@ -88,7 +88,7 @@ def get_tune_parameters(tune, d): get_tune_parameters[vardepsexclude] = "AVAILTUNES TUNE_CCARGS OVERRIDES TUNE_FEATURES BASE_LIB BASELIB TUNE_ARCH ABIEXTENSION TARGET_FPU TUNE_PKGARCH PACKAGE_EXTRA_ARCHS" -DEBIANNAME_${MLPREFIX}libgcc = "libgcc1" +DEBIANNAME:${MLPREFIX}libgcc = "libgcc1" MIRRORS =+ "\ ${GNU_MIRROR}/gcc ftp://gcc.gnu.org/pub/gcc/releases/ \n \ diff --git a/contrib/recipes-devtools/gcc-7/gcc-configure-common.inc b/contrib/recipes-devtools/gcc-7/gcc-configure-common.inc index 375c5e90..18dbe1b5 100644 --- a/contrib/recipes-devtools/gcc-7/gcc-configure-common.inc +++ b/contrib/recipes-devtools/gcc-7/gcc-configure-common.inc @@ -7,9 +7,9 @@ require gcc-shared-source.inc # Java (gcj doesn't work on all architectures) JAVA ?= ",java" -JAVA_arm ?= "" -JAVA_armeb ?= "" -JAVA_mipsel ?= "" +JAVA:arm ?= "" +JAVA:armeb ?= "" +JAVA:mipsel ?= "" JAVA_sh3 ?= "" # gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran' FORTRAN ?= ",f77" @@ -48,27 +48,27 @@ EXTRA_OECONF = "\ # glibc version is a minimum controlling whether features are enabled. # Doesn't need to track glibc exactly -EXTRA_OECONF_append_libc-glibc = " --with-glibc-version=2.28 " +EXTRA_OECONF:append:libc-glibc = " --with-glibc-version=2.28 " # Set this here since GCC configure won't auto-detect and enable # initfini-arry when cross compiling. -EXTRA_OECONF_append = " --enable-initfini-array" +EXTRA_OECONF:append = " --enable-initfini-array" export gcc_cv_collect2_libs = 'none required' # We need to set gcc_cv_collect2_libs else there is cross-compilation badness # in the config.log files (which might not get generated until do_compile # hence being missed by the insane do_configure check). -EXTRA_OECONF_append_linux = " --enable-__cxa_atexit" +EXTRA_OECONF:append_linux = " --enable-__cxa_atexit" -EXTRA_OECONF_append_mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" -EXTRA_OECONF_append_mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" -EXTRA_OECONF_append_mips64n32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" -EXTRA_OECONF_append_mips64eln32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" -EXTRA_OECONF_append_mipsisa32r6el = " --with-abi=32 --with-arch=mips32r6" -EXTRA_OECONF_append_mipsisa32r6 = " --with-abi=32 --with-arch=mips32r6" -EXTRA_OECONF_append_mipsisa64r6el = " --with-abi=64 --with-arch-64=mips64r6" -EXTRA_OECONF_append_mipsisa64r6 = " --with-abi=64 --with-arch-64=mips64r6" +EXTRA_OECONF:append:mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" +EXTRA_OECONF:append:mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" +EXTRA_OECONF:append:mips64n32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" +EXTRA_OECONF:append:mips64eln32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" +EXTRA_OECONF:append:mipsisa32r6el = " --with-abi=32 --with-arch=mips32r6" +EXTRA_OECONF:append:mipsisa32r6 = " --with-abi=32 --with-arch=mips32r6" +EXTRA_OECONF:append:mipsisa64r6el = " --with-abi=64 --with-arch-64=mips64r6" +EXTRA_OECONF:append:mipsisa64r6 = " --with-abi=64 --with-arch-64=mips64r6" EXTRA_OECONF_GCC_FLOAT ??= "" CPPFLAGS = "" @@ -77,7 +77,7 @@ SYSTEMHEADERS = "${target_includedir}" SYSTEMLIBS = "${target_base_libdir}/" SYSTEMLIBS1 = "${target_libdir}/" -do_configure_prepend () { +do_configure:prepend () { # teach gcc to find correct target includedir when checking libc ssp support mkdir -p ${B}/gcc echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe diff --git a/contrib/recipes-devtools/gcc-7/gcc-cross-canadian.inc b/contrib/recipes-devtools/gcc-7/gcc-cross-canadian.inc index cdce42e4..ec9a859e 100644 --- a/contrib/recipes-devtools/gcc-7/gcc-cross-canadian.inc +++ b/contrib/recipes-devtools/gcc-7/gcc-cross-canadian.inc @@ -65,7 +65,7 @@ do_compile () { PACKAGES = "${PN}-dbg ${PN} ${PN}-doc" -FILES_${PN} = "\ +FILES:${PN} = "\ ${exec_prefix}/bin/* \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/* \ ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \ @@ -80,9 +80,9 @@ FILES_${PN} = "\ ${prefix}/${TARGET_SYS}/lib/* \ ${prefix}/${TARGET_SYS}${target_includedir}/* \ " -INSANE_SKIP_${PN} += "dev-so" +INSANE_SKIP:${PN} += "dev-so" -FILES_${PN}-doc = "\ +FILES:${PN}-doc = "\ ${infodir} \ ${mandir} \ ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \ @@ -149,7 +149,7 @@ do_install () { ELFUTILS = "nativesdk-elfutils" DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib" -RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}" +RDEPENDS:${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}" SYSTEMHEADERS = "${target_includedir}/" SYSTEMLIBS = "${target_base_libdir}/" @@ -157,9 +157,9 @@ SYSTEMLIBS1 = "${target_libdir}/" EXTRA_OECONF += "--enable-poison-system-directories" -EXTRA_OECONF_append_libc-baremetal = " --without-headers" -EXTRA_OECONF_remove_libc-baremetal = "--with-sysroot=/not/exist" -EXTRA_OECONF_remove_libc-baremetal = "--with-build-sysroot=${STAGING_DIR_TARGET}" +EXTRA_OECONF:append:libc-baremetal = " --without-headers" +EXTRA_OECONF:remove:libc-baremetal = "--with-sysroot=/not/exist" +EXTRA_OECONF:remove:libc-baremetal = "--with-build-sysroot=${STAGING_DIR_TARGET}" # gcc 4.7 needs -isystem export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}" diff --git a/contrib/recipes-devtools/gcc-7/gcc-cross.inc b/contrib/recipes-devtools/gcc-7/gcc-cross.inc index 5a6ce6e1..25dfdb7a 100644 --- a/contrib/recipes-devtools/gcc-7/gcc-cross.inc +++ b/contrib/recipes-devtools/gcc-7/gcc-cross.inc @@ -22,7 +22,7 @@ require gcc-configure-common.inc LINKER_HASH_STYLE ?= "sysv" EXTRA_OECONF += "--enable-poison-system-directories" -EXTRA_OECONF_append_sh4 = " \ +EXTRA_OECONF:append:sh4 = " \ --with-multilib-list= \ --enable-incomplete-targets \ " @@ -31,9 +31,9 @@ EXTRA_OECONF += "\ --with-system-zlib \ " -EXTRA_OECONF_append_libc-baremetal = " --without-headers" -EXTRA_OECONF_remove_libc-baremetal = "--enable-threads=posix" -EXTRA_OECONF_remove_libc-newlib = "--enable-threads=posix" +EXTRA_OECONF:append:libc-baremetal = " --without-headers" +EXTRA_OECONF:remove:libc-baremetal = "--enable-threads=posix" +EXTRA_OECONF:remove:libc-newlib = "--enable-threads=posix" EXTRA_OECONF_PATHS = "\ --with-gxx-include-dir=/not/exist${target_includedir}/c++/${BINV} \ @@ -43,7 +43,7 @@ EXTRA_OECONF_PATHS = "\ ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" -do_configure_prepend () { +do_configure:prepend () { install -d ${RECIPE_SYSROOT}${target_includedir} touch ${RECIPE_SYSROOT}${target_includedir}/limits.h } diff --git a/contrib/recipes-devtools/gcc-7/gcc-multilib-config.inc b/contrib/recipes-devtools/gcc-7/gcc-multilib-config.inc index 31b8619b..e90580d1 100644 --- a/contrib/recipes-devtools/gcc-7/gcc-multilib-config.inc +++ b/contrib/recipes-devtools/gcc-7/gcc-multilib-config.inc @@ -170,7 +170,7 @@ python gcc_multilib_setup() { header_config_files = gcc_header_config_files[target_arch] ml_list = ['DEFAULTTUNE_MULTILIB_ORIGINAL' if mlprefix else 'DEFAULTTUNE'] - mltunes = [('DEFAULTTUNE_virtclass-multilib-%s' % ml) for ml in multilibs] + mltunes = [('DEFAULTTUNE:virtclass-multilib-%s' % ml) for ml in multilibs] if mlprefix: mlindex = 0 for ml in multilibs: diff --git a/contrib/recipes-devtools/gcc-7/gcc-runtime.inc b/contrib/recipes-devtools/gcc-7/gcc-runtime.inc index 50ecc815..49aa46f3 100644 --- a/contrib/recipes-devtools/gcc-7/gcc-runtime.inc +++ b/contrib/recipes-devtools/gcc-7/gcc-runtime.inc @@ -6,7 +6,7 @@ SUMMARY = "Runtime libraries from GCC" # All gcc-runtime packages are now covered by the runtime exception. LICENSE = "GPL-3.0-with-GCC-exception" -CXXFLAGS_remove = "-fvisibility-inlines-hidden" +CXXFLAGS:remove = "-fvisibility-inlines-hidden" EXTRA_OECONF_PATHS = "\ --with-gxx-include-dir=${includedir}/c++/${BINV} \ @@ -14,17 +14,17 @@ EXTRA_OECONF_PATHS = "\ --with-build-sysroot=${STAGING_DIR_TARGET} \ " -EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" +EXTRA_OECONF:append:linuxstdbase = " --enable-clocale=gnu" RUNTIMELIBITM = "libitm" -RUNTIMELIBITM_arc = "" -RUNTIMELIBITM_mipsarch = "" -RUNTIMELIBITM_nios2 = "" -RUNTIMELIBITM_microblaze = "" -RUNTIMELIBITM_riscv32 = "" -RUNTIMELIBITM_riscv64 = "" +RUNTIMELIBITM:arc = "" +RUNTIMELIBITM:mipsarch = "" +RUNTIMELIBITM:nios2 = "" +RUNTIMELIBITM:microblaze = "" +RUNTIMELIBITM:riscv32 = "" +RUNTIMELIBITM:riscv64 = "" RUNTIMELIBSSP ?= "" -RUNTIMELIBSSP_mingw32 ?= "libssp" +RUNTIMELIBSSP:mingw32 ?= "libssp" RUNTIMETARGET = "${RUNTIMELIBSSP} libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \ ${@bb.utils.contains_any('FORTRAN', [',fortran',',f77'], 'libquadmath', '', d)} \ @@ -37,7 +37,7 @@ RUNTIMETARGET = "${RUNTIMELIBSSP} libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM SLIB = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" SLIB_NEW = "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}" -DEBUG_PREFIX_MAP_class-target = " \ +DEBUG_PREFIX_MAP:class-target = " \ -fdebug-prefix-map=${WORKDIR}/recipe-sysroot= \ -fdebug-prefix-map=${WORKDIR}/recipe-sysroot-native= \ -fdebug-prefix-map=${SLIB}=${SLIB_NEW} \ @@ -91,7 +91,7 @@ do_install () { } -do_install_append_class-target () { +do_install:append:class-target () { if [ "${TARGET_OS}" = "linux-gnuspe" ]; then ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux fi @@ -158,104 +158,104 @@ PACKAGES = "\ libitm-staticdev \ " # The base package doesn't exist, so we clear the recommends. -RRECOMMENDS_${PN}-dbg = "" +RRECOMMENDS:${PN}-dbg = "" # include python debugging scripts -FILES_${PN}-dbg += "\ +FILES:${PN}-dbg += "\ ${libdir}/libstdc++.so.*-gdb.py \ ${datadir}/gcc-${BINV}/python/libstdcxx \ " -FILES_libg2c = "${target_libdir}/libg2c.so.*" -SUMMARY_libg2c = "Companion runtime library for g77" -FILES_libg2c-dev = "\ +FILES:libg2c = "${target_libdir}/libg2c.so.*" +SUMMARY:libg2c = "Companion runtime library for g77" +FILES:libg2c-dev = "\ ${libdir}/libg2c.so \ ${libdir}/libg2c.a \ ${libdir}/libfrtbegin.a \ " -SUMMARY_libg2c-dev = "Companion runtime library for g77 - development files" +SUMMARY:libg2c-dev = "Companion runtime library for g77 - development files" -FILES_libstdc++ = "${libdir}/libstdc++.so.*" -SUMMARY_libstdc++ = "GNU standard C++ library" -FILES_libstdc++-dev = "\ +FILES:libstdc++ = "${libdir}/libstdc++.so.*" +SUMMARY:libstdc++ = "GNU standard C++ library" +FILES:libstdc++-dev = "\ ${includedir}/c++/ \ ${libdir}/libstdc++.so \ ${libdir}/libstdc++*.la \ ${libdir}/libsupc++.la \ " -SUMMARY_libstdc++-dev = "GNU standard C++ library - development files" -FILES_libstdc++-staticdev = "\ +SUMMARY:libstdc++-dev = "GNU standard C++ library - development files" +FILES:libstdc++-staticdev = "\ ${libdir}/libstdc++*.a \ ${libdir}/libsupc++.a \ " -SUMMARY_libstdc++-staticdev = "GNU standard C++ library - static development files" +SUMMARY:libstdc++-staticdev = "GNU standard C++ library - static development files" -FILES_libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch" -SUMMARY_libstdc++-precompile-dev = "GNU standard C++ library - precompiled header files" +FILES:libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch" +SUMMARY:libstdc++-precompile-dev = "GNU standard C++ library - precompiled header files" -FILES_libssp = "${libdir}/libssp.so.*" -SUMMARY_libssp = "GNU stack smashing protection library" -FILES_libssp-dev = "\ +FILES:libssp = "${libdir}/libssp.so.*" +SUMMARY:libssp = "GNU stack smashing protection library" +FILES:libssp-dev = "\ ${libdir}/libssp*.so \ ${libdir}/libssp*_nonshared.a \ ${libdir}/libssp*.la \ ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ssp \ " -SUMMARY_libssp-dev = "GNU stack smashing protection library - development files" -FILES_libssp-staticdev = "${libdir}/libssp*.a" -SUMMARY_libssp-staticdev = "GNU stack smashing protection library - static development files" +SUMMARY:libssp-dev = "GNU stack smashing protection library - development files" +FILES:libssp-staticdev = "${libdir}/libssp*.a" +SUMMARY:libssp-staticdev = "GNU stack smashing protection library - static development files" -FILES_libquadmath = "${libdir}/libquadmath*.so.*" -SUMMARY_libquadmath = "GNU quad-precision math library" -FILES_libquadmath-dev = "\ +FILES:libquadmath = "${libdir}/libquadmath*.so.*" +SUMMARY:libquadmath = "GNU quad-precision math library" +FILES:libquadmath-dev = "\ ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/quadmath* \ ${libdir}/libquadmath*.so \ ${libdir}/libquadmath.la \ " -SUMMARY_libquadmath-dev = "GNU quad-precision math library - development files" -FILES_libquadmath-staticdev = "${libdir}/libquadmath.a" -SUMMARY_libquadmath-staticdev = "GNU quad-precision math library - static development files" +SUMMARY:libquadmath-dev = "GNU quad-precision math library - development files" +FILES:libquadmath-staticdev = "${libdir}/libquadmath.a" +SUMMARY:libquadmath-staticdev = "GNU quad-precision math library - static development files" # NOTE: mudflap has been removed as of gcc 4.9 and has been superseded by the address sanitiser -FILES_libmudflap = "${libdir}/libmudflap*.so.*" -SUMMARY_libmudflap = "Pointer debugging library for gcc" -FILES_libmudflap-dev = "\ +FILES:libmudflap = "${libdir}/libmudflap*.so.*" +SUMMARY:libmudflap = "Pointer debugging library for gcc" +FILES:libmudflap-dev = "\ ${libdir}/libmudflap*.so \ ${libdir}/libmudflap.la \ " -SUMMARY_libmudflap-dev = "Pointer debugging library for gcc - development files" -FILES_libmudflap-staticdev = "${libdir}/libmudflap.a" -SUMMARY_libmudflap-staticdev = "Pointer debugging library for gcc - static development files" +SUMMARY:libmudflap-dev = "Pointer debugging library for gcc - development files" +FILES:libmudflap-staticdev = "${libdir}/libmudflap.a" +SUMMARY:libmudflap-staticdev = "Pointer debugging library for gcc - static development files" -FILES_libgomp = "${libdir}/libgomp*${SOLIBS}" -SUMMARY_libgomp = "GNU OpenMP parallel programming library" -FILES_libgomp-dev = "\ +FILES:libgomp = "${libdir}/libgomp*${SOLIBS}" +SUMMARY:libgomp = "GNU OpenMP parallel programming library" +FILES:libgomp-dev = "\ ${libdir}/libgomp*${SOLIBSDEV} \ ${libdir}/libgomp*.la \ ${libdir}/libgomp.spec \ ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/omp.h \ " -SUMMARY_libgomp-dev = "GNU OpenMP parallel programming library - development files" -FILES_libgomp-staticdev = "${libdir}/libgomp*.a" -SUMMARY_libgomp-staticdev = "GNU OpenMP parallel programming library - static development files" +SUMMARY:libgomp-dev = "GNU OpenMP parallel programming library - development files" +FILES:libgomp-staticdev = "${libdir}/libgomp*.a" +SUMMARY:libgomp-staticdev = "GNU OpenMP parallel programming library - static development files" -FILES_libatomic = "${libdir}/libatomic.so.*" -SUMMARY_libatomic = "GNU C++11 atomics support library" -FILES_libatomic-dev = "\ +FILES:libatomic = "${libdir}/libatomic.so.*" +SUMMARY:libatomic = "GNU C++11 atomics support library" +FILES:libatomic-dev = "\ ${libdir}/libatomic.so \ ${libdir}/libatomic.la \ " -SUMMARY_libatomic-dev = "GNU C++11 atomics support library - development files" -FILES_libatomic-staticdev = "${libdir}/libatomic.a" -SUMMARY_libatomic-staticdev = "GNU C++11 atomics support library - static development files" +SUMMARY:libatomic-dev = "GNU C++11 atomics support library - development files" +FILES:libatomic-staticdev = "${libdir}/libatomic.a" +SUMMARY:libatomic-staticdev = "GNU C++11 atomics support library - static development files" -FILES_libitm = "${libdir}/libitm.so.*" -SUMMARY_libitm = "GNU transactional memory support library" -FILES_libitm-dev = "\ +FILES:libitm = "${libdir}/libitm.so.*" +SUMMARY:libitm = "GNU transactional memory support library" +FILES:libitm-dev = "\ ${libdir}/libitm.so \ ${libdir}/libitm.la \ ${libdir}/libitm.spec \ " -SUMMARY_libitm-dev = "GNU transactional memory support library - development files" -FILES_libitm-staticdev = "${libdir}/libitm.a" -SUMMARY_libitm-staticdev = "GNU transactional memory support library - static development files" +SUMMARY:libitm-dev = "GNU transactional memory support library - development files" +FILES:libitm-staticdev = "${libdir}/libitm.a" +SUMMARY:libitm-staticdev = "GNU transactional memory support library - static development files" diff --git a/contrib/recipes-devtools/gcc-7/gcc-runtime_7.3.bb b/contrib/recipes-devtools/gcc-7/gcc-runtime_7.3.bb index 48c421e9..02776050 100644 --- a/contrib/recipes-devtools/gcc-7/gcc-runtime_7.3.bb +++ b/contrib/recipes-devtools/gcc-7/gcc-runtime_7.3.bb @@ -1,7 +1,7 @@ require gcc-${PV}.inc require gcc-runtime.inc -FILES_libgomp-dev += "\ +FILES:libgomp-dev += "\ ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/openacc.h \ " diff --git a/contrib/recipes-devtools/gcc-7/gcc-sanitizers.inc b/contrib/recipes-devtools/gcc-7/gcc-sanitizers.inc index e5e84526..a565ed87 100644 --- a/contrib/recipes-devtools/gcc-7/gcc-sanitizers.inc +++ b/contrib/recipes-devtools/gcc-7/gcc-sanitizers.inc @@ -42,7 +42,7 @@ do_install () { } INHIBIT_DEFAULT_DEPS = "1" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" DEPENDS = "gcc-runtime virtual/${TARGET_PREFIX}gcc" BBCLASSEXTEND = "nativesdk" @@ -52,19 +52,19 @@ PACKAGES += "libasan libubsan liblsan libtsan" PACKAGES += "libasan-dev libubsan-dev liblsan-dev libtsan-dev" PACKAGES += "libasan-staticdev libubsan-staticdev liblsan-staticdev libtsan-staticdev" -RDEPENDS_libasan += "libstdc++" -RDEPENDS_libubsan += "libstdc++" -RDEPENDS_liblsan += "libstdc++" -RDEPENDS_libtsan += "libstdc++" -RDEPENDS_libasan-dev += "${PN}" -RDEPENDS_libubsan-dev += "${PN}" -RDEPENDS_liblsan-dev += "${PN}" -RDEPENDS_libtsan-dev += "${PN}" -RRECOMMENDS_${PN} += "libasan libubsan" -RRECOMMENDS_${PN}_append_x86 = " liblsan" -RRECOMMENDS_${PN}_append_x86-64 = " liblsan libtsan" -RRECOMMENDS_${PN}_append_powerpc64 = " liblsan libtsan" -RRECOMMENDS_${PN}_append_aarch64 = " liblsan libtsan" +RDEPENDS:libasan += "libstdc++" +RDEPENDS:libubsan += "libstdc++" +RDEPENDS:liblsan += "libstdc++" +RDEPENDS:libtsan += "libstdc++" +RDEPENDS:libasan-dev += "${PN}" +RDEPENDS:libubsan-dev += "${PN}" +RDEPENDS:liblsan-dev += "${PN}" +RDEPENDS:libtsan-dev += "${PN}" +RRECOMMENDS:${PN} += "libasan libubsan" +RRECOMMENDS:${PN}:append:x86 = " liblsan" +RRECOMMENDS:${PN}:append:x86-64 = " liblsan libtsan" +RRECOMMENDS:${PN}:append:powerpc64 = " liblsan libtsan" +RRECOMMENDS:${PN}:append:aarch64 = " liblsan libtsan" do_package_write_ipk[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata" do_package_write_deb[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata" @@ -73,37 +73,37 @@ do_package_write_rpm[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlib # Only x86, powerpc, sparc, s390, arm, and aarch64 are supported COMPATIBLE_HOST = '(x86_64|i.86|powerpc|sparc|s390|arm|aarch64).*-linux' # musl is currently broken entirely -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' -FILES_libasan += "${libdir}/libasan.so.*" -FILES_libasan-dev += "\ +FILES:libasan += "${libdir}/libasan.so.*" +FILES:libasan-dev += "\ ${libdir}/libasan_preinit.o \ ${libdir}/libasan.so \ ${libdir}/libasan.la \ " -FILES_libasan-staticdev += "${libdir}/libasan.a" +FILES:libasan-staticdev += "${libdir}/libasan.a" -FILES_libubsan += "${libdir}/libubsan.so.*" -FILES_libubsan-dev += "\ +FILES:libubsan += "${libdir}/libubsan.so.*" +FILES:libubsan-dev += "\ ${libdir}/libubsan.so \ ${libdir}/libubsan.la \ " -FILES_libubsan-staticdev += "${libdir}/libubsan.a" +FILES:libubsan-staticdev += "${libdir}/libubsan.a" -FILES_liblsan += "${libdir}/liblsan.so.*" -FILES_liblsan-dev += "\ +FILES:liblsan += "${libdir}/liblsan.so.*" +FILES:liblsan-dev += "\ ${libdir}/liblsan.so \ ${libdir}/liblsan.la \ ${libdir}/liblsan_preinit.o \ " -FILES_liblsan-staticdev += "${libdir}/liblsan.a" +FILES:liblsan-staticdev += "${libdir}/liblsan.a" -FILES_libtsan += "${libdir}/libtsan.so.*" -FILES_libtsan-dev += "\ +FILES:libtsan += "${libdir}/libtsan.so.*" +FILES:libtsan-dev += "\ ${libdir}/libtsan.so \ ${libdir}/libtsan.la \ ${libdir}/libtsan_*.o \ " -FILES_libtsan-staticdev += "${libdir}/libtsan.a" +FILES:libtsan-staticdev += "${libdir}/libtsan.a" -FILES_${PN} = "${libdir}/*.spec ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/sanitizer/*.h" +FILES:${PN} = "${libdir}/*.spec ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/sanitizer/*.h" diff --git a/contrib/recipes-devtools/gcc-7/gcc-target.inc b/contrib/recipes-devtools/gcc-7/gcc-target.inc index bc2236fe..1437e761 100644 --- a/contrib/recipes-devtools/gcc-7/gcc-target.inc +++ b/contrib/recipes-devtools/gcc-7/gcc-target.inc @@ -7,7 +7,7 @@ EXTRA_OECONF_PATHS = "\ --with-gxx-include-dir=${includedir}/c++/${BINV} \ " -EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" +EXTRA_OECONF:append:linuxstdbase = " --enable-clocale=gnu" # Configure gcc running on the target to default to an architecture which will # be compatible with that of gcc-runtime (which is cross compiled to be target @@ -17,9 +17,9 @@ EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" ARMFPARCHEXT ?= "" -EXTRA_OECONF_append_armv6 = " --with-arch=armv6${ARMFPARCHEXT}" -EXTRA_OECONF_append_armv7a = " --with-arch=armv7-a${ARMFPARCHEXT}" -EXTRA_OECONF_append_armv7ve = " --with-arch=armv7ve${ARMFPARCHEXT}" +EXTRA_OECONF:append:armv6 = " --with-arch=armv6${ARMFPARCHEXT}" +EXTRA_OECONF:append:armv7a = " --with-arch=armv7-a${ARMFPARCHEXT}" +EXTRA_OECONF:append:armv7ve = " --with-arch=armv7ve${ARMFPARCHEXT}" # libcc1 requres gcc_cv_objdump when cross build, but gcc_cv_objdump is # set in subdir gcc, so subdir libcc1 can't use it, export it here to @@ -40,7 +40,7 @@ PACKAGES = "\ ${PN}-dbg \ " -FILES_${PN} = "\ +FILES:${PN} = "\ ${bindir}/${TARGET_PREFIX}gcc* \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2* \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \ @@ -53,85 +53,85 @@ FILES_${PN} = "\ ${gcclibdir}/${TARGET_SYS}/${BINV}/include \ ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \ " -INSANE_SKIP_${PN} += "dev-so" -RRECOMMENDS_${PN} += "\ +INSANE_SKIP:${PN} += "dev-so" +RRECOMMENDS:${PN} += "\ libssp \ libssp-dev \ " -RDEPENDS_${PN} += "cpp" +RDEPENDS:${PN} += "cpp" -FILES_${PN}-dev = "\ +FILES:${PN}-dev = "\ ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/gengtype \ ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/gtype.state \ " -FILES_${PN}-symlinks = "\ +FILES:${PN}-symlinks = "\ ${bindir}/cc \ ${bindir}/gcc \ ${bindir}/gccbug \ " -FILES_${PN}-plugins = "\ +FILES:${PN}-plugins = "\ ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin \ " -ALLOW_EMPTY_${PN}-plugins = "1" +ALLOW_EMPTY:${PN}-plugins = "1" -FILES_g77 = "\ +FILES:g77 = "\ ${bindir}/${TARGET_PREFIX}g77 \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \ " -FILES_g77-symlinks = "\ +FILES:g77-symlinks = "\ ${bindir}/g77 \ ${bindir}/f77 \ " -RRECOMMENDS_g77 = "\ +RRECOMMENDS:g77 = "\ libg2c \ libg2c-dev \ " -FILES_gfortran = "\ +FILES:gfortran = "\ ${bindir}/${TARGET_PREFIX}gfortran \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \ " -RRECOMMENDS_gfortran = "\ +RRECOMMENDS:gfortran = "\ libquadmath \ libquadmath-dev \ " -FILES_gfortran-symlinks = "\ +FILES:gfortran-symlinks = "\ ${bindir}/gfortran \ ${bindir}/f95" -FILES_cpp = "\ +FILES:cpp = "\ ${bindir}/${TARGET_PREFIX}cpp* \ ${base_libdir}/cpp \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1" -FILES_cpp-symlinks = "${bindir}/cpp" +FILES:cpp-symlinks = "${bindir}/cpp" -FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov* \ +FILES:gcov = "${bindir}/${TARGET_PREFIX}gcov* \ ${bindir}/${TARGET_PREFIX}gcov-tool* \ " -FILES_gcov-symlinks = "${bindir}/gcov \ +FILES:gcov-symlinks = "${bindir}/gcov \ ${bindir}/gcov-tool \ " -FILES_g++ = "\ +FILES:g++ = "\ ${bindir}/${TARGET_PREFIX}g++* \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \ " -FILES_g++-symlinks = "\ +FILES:g++-symlinks = "\ ${bindir}/c++ \ ${bindir}/g++ \ " -RRECOMMENDS_g++ = "\ +RRECOMMENDS:g++ = "\ libstdc++ \ libstdc++-dev \ libatomic \ libatomic-dev \ " -FILES_${PN}-doc = "\ +FILES:${PN}-doc = "\ ${infodir} \ ${mandir} \ ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \ @@ -202,7 +202,7 @@ do_install () { chown -R root:root ${D} } -do_install_append () { +do_install:append () { # # Thefixinc.sh script, run on the gcc's compile phase, looks into sysroot header # files and places the modified files into diff --git a/contrib/recipes-devtools/gcc-7/gcc_7.3.bb b/contrib/recipes-devtools/gcc-7/gcc_7.3.bb index 9e52d966..3b81844b 100644 --- a/contrib/recipes-devtools/gcc-7/gcc_7.3.bb +++ b/contrib/recipes-devtools/gcc-7/gcc_7.3.bb @@ -4,7 +4,7 @@ require gcc-target.inc # Building with thumb enabled on armv4t armv5t fails with # | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7438:(.text.unlikely+0x2fa): relocation truncated to fit: R_ARM_THM_CALL against symbol `fancy_abort(char const*, int, char const*)' defined in .glue_7 section in linker stubs # | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7442:(.text.unlikely+0x318): additional relocation overflows omitted from the output -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" BBCLASSEXTEND = "nativesdk" diff --git a/contrib/recipes-devtools/gcc-7/libgcc-common.inc b/contrib/recipes-devtools/gcc-7/libgcc-common.inc index d959566c..d48dc8b8 100644 --- a/contrib/recipes-devtools/gcc-7/libgcc-common.inc +++ b/contrib/recipes-devtools/gcc-7/libgcc-common.inc @@ -44,16 +44,16 @@ do_install () { rm -rf ${D}${libdir}/${TARGET_SYS}/${BINV}/include } -do_install_append_libc-baremetal () { +do_install:append:libc-baremetal () { rmdir ${D}${base_libdir} } -do_install_append_libc-newlib () { +do_install:append:libc-newlib () { rmdir ${D}${base_libdir} } # No rpm package is actually created but -dev depends on it, avoid dnf error -RDEPENDS_${PN}-dev_libc-baremetal = "" -RDEPENDS_${PN}-dev_libc-newlib = "" +RDEPENDS:${PN}-dev:libc-baremetal = "" +RDEPENDS:${PN}-dev:libc-newlib = "" BBCLASSEXTEND = "nativesdk" @@ -98,9 +98,9 @@ fakeroot python do_multilib_install() { for ml in multilibs.split(): - tune = d.getVar('DEFAULTTUNE_virtclass-multilib-' + ml) + tune = d.getVar('DEFAULTTUNE:virtclass-multilib-' + ml) if not tune: - bb.warn('DEFAULTTUNE_virtclass-multilib-%s is not defined. Skipping...' % ml) + bb.warn('DEFAULTTUNE:virtclass-multilib-%s is not defined. Skipping...' % ml) continue tune_parameters = get_tune_parameters(tune, d) diff --git a/contrib/recipes-devtools/gcc-7/libgcc-initial.inc b/contrib/recipes-devtools/gcc-7/libgcc-initial.inc index 06bf224f..8251e3c2 100644 --- a/contrib/recipes-devtools/gcc-7/libgcc-initial.inc +++ b/contrib/recipes-devtools/gcc-7/libgcc-initial.inc @@ -42,17 +42,17 @@ inherit nopackages # We really only want this built by things that need it, not any recrdeptask deltask do_build -do_configure_prepend () { +do_configure:prepend () { install -d ${STAGING_INCDIR} touch ${STAGING_INCDIR}/limits.h sed -i -e 's#INHIBIT_LIBC_CFLAGS =.*#INHIBIT_LIBC_CFLAGS = -Dinhibit_libc#' ${B}/gcc/libgcc.mvars sed -i -e 's#inhibit_libc = false#inhibit_libc = true#' ${B}/gcc/Makefile } -do_configure_append () { +do_configure:append () { sed -i -e 's#thread_header = .*#thread_header = gthr-single.h#' ${B}/${BPN}/Makefile } -do_install_append () { +do_install:append () { ln -s libgcc.a ${D}${libdir}/${TARGET_SYS}/${BINV}/libgcc_eh.a } diff --git a/contrib/recipes-devtools/gcc-7/libgcc.inc b/contrib/recipes-devtools/gcc-7/libgcc.inc index e4e0c480..2cd482b0 100644 --- a/contrib/recipes-devtools/gcc-7/libgcc.inc +++ b/contrib/recipes-devtools/gcc-7/libgcc.inc @@ -2,7 +2,7 @@ require libgcc-common.inc DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ virtual/${MLPREFIX}libc" -do_install_append_class-target () { +do_install:append:class-target () { if [ "${TCLIBC}" != "glibc" ]; then case "${TARGET_OS}" in "linux-musl" | "linux-*spe") extra_target_os="linux";; @@ -21,12 +21,12 @@ PACKAGES = "\ # All libgcc source is marked with the exception. # -LICENSE_${PN} = "GPL-3.0-with-GCC-exception" -LICENSE_${PN}-dev = "GPL-3.0-with-GCC-exception" -LICENSE_${PN}-dbg = "GPL-3.0-with-GCC-exception" +LICENSE:${PN} = "GPL-3.0-with-GCC-exception" +LICENSE:${PN}-dev = "GPL-3.0-with-GCC-exception" +LICENSE:${PN}-dbg = "GPL-3.0-with-GCC-exception" -FILES_${PN}-dev = "\ +FILES:${PN}-dev = "\ ${base_libdir}/libgcc*.so \ ${@oe.utils.conditional('BASETARGET_SYS', '${TARGET_SYS}', '', '${libdir}/${BASETARGET_SYS}', d)} \ ${libdir}/${TARGET_SYS}/${BINV}* \ @@ -38,5 +38,5 @@ do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata" do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata" do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata" -INSANE_SKIP_${PN}-dev = "staticdev" +INSANE_SKIP:${PN}-dev = "staticdev" diff --git a/contrib/recipes-devtools/gcc-7/libgfortran.inc b/contrib/recipes-devtools/gcc-7/libgfortran.inc index 05237647..a8ca3a09 100644 --- a/contrib/recipes-devtools/gcc-7/libgfortran.inc +++ b/contrib/recipes-devtools/gcc-7/libgfortran.inc @@ -53,8 +53,8 @@ PACKAGES = "\ libgfortran-dev \ libgfortran-staticdev \ " -FILES_${PN} = "${libdir}/libgfortran.so.*" -FILES_${PN}-dev = "\ +FILES:${PN} = "${libdir}/libgfortran.so.*" +FILES:${PN}-dev = "\ ${libdir}/libgfortran*.so \ ${libdir}/libgfortran.spec \ ${libdir}/libgfortran.la \ @@ -62,9 +62,9 @@ FILES_${PN}-dev = "\ ${libdir}/gcc/${TARGET_SYS}/${BINV}/libcaf_single* \ ${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude/ \ " -FILES_${PN}-staticdev = "${libdir}/libgfortran.a" +FILES:${PN}-staticdev = "${libdir}/libgfortran.a" -INSANE_SKIP_${MLPREFIX}libgfortran-dev = "staticdev" +INSANE_SKIP:${MLPREFIX}libgfortran-dev = "staticdev" do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata" do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata" diff --git a/contrib/recipes-devtools/gcc-8/gcc-8.3.inc b/contrib/recipes-devtools/gcc-8/gcc-8.3.inc index efa71352..a06353bb 100644 --- a/contrib/recipes-devtools/gcc-8/gcc-8.3.inc +++ b/contrib/recipes-devtools/gcc-8/gcc-8.3.inc @@ -94,7 +94,7 @@ JAVA = "" LTO = "--enable-lto" SSP ?= "--disable-libssp" -SSP_mingw32 = "--enable-libssp" +SSP:mingw32 = "--enable-libssp" EXTRA_OECONF_BASE = "\ ${LTO} \ diff --git a/contrib/recipes-devtools/gcc-8/gcc-common.inc b/contrib/recipes-devtools/gcc-8/gcc-common.inc index 655c6430..65fbd6e7 100644 --- a/contrib/recipes-devtools/gcc-8/gcc-common.inc +++ b/contrib/recipes-devtools/gcc-8/gcc-common.inc @@ -12,7 +12,7 @@ inherit autotools gettext texinfo BPN = "gcc" COMPILERDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}gcc:do_gcc_stash_builddir" -COMPILERDEP_class-nativesdk = "virtual/${TARGET_PREFIX}gcc-crosssdk:do_gcc_stash_builddir" +COMPILERDEP:class-nativesdk = "virtual/${TARGET_PREFIX}gcc-crosssdk:do_gcc_stash_builddir" python extract_stashed_builddir () { src = d.expand("${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}") @@ -46,7 +46,7 @@ def get_long_double_setting(bb, d): if d.getVar('TRANSLATED_TARGET_ARCH') in [ 'powerpc', 'powerpc64' ] and d.getVar('TCLIBC') in [ 'glibc' ]: return "--with-long-double-128" else: - return "--without-long-double-128 libgcc_cv_powerpc_float128=no" + return "--without-long-double-128 libgcc_cv:powerpc_float128=no" return "" def get_gcc_multiarch_setting(bb, d): @@ -89,7 +89,7 @@ def get_tune_parameters(tune, d): get_tune_parameters[vardepsexclude] = "AVAILTUNES TUNE_CCARGS OVERRIDES TUNE_FEATURES BASE_LIB BASELIB TUNE_ARCH ABIEXTENSION TARGET_FPU TUNE_PKGARCH PACKAGE_EXTRA_ARCHS" -DEBIANNAME_${MLPREFIX}libgcc = "libgcc1" +DEBIANNAME:${MLPREFIX}libgcc = "libgcc1" MIRRORS =+ "\ ${GNU_MIRROR}/gcc ftp://gcc.gnu.org/pub/gcc/releases/ \n \ diff --git a/contrib/recipes-devtools/gcc-8/gcc-configure-common.inc b/contrib/recipes-devtools/gcc-8/gcc-configure-common.inc index 9adfbe56..4458751d 100644 --- a/contrib/recipes-devtools/gcc-8/gcc-configure-common.inc +++ b/contrib/recipes-devtools/gcc-8/gcc-configure-common.inc @@ -7,9 +7,9 @@ require gcc-shared-source.inc # Java (gcj doesn't work on all architectures) JAVA ?= ",java" -JAVA_arm ?= "" -JAVA_armeb ?= "" -JAVA_mipsel ?= "" +JAVA:arm ?= "" +JAVA:armeb ?= "" +JAVA:mipsel ?= "" JAVA_sh3 ?= "" # gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran' FORTRAN ?= ",f77" @@ -49,27 +49,27 @@ EXTRA_OECONF = "\ # glibc version is a minimum controlling whether features are enabled. # Doesn't need to track glibc exactly -EXTRA_OECONF_append_libc-glibc = " --with-glibc-version=2.28 " +EXTRA_OECONF:append:libc-glibc = " --with-glibc-version=2.28 " # Set this here since GCC configure won't auto-detect and enable # initfini-arry when cross compiling. -EXTRA_OECONF_append = " --enable-initfini-array" +EXTRA_OECONF:append = " --enable-initfini-array" export gcc_cv_collect2_libs = 'none required' # We need to set gcc_cv_collect2_libs else there is cross-compilation badness # in the config.log files (which might not get generated until do_compile # hence being missed by the insane do_configure check). -EXTRA_OECONF_append_linux = " --enable-__cxa_atexit" +EXTRA_OECONF:append_linux = " --enable-__cxa_atexit" -EXTRA_OECONF_append_mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" -EXTRA_OECONF_append_mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" -EXTRA_OECONF_append_mips64n32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" -EXTRA_OECONF_append_mips64eln32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" -EXTRA_OECONF_append_mipsisa32r6el = " --with-abi=32 --with-arch=mips32r6" -EXTRA_OECONF_append_mipsisa32r6 = " --with-abi=32 --with-arch=mips32r6" -EXTRA_OECONF_append_mipsisa64r6el = " --with-abi=64 --with-arch-64=mips64r6" -EXTRA_OECONF_append_mipsisa64r6 = " --with-abi=64 --with-arch-64=mips64r6" +EXTRA_OECONF:append:mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" +EXTRA_OECONF:append:mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" +EXTRA_OECONF:append:mips64n32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" +EXTRA_OECONF:append:mips64eln32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" +EXTRA_OECONF:append:mipsisa32r6el = " --with-abi=32 --with-arch=mips32r6" +EXTRA_OECONF:append:mipsisa32r6 = " --with-abi=32 --with-arch=mips32r6" +EXTRA_OECONF:append:mipsisa64r6el = " --with-abi=64 --with-arch-64=mips64r6" +EXTRA_OECONF:append:mipsisa64r6 = " --with-abi=64 --with-arch-64=mips64r6" EXTRA_OECONF_GCC_FLOAT ??= "" CPPFLAGS = "" @@ -78,7 +78,7 @@ SYSTEMHEADERS = "${target_includedir}" SYSTEMLIBS = "${target_base_libdir}/" SYSTEMLIBS1 = "${target_libdir}/" -do_configure_prepend () { +do_configure:prepend () { # teach gcc to find correct target includedir when checking libc ssp support mkdir -p ${B}/gcc echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe diff --git a/contrib/recipes-devtools/gcc-8/gcc-cross-canadian.inc b/contrib/recipes-devtools/gcc-8/gcc-cross-canadian.inc index d3875c94..be3eb16f 100644 --- a/contrib/recipes-devtools/gcc-8/gcc-cross-canadian.inc +++ b/contrib/recipes-devtools/gcc-8/gcc-cross-canadian.inc @@ -65,7 +65,7 @@ do_compile () { PACKAGES = "${PN}-dbg ${PN} ${PN}-doc" -FILES_${PN} = "\ +FILES:${PN} = "\ ${exec_prefix}/bin/* \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/* \ ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \ @@ -80,9 +80,9 @@ FILES_${PN} = "\ ${prefix}/${TARGET_SYS}/lib/* \ ${prefix}/${TARGET_SYS}${target_includedir}/* \ " -INSANE_SKIP_${PN} += "dev-so" +INSANE_SKIP:${PN} += "dev-so" -FILES_${PN}-doc = "\ +FILES:${PN}-doc = "\ ${infodir} \ ${mandir} \ ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \ @@ -166,16 +166,16 @@ do_install () { ELFUTILS = "nativesdk-elfutils" DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib" -RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}" +RDEPENDS:${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}" SYSTEMHEADERS = "${target_includedir}/" SYSTEMLIBS = "${target_base_libdir}/" SYSTEMLIBS1 = "${target_libdir}/" EXTRA_OECONF += "--enable-poison-system-directories" -EXTRA_OECONF_remove_elf = "--with-sysroot=/not/exist" -EXTRA_OECONF_remove_eabi = "--with-sysroot=/not/exist" -EXTRA_OECONF_append_elf = " --without-headers --with-newlib" -EXTRA_OECONF_append_eabi = " --without-headers --with-newlib" +EXTRA_OECONF:remove_elf = "--with-sysroot=/not/exist" +EXTRA_OECONF:remove_eabi = "--with-sysroot=/not/exist" +EXTRA_OECONF:append_elf = " --without-headers --with-newlib" +EXTRA_OECONF:append_eabi = " --without-headers --with-newlib" # gcc 4.7 needs -isystem export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}" diff --git a/contrib/recipes-devtools/gcc-8/gcc-cross.inc b/contrib/recipes-devtools/gcc-8/gcc-cross.inc index a6de303a..69e8c98f 100644 --- a/contrib/recipes-devtools/gcc-8/gcc-cross.inc +++ b/contrib/recipes-devtools/gcc-8/gcc-cross.inc @@ -22,7 +22,7 @@ require gcc-configure-common.inc LINKER_HASH_STYLE ?= "sysv" EXTRA_OECONF += "--enable-poison-system-directories" -EXTRA_OECONF_append_sh4 = " \ +EXTRA_OECONF:append:sh4 = " \ --with-multilib-list= \ --enable-incomplete-targets \ " @@ -31,9 +31,9 @@ EXTRA_OECONF += "\ --with-system-zlib \ " -EXTRA_OECONF_append_libc-baremetal = " --without-headers" -EXTRA_OECONF_remove_libc-baremetal = "--enable-threads=posix" -EXTRA_OECONF_remove_libc-newlib = "--enable-threads=posix" +EXTRA_OECONF:append:libc-baremetal = " --without-headers" +EXTRA_OECONF:remove:libc-baremetal = "--enable-threads=posix" +EXTRA_OECONF:remove:libc-newlib = "--enable-threads=posix" EXTRA_OECONF_PATHS = "\ --with-gxx-include-dir=/not/exist${target_includedir}/c++/${BINV} \ @@ -44,7 +44,7 @@ EXTRA_OECONF_PATHS = "\ ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" -do_configure_prepend () { +do_configure:prepend () { install -d ${RECIPE_SYSROOT}${target_includedir} touch ${RECIPE_SYSROOT}${target_includedir}/limits.h } diff --git a/contrib/recipes-devtools/gcc-8/gcc-multilib-config.inc b/contrib/recipes-devtools/gcc-8/gcc-multilib-config.inc index 31b8619b..e90580d1 100644 --- a/contrib/recipes-devtools/gcc-8/gcc-multilib-config.inc +++ b/contrib/recipes-devtools/gcc-8/gcc-multilib-config.inc @@ -170,7 +170,7 @@ python gcc_multilib_setup() { header_config_files = gcc_header_config_files[target_arch] ml_list = ['DEFAULTTUNE_MULTILIB_ORIGINAL' if mlprefix else 'DEFAULTTUNE'] - mltunes = [('DEFAULTTUNE_virtclass-multilib-%s' % ml) for ml in multilibs] + mltunes = [('DEFAULTTUNE:virtclass-multilib-%s' % ml) for ml in multilibs] if mlprefix: mlindex = 0 for ml in multilibs: diff --git a/contrib/recipes-devtools/gcc-8/gcc-runtime.inc b/contrib/recipes-devtools/gcc-8/gcc-runtime.inc index b35fbf6a..81844957 100644 --- a/contrib/recipes-devtools/gcc-8/gcc-runtime.inc +++ b/contrib/recipes-devtools/gcc-8/gcc-runtime.inc @@ -6,7 +6,7 @@ SUMMARY = "Runtime libraries from GCC" # All gcc-runtime packages are now covered by the runtime exception. LICENSE = "GPL-3.0-with-GCC-exception" -CXXFLAGS_remove = "-fvisibility-inlines-hidden" +CXXFLAGS:remove = "-fvisibility-inlines-hidden" EXTRA_OECONF_PATHS = "\ --with-gxx-include-dir=${includedir}/c++/${BINV} \ @@ -14,18 +14,18 @@ EXTRA_OECONF_PATHS = "\ --with-build-sysroot=${STAGING_DIR_TARGET} \ " -EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" -EXTRA_OECONF_append = " --cache-file=${B}/config.cache" +EXTRA_OECONF:append:linuxstdbase = " --enable-clocale=gnu" +EXTRA_OECONF:append = " --cache-file=${B}/config.cache" RUNTIMELIBITM = "libitm" -RUNTIMELIBITM_arc = "" -RUNTIMELIBITM_mipsarch = "" -RUNTIMELIBITM_nios2 = "" -RUNTIMELIBITM_microblaze = "" -RUNTIMELIBITM_riscv32 = "" -RUNTIMELIBITM_riscv64 = "" +RUNTIMELIBITM:arc = "" +RUNTIMELIBITM:mipsarch = "" +RUNTIMELIBITM:nios2 = "" +RUNTIMELIBITM:microblaze = "" +RUNTIMELIBITM:riscv32 = "" +RUNTIMELIBITM:riscv64 = "" RUNTIMELIBSSP ?= "" -RUNTIMELIBSSP_mingw32 ?= "libssp" +RUNTIMELIBSSP:mingw32 ?= "libssp" RUNTIMETARGET = "${RUNTIMELIBSSP} libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \ ${@bb.utils.contains_any('FORTRAN', [',fortran',',f77'], 'libquadmath', '', d)} \ @@ -37,7 +37,7 @@ RUNTIMETARGET = "${RUNTIMELIBSSP} libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM SLIB = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" SLIB_NEW = "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}" -DEBUG_PREFIX_MAP_class-target = " \ +DEBUG_PREFIX_MAP:class-target = " \ -fdebug-prefix-map=${WORKDIR}/recipe-sysroot= \ -fdebug-prefix-map=${WORKDIR}/recipe-sysroot-native= \ -fdebug-prefix-map=${SLIB}=${SLIB_NEW} \ @@ -92,7 +92,7 @@ do_install () { fi } -do_install_append_class-target () { +do_install:append:class-target () { if [ "${TARGET_OS}" = "linux-gnuspe" ]; then ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux fi @@ -169,67 +169,67 @@ PACKAGES = "\ libitm-staticdev \ " # The base package doesn't exist, so we clear the recommends. -RRECOMMENDS_${PN}-dbg = "" +RRECOMMENDS:${PN}-dbg = "" # include python debugging scripts -FILES_${PN}-dbg += "\ +FILES:${PN}-dbg += "\ ${libdir}/libstdc++.*-gdb.py \ ${datadir}/gcc-${BINV}/python/libstdcxx \ " -FILES_libg2c = "${target_libdir}/libg2c.so.*" -SUMMARY_libg2c = "Companion runtime library for g77" -FILES_libg2c-dev = "\ +FILES:libg2c = "${target_libdir}/libg2c.so.*" +SUMMARY:libg2c = "Companion runtime library for g77" +FILES:libg2c-dev = "\ ${libdir}/libg2c.so \ ${libdir}/libg2c.a \ ${libdir}/libfrtbegin.a \ " -SUMMARY_libg2c-dev = "Companion runtime library for g77 - development files" +SUMMARY:libg2c-dev = "Companion runtime library for g77 - development files" -FILES_libstdc++ = "${libdir}/libstdc++.so.*" -SUMMARY_libstdc++ = "GNU standard C++ library" -FILES_libstdc++-dev = "\ +FILES:libstdc++ = "${libdir}/libstdc++.so.*" +SUMMARY:libstdc++ = "GNU standard C++ library" +FILES:libstdc++-dev = "\ ${includedir}/c++/ \ ${libdir}/libstdc++.so \ ${libdir}/libstdc++*.la \ ${libdir}/libsupc++.la \ " -SUMMARY_libstdc++-dev = "GNU standard C++ library - development files" -FILES_libstdc++-staticdev = "\ +SUMMARY:libstdc++-dev = "GNU standard C++ library - development files" +FILES:libstdc++-staticdev = "\ ${libdir}/libstdc++*.a \ ${libdir}/libsupc++.a \ " -SUMMARY_libstdc++-staticdev = "GNU standard C++ library - static development files" +SUMMARY:libstdc++-staticdev = "GNU standard C++ library - static development files" -FILES_libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch" -SUMMARY_libstdc++-precompile-dev = "GNU standard C++ library - precompiled header files" +FILES:libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch" +SUMMARY:libstdc++-precompile-dev = "GNU standard C++ library - precompiled header files" -FILES_libssp = "${libdir}/libssp.so.*" -SUMMARY_libssp = "GNU stack smashing protection library" -FILES_libssp-dev = "\ +FILES:libssp = "${libdir}/libssp.so.*" +SUMMARY:libssp = "GNU stack smashing protection library" +FILES:libssp-dev = "\ ${libdir}/libssp*.so \ ${libdir}/libssp*_nonshared.a \ ${libdir}/libssp*.la \ ${libdir}/${TARGET_SYS}/${BINV}/include/ssp \ " -SUMMARY_libssp-dev = "GNU stack smashing protection library - development files" -FILES_libssp-staticdev = "${libdir}/libssp*.a" -SUMMARY_libssp-staticdev = "GNU stack smashing protection library - static development files" +SUMMARY:libssp-dev = "GNU stack smashing protection library - development files" +FILES:libssp-staticdev = "${libdir}/libssp*.a" +SUMMARY:libssp-staticdev = "GNU stack smashing protection library - static development files" -FILES_libquadmath = "${libdir}/libquadmath*.so.*" -SUMMARY_libquadmath = "GNU quad-precision math library" -FILES_libquadmath-dev = "\ +FILES:libquadmath = "${libdir}/libquadmath*.so.*" +SUMMARY:libquadmath = "GNU quad-precision math library" +FILES:libquadmath-dev = "\ ${libdir}/${TARGET_SYS}/${BINV}/include/quadmath* \ ${libdir}/libquadmath*.so \ ${libdir}/libquadmath.la \ " -SUMMARY_libquadmath-dev = "GNU quad-precision math library - development files" -FILES_libquadmath-staticdev = "${libdir}/libquadmath.a" -SUMMARY_libquadmath-staticdev = "GNU quad-precision math library - static development files" +SUMMARY:libquadmath-dev = "GNU quad-precision math library - development files" +FILES:libquadmath-staticdev = "${libdir}/libquadmath.a" +SUMMARY:libquadmath-staticdev = "GNU quad-precision math library - static development files" -FILES_libgomp = "${libdir}/libgomp*${SOLIBS}" -SUMMARY_libgomp = "GNU OpenMP parallel programming library" -FILES_libgomp-dev = "\ +FILES:libgomp = "${libdir}/libgomp*${SOLIBS}" +SUMMARY:libgomp = "GNU OpenMP parallel programming library" +FILES:libgomp-dev = "\ ${libdir}/libgomp*${SOLIBSDEV} \ ${libdir}/libgomp*.la \ ${libdir}/libgomp.spec \ @@ -237,27 +237,27 @@ FILES_libgomp-dev = "\ ${libdir}/${TARGET_SYS}/${BINV}/include/omp.h \ ${libdir}/${TARGET_SYS}/${BINV}/include/openacc.h \ " -SUMMARY_libgomp-dev = "GNU OpenMP parallel programming library - development files" -FILES_libgomp-staticdev = "${libdir}/libgomp*.a" -SUMMARY_libgomp-staticdev = "GNU OpenMP parallel programming library - static development files" +SUMMARY:libgomp-dev = "GNU OpenMP parallel programming library - development files" +FILES:libgomp-staticdev = "${libdir}/libgomp*.a" +SUMMARY:libgomp-staticdev = "GNU OpenMP parallel programming library - static development files" -FILES_libatomic = "${libdir}/libatomic.so.*" -SUMMARY_libatomic = "GNU C++11 atomics support library" -FILES_libatomic-dev = "\ +FILES:libatomic = "${libdir}/libatomic.so.*" +SUMMARY:libatomic = "GNU C++11 atomics support library" +FILES:libatomic-dev = "\ ${libdir}/libatomic.so \ ${libdir}/libatomic.la \ " -SUMMARY_libatomic-dev = "GNU C++11 atomics support library - development files" -FILES_libatomic-staticdev = "${libdir}/libatomic.a" -SUMMARY_libatomic-staticdev = "GNU C++11 atomics support library - static development files" +SUMMARY:libatomic-dev = "GNU C++11 atomics support library - development files" +FILES:libatomic-staticdev = "${libdir}/libatomic.a" +SUMMARY:libatomic-staticdev = "GNU C++11 atomics support library - static development files" -FILES_libitm = "${libdir}/libitm.so.*" -SUMMARY_libitm = "GNU transactional memory support library" -FILES_libitm-dev = "\ +FILES:libitm = "${libdir}/libitm.so.*" +SUMMARY:libitm = "GNU transactional memory support library" +FILES:libitm-dev = "\ ${libdir}/libitm.so \ ${libdir}/libitm.la \ ${libdir}/libitm.spec \ " -SUMMARY_libitm-dev = "GNU transactional memory support library - development files" -FILES_libitm-staticdev = "${libdir}/libitm.a" -SUMMARY_libitm-staticdev = "GNU transactional memory support library - static development files" +SUMMARY:libitm-dev = "GNU transactional memory support library - development files" +FILES:libitm-staticdev = "${libdir}/libitm.a" +SUMMARY:libitm-staticdev = "GNU transactional memory support library - static development files" diff --git a/contrib/recipes-devtools/gcc-8/gcc-runtime_8.3.bb b/contrib/recipes-devtools/gcc-8/gcc-runtime_8.3.bb index 5d13d553..7d98f717 100644 --- a/contrib/recipes-devtools/gcc-8/gcc-runtime_8.3.bb +++ b/contrib/recipes-devtools/gcc-8/gcc-runtime_8.3.bb @@ -2,7 +2,7 @@ require gcc-${PV}.inc require gcc-runtime.inc # Disable ifuncs for libatomic on arm conflicts -march/-mcpu -EXTRA_OECONF_append_arm = " libat_cv_have_ifunc=no " +EXTRA_OECONF:append:arm = " libat_cv_have_ifunc=no " # Building with thumb enabled on armv6t fails -ARM_INSTRUCTION_SET_armv6 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" diff --git a/contrib/recipes-devtools/gcc-8/gcc-sanitizers.inc b/contrib/recipes-devtools/gcc-8/gcc-sanitizers.inc index 0945e59e..b2972a0d 100644 --- a/contrib/recipes-devtools/gcc-8/gcc-sanitizers.inc +++ b/contrib/recipes-devtools/gcc-8/gcc-sanitizers.inc @@ -47,7 +47,7 @@ do_install () { } INHIBIT_DEFAULT_DEPS = "1" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" DEPENDS = "virtual/crypt gcc-runtime virtual/${TARGET_PREFIX}gcc" BBCLASSEXTEND = "nativesdk" @@ -57,19 +57,19 @@ PACKAGES += "libasan libubsan liblsan libtsan" PACKAGES += "libasan-dev libubsan-dev liblsan-dev libtsan-dev" PACKAGES += "libasan-staticdev libubsan-staticdev liblsan-staticdev libtsan-staticdev" -RDEPENDS_libasan += "libstdc++" -RDEPENDS_libubsan += "libstdc++" -RDEPENDS_liblsan += "libstdc++" -RDEPENDS_libtsan += "libstdc++" -RDEPENDS_libasan-dev += "${PN}" -RDEPENDS_libubsan-dev += "${PN}" -RDEPENDS_liblsan-dev += "${PN}" -RDEPENDS_libtsan-dev += "${PN}" -RRECOMMENDS_${PN} += "libasan libubsan" -RRECOMMENDS_${PN}_append_x86 = " liblsan" -RRECOMMENDS_${PN}_append_x86-64 = " liblsan libtsan" -RRECOMMENDS_${PN}_append_powerpc64 = " liblsan libtsan" -RRECOMMENDS_${PN}_append_aarch64 = " liblsan libtsan" +RDEPENDS:libasan += "libstdc++" +RDEPENDS:libubsan += "libstdc++" +RDEPENDS:liblsan += "libstdc++" +RDEPENDS:libtsan += "libstdc++" +RDEPENDS:libasan-dev += "${PN}" +RDEPENDS:libubsan-dev += "${PN}" +RDEPENDS:liblsan-dev += "${PN}" +RDEPENDS:libtsan-dev += "${PN}" +RRECOMMENDS:${PN} += "libasan libubsan" +RRECOMMENDS:${PN}:append:x86 = " liblsan" +RRECOMMENDS:${PN}:append:x86-64 = " liblsan libtsan" +RRECOMMENDS:${PN}:append:powerpc64 = " liblsan libtsan" +RRECOMMENDS:${PN}:append:aarch64 = " liblsan libtsan" do_package_write_ipk[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata" do_package_write_deb[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata" @@ -78,37 +78,37 @@ do_package_write_rpm[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlib # Only x86, powerpc, sparc, s390, arm, and aarch64 are supported COMPATIBLE_HOST = '(x86_64|i.86|powerpc|sparc|s390|arm|aarch64).*-linux' # musl is currently broken entirely -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' -FILES_libasan += "${libdir}/libasan.so.*" -FILES_libasan-dev += "\ +FILES:libasan += "${libdir}/libasan.so.*" +FILES:libasan-dev += "\ ${libdir}/libasan_preinit.o \ ${libdir}/libasan.so \ ${libdir}/libasan.la \ " -FILES_libasan-staticdev += "${libdir}/libasan.a" +FILES:libasan-staticdev += "${libdir}/libasan.a" -FILES_libubsan += "${libdir}/libubsan.so.*" -FILES_libubsan-dev += "\ +FILES:libubsan += "${libdir}/libubsan.so.*" +FILES:libubsan-dev += "\ ${libdir}/libubsan.so \ ${libdir}/libubsan.la \ " -FILES_libubsan-staticdev += "${libdir}/libubsan.a" +FILES:libubsan-staticdev += "${libdir}/libubsan.a" -FILES_liblsan += "${libdir}/liblsan.so.*" -FILES_liblsan-dev += "\ +FILES:liblsan += "${libdir}/liblsan.so.*" +FILES:liblsan-dev += "\ ${libdir}/liblsan.so \ ${libdir}/liblsan.la \ ${libdir}/liblsan_preinit.o \ " -FILES_liblsan-staticdev += "${libdir}/liblsan.a" +FILES:liblsan-staticdev += "${libdir}/liblsan.a" -FILES_libtsan += "${libdir}/libtsan.so.*" -FILES_libtsan-dev += "\ +FILES:libtsan += "${libdir}/libtsan.so.*" +FILES:libtsan-dev += "\ ${libdir}/libtsan.so \ ${libdir}/libtsan.la \ ${libdir}/libtsan_*.o \ " -FILES_libtsan-staticdev += "${libdir}/libtsan.a" +FILES:libtsan-staticdev += "${libdir}/libtsan.a" -FILES_${PN} = "${libdir}/*.spec ${libdir}/${TARGET_SYS}/${BINV}/include/sanitizer/*.h" +FILES:${PN} = "${libdir}/*.spec ${libdir}/${TARGET_SYS}/${BINV}/include/sanitizer/*.h" diff --git a/contrib/recipes-devtools/gcc-8/gcc-sanitizers_8.3.bb b/contrib/recipes-devtools/gcc-8/gcc-sanitizers_8.3.bb index 91c00efb..fecd9cf6 100644 --- a/contrib/recipes-devtools/gcc-8/gcc-sanitizers_8.3.bb +++ b/contrib/recipes-devtools/gcc-8/gcc-sanitizers_8.3.bb @@ -3,5 +3,5 @@ require gcc-sanitizers.inc # Building with thumb enabled on armv4t armv5t fails with # sanitizer_linux.s:5749: Error: lo register required -- `ldr ip,[sp],#8' -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" diff --git a/contrib/recipes-devtools/gcc-8/gcc-target.inc b/contrib/recipes-devtools/gcc-8/gcc-target.inc index 3d3b3f08..f3a00a27 100644 --- a/contrib/recipes-devtools/gcc-8/gcc-target.inc +++ b/contrib/recipes-devtools/gcc-8/gcc-target.inc @@ -5,7 +5,7 @@ EXTRA_OECONF_PATHS = "\ --with-build-sysroot=${STAGING_DIR_TARGET} \ " -EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" +EXTRA_OECONF:append:linuxstdbase = " --enable-clocale=gnu" # Configure gcc running on the target to default to an architecture which will # be compatible with that of gcc-runtime (which is cross compiled to be target @@ -15,10 +15,10 @@ EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" ARMFPARCHEXT ?= "" -EXTRA_OECONF_append_armv6_class-target = " --with-arch=armv6${ARMFPARCHEXT}" -EXTRA_OECONF_append_armv7a_class-target = " --with-arch=armv7-a${ARMFPARCHEXT}" -EXTRA_OECONF_append_armv7ve_class-target = " --with-arch=armv7ve${ARMFPARCHEXT}" -EXTRA_OECONF_append_arc_class-target = " --with-cpu=${TUNE_PKGARCH}" +EXTRA_OECONF:append:armv6:class-target = " --with-arch=armv6${ARMFPARCHEXT}" +EXTRA_OECONF:append:armv7a:class-target = " --with-arch=armv7-a${ARMFPARCHEXT}" +EXTRA_OECONF:append:armv7ve:class-target = " --with-arch=armv7ve${ARMFPARCHEXT}" +EXTRA_OECONF:append:arc:class-target = " --with-cpu=${TUNE_PKGARCH}" # libcc1 requres gcc_cv_objdump when cross build, but gcc_cv_objdump is # set in subdir gcc, so subdir libcc1 can't use it, export it here to @@ -39,7 +39,7 @@ PACKAGES = "\ ${PN}-dbg \ " -FILES_${PN} = "\ +FILES:${PN} = "\ ${bindir}/${TARGET_PREFIX}gcc* \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2* \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \ @@ -52,85 +52,85 @@ FILES_${PN} = "\ ${gcclibdir}/${TARGET_SYS}/${BINV}/include \ ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \ " -INSANE_SKIP_${PN} += "dev-so" -RRECOMMENDS_${PN} += "\ +INSANE_SKIP:${PN} += "dev-so" +RRECOMMENDS:${PN} += "\ libssp \ libssp-dev \ " -RDEPENDS_${PN} += "cpp" +RDEPENDS:${PN} += "cpp" -FILES_${PN}-dev = "\ +FILES:${PN}-dev = "\ ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \ ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/gengtype \ ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/gtype.state \ " -FILES_${PN}-symlinks = "\ +FILES:${PN}-symlinks = "\ ${bindir}/cc \ ${bindir}/gcc \ ${bindir}/gccbug \ " -FILES_${PN}-plugins = "\ +FILES:${PN}-plugins = "\ ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin \ " -ALLOW_EMPTY_${PN}-plugins = "1" +ALLOW_EMPTY:${PN}-plugins = "1" -FILES_g77 = "\ +FILES:g77 = "\ ${bindir}/${TARGET_PREFIX}g77 \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \ " -FILES_g77-symlinks = "\ +FILES:g77-symlinks = "\ ${bindir}/g77 \ ${bindir}/f77 \ " -RRECOMMENDS_g77 = "\ +RRECOMMENDS:g77 = "\ libg2c \ libg2c-dev \ " -FILES_gfortran = "\ +FILES:gfortran = "\ ${bindir}/${TARGET_PREFIX}gfortran \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \ " -RRECOMMENDS_gfortran = "\ +RRECOMMENDS:gfortran = "\ libquadmath \ libquadmath-dev \ " -FILES_gfortran-symlinks = "\ +FILES:gfortran-symlinks = "\ ${bindir}/gfortran \ ${bindir}/f95" -FILES_cpp = "\ +FILES:cpp = "\ ${bindir}/${TARGET_PREFIX}cpp* \ ${base_libdir}/cpp \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1" -FILES_cpp-symlinks = "${bindir}/cpp" +FILES:cpp-symlinks = "${bindir}/cpp" -FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov* \ +FILES:gcov = "${bindir}/${TARGET_PREFIX}gcov* \ ${bindir}/${TARGET_PREFIX}gcov-tool* \ " -FILES_gcov-symlinks = "${bindir}/gcov \ +FILES:gcov-symlinks = "${bindir}/gcov \ ${bindir}/gcov-tool \ " -FILES_g++ = "\ +FILES:g++ = "\ ${bindir}/${TARGET_PREFIX}g++* \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \ " -FILES_g++-symlinks = "\ +FILES:g++-symlinks = "\ ${bindir}/c++ \ ${bindir}/g++ \ " -RRECOMMENDS_g++ = "\ +RRECOMMENDS:g++ = "\ libstdc++ \ libstdc++-dev \ libatomic \ libatomic-dev \ " -FILES_${PN}-doc = "\ +FILES:${PN}-doc = "\ ${infodir} \ ${mandir} \ ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \ @@ -216,7 +216,7 @@ do_install () { chown -R root:root ${D} } -do_install_append () { +do_install:append () { # # Thefixinc.sh script, run on the gcc's compile phase, looks into sysroot header # files and places the modified files into diff --git a/contrib/recipes-devtools/gcc-8/gcc_8.3.bb b/contrib/recipes-devtools/gcc-8/gcc_8.3.bb index 94ef6df1..e2918a7c 100644 --- a/contrib/recipes-devtools/gcc-8/gcc_8.3.bb +++ b/contrib/recipes-devtools/gcc-8/gcc_8.3.bb @@ -4,11 +4,11 @@ require gcc-target.inc # Building with thumb enabled on armv4t armv5t fails with # | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7438:(.text.unlikely+0x2fa): relocation truncated to fit: R_ARM_THM_CALL against symbol `fancy_abort(char const*, int, char const*)' defined in .glue_7 section in linker stubs # | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7442:(.text.unlikely+0x318): additional relocation overflows omitted from the output -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" -ARMFPARCHEXT_armv6 = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}" -ARMFPARCHEXT_armv7a = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}" -ARMFPARCHEXT_armv7ve = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}" +ARMFPARCHEXT:armv6 = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}" +ARMFPARCHEXT:armv7a = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}" +ARMFPARCHEXT:armv7ve = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}" BBCLASSEXTEND = "nativesdk" diff --git a/contrib/recipes-devtools/gcc-8/libgcc-common.inc b/contrib/recipes-devtools/gcc-8/libgcc-common.inc index d959566c..d48dc8b8 100644 --- a/contrib/recipes-devtools/gcc-8/libgcc-common.inc +++ b/contrib/recipes-devtools/gcc-8/libgcc-common.inc @@ -44,16 +44,16 @@ do_install () { rm -rf ${D}${libdir}/${TARGET_SYS}/${BINV}/include } -do_install_append_libc-baremetal () { +do_install:append:libc-baremetal () { rmdir ${D}${base_libdir} } -do_install_append_libc-newlib () { +do_install:append:libc-newlib () { rmdir ${D}${base_libdir} } # No rpm package is actually created but -dev depends on it, avoid dnf error -RDEPENDS_${PN}-dev_libc-baremetal = "" -RDEPENDS_${PN}-dev_libc-newlib = "" +RDEPENDS:${PN}-dev:libc-baremetal = "" +RDEPENDS:${PN}-dev:libc-newlib = "" BBCLASSEXTEND = "nativesdk" @@ -98,9 +98,9 @@ fakeroot python do_multilib_install() { for ml in multilibs.split(): - tune = d.getVar('DEFAULTTUNE_virtclass-multilib-' + ml) + tune = d.getVar('DEFAULTTUNE:virtclass-multilib-' + ml) if not tune: - bb.warn('DEFAULTTUNE_virtclass-multilib-%s is not defined. Skipping...' % ml) + bb.warn('DEFAULTTUNE:virtclass-multilib-%s is not defined. Skipping...' % ml) continue tune_parameters = get_tune_parameters(tune, d) diff --git a/contrib/recipes-devtools/gcc-8/libgcc-initial.inc b/contrib/recipes-devtools/gcc-8/libgcc-initial.inc index 06bf224f..8251e3c2 100644 --- a/contrib/recipes-devtools/gcc-8/libgcc-initial.inc +++ b/contrib/recipes-devtools/gcc-8/libgcc-initial.inc @@ -42,17 +42,17 @@ inherit nopackages # We really only want this built by things that need it, not any recrdeptask deltask do_build -do_configure_prepend () { +do_configure:prepend () { install -d ${STAGING_INCDIR} touch ${STAGING_INCDIR}/limits.h sed -i -e 's#INHIBIT_LIBC_CFLAGS =.*#INHIBIT_LIBC_CFLAGS = -Dinhibit_libc#' ${B}/gcc/libgcc.mvars sed -i -e 's#inhibit_libc = false#inhibit_libc = true#' ${B}/gcc/Makefile } -do_configure_append () { +do_configure:append () { sed -i -e 's#thread_header = .*#thread_header = gthr-single.h#' ${B}/${BPN}/Makefile } -do_install_append () { +do_install:append () { ln -s libgcc.a ${D}${libdir}/${TARGET_SYS}/${BINV}/libgcc_eh.a } diff --git a/contrib/recipes-devtools/gcc-8/libgcc-initial_8.3.bb b/contrib/recipes-devtools/gcc-8/libgcc-initial_8.3.bb index 643f4b80..75cfacc7 100644 --- a/contrib/recipes-devtools/gcc-8/libgcc-initial_8.3.bb +++ b/contrib/recipes-devtools/gcc-8/libgcc-initial_8.3.bb @@ -2,4 +2,4 @@ require gcc-${PV}.inc require libgcc-initial.inc # Building with thumb enabled on armv6t fails -ARM_INSTRUCTION_SET_armv6 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" diff --git a/contrib/recipes-devtools/gcc-8/libgcc.inc b/contrib/recipes-devtools/gcc-8/libgcc.inc index 6d48ec98..84a2d930 100644 --- a/contrib/recipes-devtools/gcc-8/libgcc.inc +++ b/contrib/recipes-devtools/gcc-8/libgcc.inc @@ -2,7 +2,7 @@ require libgcc-common.inc DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ virtual/${MLPREFIX}libc" -do_install_append_class-target () { +do_install:append:class-target () { if [ "${TCLIBC}" != "glibc" ]; then case "${TARGET_OS}" in "linux-musl" | "linux-*spe") extra_target_os="linux";; @@ -32,12 +32,12 @@ PACKAGES = "\ # All libgcc source is marked with the exception. # -LICENSE_${PN} = "GPL-3.0-with-GCC-exception" -LICENSE_${PN}-dev = "GPL-3.0-with-GCC-exception" -LICENSE_${PN}-dbg = "GPL-3.0-with-GCC-exception" +LICENSE:${PN} = "GPL-3.0-with-GCC-exception" +LICENSE:${PN}-dev = "GPL-3.0-with-GCC-exception" +LICENSE:${PN}-dbg = "GPL-3.0-with-GCC-exception" -FILES_${PN}-dev = "\ +FILES:${PN}-dev = "\ ${base_libdir}/libgcc*.so \ ${@oe.utils.conditional('BASETARGET_SYS', '${TARGET_SYS}', '', '${libdir}/${BASETARGET_SYS}', d)} \ ${libdir}/${TARGET_SYS}/${BINV}* \ @@ -49,5 +49,5 @@ do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata" do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata" do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata" -INSANE_SKIP_${PN}-dev = "staticdev" +INSANE_SKIP:${PN}-dev = "staticdev" diff --git a/contrib/recipes-devtools/gcc-8/libgcc_8.3.bb b/contrib/recipes-devtools/gcc-8/libgcc_8.3.bb index fd6c1f89..72c0b3af 100644 --- a/contrib/recipes-devtools/gcc-8/libgcc_8.3.bb +++ b/contrib/recipes-devtools/gcc-8/libgcc_8.3.bb @@ -2,4 +2,4 @@ require gcc-${PV}.inc require libgcc.inc # Building with thumb enabled on armv6t fails -ARM_INSTRUCTION_SET_armv6 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" diff --git a/contrib/recipes-devtools/gcc-8/libgfortran.inc b/contrib/recipes-devtools/gcc-8/libgfortran.inc index 7543585e..344ec5e2 100644 --- a/contrib/recipes-devtools/gcc-8/libgfortran.inc +++ b/contrib/recipes-devtools/gcc-8/libgfortran.inc @@ -54,12 +54,12 @@ PACKAGES = "\ libgfortran-staticdev \ " -LICENSE_${PN} = "GPL-3.0-with-GCC-exception" -LICENSE_${PN}-dev = "GPL-3.0-with-GCC-exception" -LICENSE_${PN}-dbg = "GPL-3.0-with-GCC-exception" +LICENSE:${PN} = "GPL-3.0-with-GCC-exception" +LICENSE:${PN}-dev = "GPL-3.0-with-GCC-exception" +LICENSE:${PN}-dbg = "GPL-3.0-with-GCC-exception" -FILES_${PN} = "${libdir}/libgfortran.so.*" -FILES_${PN}-dev = "\ +FILES:${PN} = "${libdir}/libgfortran.so.*" +FILES:${PN}-dev = "\ ${libdir}/libgfortran*.so \ ${libdir}/libgfortran.spec \ ${libdir}/libgfortran.la \ @@ -68,9 +68,9 @@ FILES_${PN}-dev = "\ ${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude/ \ ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ \ " -FILES_${PN}-staticdev = "${libdir}/libgfortran.a" +FILES:${PN}-staticdev = "${libdir}/libgfortran.a" -INSANE_SKIP_${MLPREFIX}libgfortran-dev = "staticdev" +INSANE_SKIP:${MLPREFIX}libgfortran-dev = "staticdev" do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata" do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata" diff --git a/contrib/recipes-devtools/gcc-linaro-baremetal/gcc-linaro-baremetal-arm-native_7.4.1-2019.02.bb b/contrib/recipes-devtools/gcc-linaro-baremetal/gcc-linaro-baremetal-arm-native_7.4.1-2019.02.bb index 2fcce4e2..ce9e9768 100644 --- a/contrib/recipes-devtools/gcc-linaro-baremetal/gcc-linaro-baremetal-arm-native_7.4.1-2019.02.bb +++ b/contrib/recipes-devtools/gcc-linaro-baremetal/gcc-linaro-baremetal-arm-native_7.4.1-2019.02.bb @@ -4,7 +4,7 @@ LICENSE = "GPL-3.0-with-GCC-exception & LGPLv3 & GPLv3 & GFDL-1.3" SECTION = "devel" BASEVER = "${@'.'.join(d.getVar('PV').split('.')[0:2]) + '-' + d.getVar('PV').split('-')[1]}" -SRC_URI = "https://releases.linaro.org/components/toolchain/binaries/${BASEVER}/arm-eabi/gcc-linaro-${PV}-x86_64_arm-eabi.tar.xz" +SRC_URI = "https://releases.linaro.org/components/toolchain/binaries/${BASEVER}/arm-eabi/gcc-linaro-${PV}-x86_64:arm-eabi.tar.xz" SRC_URI[md5sum] = "0a8e5b7b67d713ece5fe24b120393b03" SRC_URI[sha256sum] = "d4ae43bd325f3a8df2bcfcc1909c1c28356e1e9f5705e21790b17c68830733d7" @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://share/doc/gcc/Copying.html;md5=4d3dd12c455cd0ef6a53be inherit native -S = "${WORKDIR}/gcc-linaro-${PV}-x86_64_arm-eabi" +S = "${WORKDIR}/gcc-linaro-${PV}-x86_64:arm-eabi" do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/contrib/recipes-multimedia/gstreamer-1.14/gst-examples_git.bb b/contrib/recipes-multimedia/gstreamer-1.14/gst-examples_git.bb index ce46f7b1..efd16137 100644 --- a/contrib/recipes-multimedia/gstreamer-1.14/gst-examples_git.bb +++ b/contrib/recipes-multimedia/gstreamer-1.14/gst-examples_git.bb @@ -19,14 +19,14 @@ inherit meson pkgconfig features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -do_install_append() { +do_install:append() { install -m 0644 -D ${WORKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop } -RDEPENDS_${PN} = "gstreamer1.0-plugins-base-playback" -RRECOMMENDS_${PN} = "gstreamer1.0-plugins-base-meta \ +RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback" +RRECOMMENDS:${PN} = "gstreamer1.0-plugins-base-meta \ gstreamer1.0-plugins-good-meta \ gstreamer1.0-plugins-bad-meta \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}" -RPROVIDES_${PN} += "gst-player gst-player-bin" +RPROVIDES:${PN} += "gst-player gst-player-bin" diff --git a/contrib/recipes-multimedia/gstreamer-1.14/gst-plugins-package.inc b/contrib/recipes-multimedia/gstreamer-1.14/gst-plugins-package.inc index 9df91482..c90975fe 100644 --- a/contrib/recipes-multimedia/gstreamer-1.14/gst-plugins-package.inc +++ b/contrib/recipes-multimedia/gstreamer-1.14/gst-plugins-package.inc @@ -1,5 +1,5 @@ -PACKAGESPLITFUNCS_prepend = " split_gstreamer10_packages " -PACKAGESPLITFUNCS_append = " set_metapkg_rdepends " +PACKAGESPLITFUNCS:prepend = " split_gstreamer10_packages " +PACKAGESPLITFUNCS:append = " set_metapkg_rdepends " python split_gstreamer10_packages () { gst_libdir = d.expand('${libdir}/gstreamer-${LIBV}') @@ -19,8 +19,8 @@ python set_metapkg_rdepends () { pn = d.getVar('PN') metapkg = pn + '-meta' - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - d.setVar('FILES_' + metapkg, "") + d.setVar('ALLOW_EMPTY:' + metapkg, "1") + d.setVar('FILES:' + metapkg, "") blacklist = [ pn, pn + '-meta' ] metapkg_rdepends = [] pkgdest = d.getVar('PKGDEST') @@ -37,23 +37,23 @@ python set_metapkg_rdepends () { is_empty = len(dir_contents) == 0 if not is_empty: metapkg_rdepends.append(pkg) - d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) - d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package') + d.setVar('RDEPENDS:' + metapkg, ' '.join(metapkg_rdepends)) + d.setVar('DESCRIPTION:' + metapkg, pn + ' meta package') } # each plugin-dev depends on PN-dev, plugin-staticdev on PN-staticdev # so we need them even when empty (like in gst-plugins-good case) -ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-dev = "1" -ALLOW_EMPTY_${PN}-staticdev = "1" +ALLOW_EMPTY:${PN} = "1" +ALLOW_EMPTY:${PN}-dev = "1" +ALLOW_EMPTY:${PN}-staticdev = "1" PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib" # Dynamically generate packages for all enabled plugins PACKAGES_DYNAMIC = "^${PN}-.* ^libgst.*" -FILES_${PN} = "" -FILES_${PN}-apps = "${bindir}" -FILES_${PN}-glib = "${datadir}/glib-2.0" +FILES:${PN} = "" +FILES:${PN}-apps = "${bindir}" +FILES:${PN}-glib = "${datadir}/glib-2.0" -RRECOMMENDS_${PN} += "${PN}-meta" +RRECOMMENDS:${PN} += "${PN}-meta" diff --git a/contrib/recipes-multimedia/gstreamer-1.14/gst-validate_1.14.4.bb b/contrib/recipes-multimedia/gstreamer-1.14/gst-validate_1.14.4.bb index a4b3b465..6314528c 100644 --- a/contrib/recipes-multimedia/gstreamer-1.14/gst-validate_1.14.4.bb +++ b/contrib/recipes-multimedia/gstreamer-1.14/gst-validate_1.14.4.bb @@ -13,9 +13,9 @@ SRC_URI[md5sum] = "1f4fc5308695adfdc11d13046aa4888c" SRC_URI[sha256sum] = "18dccca94bdc0bab3cddb07817bd280df7ab4abbec9a83b92620367a22d955c7" DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" -RRECOMMENDS_${PN} = "git" +RRECOMMENDS:${PN} = "git" -FILES_${PN} += "${datadir}/gstreamer-1.0/* ${libdir}/gst-validate-launcher/* ${libdir}/gstreamer-1.0/*" +FILES:${PN} += "${datadir}/gstreamer-1.0/* ${libdir}/gst-validate-launcher/* ${libdir}/gstreamer-1.0/*" inherit pkgconfig gettext autotools gobject-introspection gtk-doc upstream-version-is-even diff --git a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-libav_1.14.4.bb b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-libav_1.14.4.bb index 5c9c372f..06fa1b1d 100644 --- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-libav_1.14.4.bb +++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-libav_1.14.4.bb @@ -50,21 +50,21 @@ LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ --cross-prefix='${HOST_PREFIX}'" # Disable assembly optimizations for X32, as this libav lacks the support -PACKAGECONFIG_remove_linux-gnux32 = "yasm" -LIBAV_EXTRA_CONFIGURE_COMMON_ARG_append_linux-gnux32 = " --disable-asm" +PACKAGECONFIG:remove:linux-gnux32 = "yasm" +LIBAV_EXTRA_CONFIGURE_COMMON_ARG:append:linux-gnux32 = " --disable-asm" LIBAV_EXTRA_CONFIGURE_COMMON = \ '${LIBAV_EXTRA_CONFIGURE}="${LIBAV_EXTRA_CONFIGURE_COMMON_ARG}"' EXTRA_OECONF = "${LIBAV_EXTRA_CONFIGURE_COMMON}" -FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" -FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" +FILES:${PN} += "${libdir}/gstreamer-1.0/*.so" +FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.la" +FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" # http://errors.yoctoproject.org/Errors/Details/20493/ -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" # ffmpeg/libav disables PIC on some platforms (e.g. x86-32) -INSANE_SKIP_${PN} = "textrel" +INSANE_SKIP:${PN} = "textrel" diff --git a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-meta-base.bb b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-meta-base.bb index 016e1767..57a9adba 100644 --- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-meta-base.bb +++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-meta-base.bb @@ -18,13 +18,13 @@ PACKAGES = "\ gstreamer1.0-meta-debug \ gstreamer1.0-meta-video" -ALLOW_EMPTY_gstreamer1.0-meta-base = "1" -ALLOW_EMPTY_gstreamer1.0-meta-x11-base = "1" -ALLOW_EMPTY_gstreamer1.0-meta-audio = "1" -ALLOW_EMPTY_gstreamer1.0-meta-debug = "1" -ALLOW_EMPTY_gstreamer1.0-meta-video = "1" +ALLOW_EMPTY:gstreamer1.0-meta-base = "1" +ALLOW_EMPTY:gstreamer1.0-meta-x11-base = "1" +ALLOW_EMPTY:gstreamer1.0-meta-audio = "1" +ALLOW_EMPTY:gstreamer1.0-meta-debug = "1" +ALLOW_EMPTY:gstreamer1.0-meta-video = "1" -RDEPENDS_gstreamer1.0-meta-base = "\ +RDEPENDS:gstreamer1.0-meta-base = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gstreamer1.0-meta-x11-base', '', d)} \ gstreamer1.0 \ gstreamer1.0-plugins-base-playback \ @@ -39,11 +39,11 @@ RDEPENDS_gstreamer1.0-meta-base = "\ gstreamer1.0-plugins-good-autodetect \ gstreamer1.0-plugins-good-soup" -RRECOMMENDS_gstreamer1.0-meta-x11-base = "\ +RRECOMMENDS:gstreamer1.0-meta-x11-base = "\ gstreamer1.0-plugins-base-ximagesink \ gstreamer1.0-plugins-base-xvimagesink" -RDEPENDS_gstreamer1.0-meta-audio = "\ +RDEPENDS:gstreamer1.0-meta-audio = "\ gstreamer1.0-meta-base \ gstreamer1.0-plugins-base-vorbis \ gstreamer1.0-plugins-base-ogg \ @@ -51,18 +51,18 @@ RDEPENDS_gstreamer1.0-meta-audio = "\ gstreamer1.0-plugins-good-flac \ ${COMMERCIAL_AUDIO_PLUGINS}" -RDEPENDS_gstreamer1.0-meta-debug = "\ +RDEPENDS:gstreamer1.0-meta-debug = "\ gstreamer1.0-meta-base \ gstreamer1.0-plugins-good-debug \ gstreamer1.0-plugins-base-audiotestsrc \ gstreamer1.0-plugins-base-videotestsrc" -RDEPENDS_gstreamer1.0-meta-video = "\ +RDEPENDS:gstreamer1.0-meta-video = "\ gstreamer1.0-meta-base \ gstreamer1.0-plugins-good-avi \ gstreamer1.0-plugins-good-matroska \ gstreamer1.0-plugins-base-theora \ ${COMMERCIAL_VIDEO_PLUGINS}" -RRECOMMENDS_gstreamer1.0-meta-video = "\ +RRECOMMENDS:gstreamer1.0-meta-video = "\ gstreamer1.0-meta-audio" diff --git a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-omx_1.14.4.bb b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-omx_1.14.4.bb index 39ca1e38..6a2daecf 100644 --- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-omx_1.14.4.bb +++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-omx_1.14.4.bb @@ -50,8 +50,8 @@ set_omx_core_name() { } do_install[postfuncs] += " set_omx_core_name " -FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" -FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" +FILES:${PN} += "${libdir}/gstreamer-1.0/*.so" +FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.la" +FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" -RDEPENDS_${PN} = "libomxil" +RDEPENDS:${PN} = "libomxil" diff --git a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-bad_1.14.4.bb b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-bad_1.14.4.bb index 2d944fb2..6bf7db7f 100644 --- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-bad_1.14.4.bb +++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-bad_1.14.4.bb @@ -142,9 +142,9 @@ EXTRA_OECONF += " \ export OPENCV_PREFIX = "${STAGING_DIR_TARGET}${prefix}" -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" -FILES_${PN}-freeverb += "${datadir}/gstreamer-${LIBV}/presets/GstFreeverb.prs" -FILES_${PN}-opencv += "${datadir}/gst-plugins-bad/${LIBV}/opencv*" -FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-${LIBV}/presets/GstVoAmrwbEnc.prs" +FILES:${PN}-freeverb += "${datadir}/gstreamer-${LIBV}/presets/GstFreeverb.prs" +FILES:${PN}-opencv += "${datadir}/gst-plugins-bad/${LIBV}/opencv*" +FILES:${PN}-voamrwbenc += "${datadir}/gstreamer-${LIBV}/presets/GstVoAmrwbEnc.prs" diff --git a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-base_1.14.4.bb b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-base_1.14.4.bb index 61c71163..860e9368 100644 --- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-base_1.14.4.bb +++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-base_1.14.4.bb @@ -68,9 +68,9 @@ PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland wayland-protocols libdrm" PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" -FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/include/gst/gl/gstglconfig.h" -FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" +FILES:${PN}-dev += "${libdir}/gstreamer-${LIBV}/include/gst/gl/gstglconfig.h" +FILES:${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" -do_compile_prepend() { +do_compile:prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst-libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst-libs/gst/rtp/.libs:${B}/gst-libs/gst/allocators/.libs" } diff --git a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-good_1.14.4.bb b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-good_1.14.4.bb index e9cf5b7b..92dd243e 100644 --- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-good_1.14.4.bb +++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-good_1.14.4.bb @@ -20,8 +20,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" DEPENDS += "gstreamer1.0-plugins-base libcap" -RPROVIDES_${PN}-pulseaudio += "${PN}-pulse" -RPROVIDES_${PN}-soup += "${PN}-souphttpsrc" +RPROVIDES:${PN}-pulseaudio += "${PN}-pulse" +RPROVIDES:${PN}-soup += "${PN}-souphttpsrc" inherit gettext @@ -77,4 +77,4 @@ EXTRA_OECONF += " \ --disable-waveform \ " -FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" +FILES:${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" diff --git a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-ugly_1.14.4.bb b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-ugly_1.14.4.bb index 8f5cdeac..708c09e9 100644 --- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-ugly_1.14.4.bb +++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins-ugly_1.14.4.bb @@ -37,5 +37,5 @@ EXTRA_OECONF += " \ --disable-sidplay \ " -FILES_${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs" -FILES_${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs" +FILES:${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs" +FILES:${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs" diff --git a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins.inc b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins.inc index 289d449e..cd53c5bf 100644 --- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins.inc +++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-plugins.inc @@ -5,7 +5,7 @@ SECTION = "multimedia" DEPENDS = "gstreamer1.0 glib-2.0-native" -SRC_URI_append = " file://gtk-doc-tweaks.patch" +SRC_URI:append = " file://gtk-doc-tweaks.patch" inherit autotools pkgconfig upstream-version-is-even gtk-doc diff --git a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-python_1.14.4.bb b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-python_1.14.4.bb index a37b0f39..1e83e11b 100644 --- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-python_1.14.4.bb +++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-python_1.14.4.bb @@ -10,7 +10,7 @@ SRC_URI[md5sum] = "d4c0e3915f547feef49208ee08981e5a" SRC_URI[sha256sum] = "d0fdb24f93b6d889f309d2f526b8ea9577e0084ff0a62b4623ef1aed52e85a1b" DEPENDS = "gstreamer1.0 python3-pygobject" -RDEPENDS_${PN} += "gstreamer1.0 python3-pygobject" +RDEPENDS:${PN} += "gstreamer1.0 python3-pygobject" PNREAL = "gst-python" @@ -18,11 +18,11 @@ S = "${WORKDIR}/${PNREAL}-${PV}" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection" +UNKNOWN_CONFIGURE_WHITELIST:append = " --enable-introspection --disable-introspection" inherit autotools pkgconfig distutils3-base upstream-version-is-even gobject-introspection features_check -do_install_append() { +do_install:append() { # gstpythonplugin hardcodes the location of the libpython from the build # workspace and then fails at runtime. We can override it using # --with-libpython-dir=${libdir}, but it still fails because it looks for a diff --git a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-vaapi_1.14.4.bb b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-vaapi_1.14.4.bb index 73a17bae..a571449b 100644 --- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-vaapi_1.14.4.bb +++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0-vaapi_1.14.4.bb @@ -45,7 +45,7 @@ PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/libgl" PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender" -FILES_${PN} += "${libdir}/gstreamer-*/*.so" -FILES_${PN}-dbg += "${libdir}/gstreamer-*/.debug" -FILES_${PN}-dev += "${libdir}/gstreamer-*/*.la ${libdir}/gstreamer-*/*.a" -FILES_${PN}-tests = "${bindir}/*" +FILES:${PN} += "${libdir}/gstreamer-*/*.so" +FILES:${PN}-dbg += "${libdir}/gstreamer-*/.debug" +FILES:${PN}-dev += "${libdir}/gstreamer-*/*.la ${libdir}/gstreamer-*/*.a" +FILES:${PN}-tests = "${bindir}/*" diff --git a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0_1.14.4.bb b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0_1.14.4.bb index 9471bc0a..1abe42b5 100644 --- a/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0_1.14.4.bb +++ b/contrib/recipes-multimedia/gstreamer-1.14/gstreamer1.0_1.14.4.bb @@ -53,11 +53,11 @@ CACHED_CONFIGUREVARS += "ac_cv_header_sys_poll_h=no" PACKAGES += "${PN}-bash-completion" -FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la ${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/include" -FILES_${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadir}/bash-completion/helpers/gst*" +FILES:${PN} += "${libdir}/gstreamer-1.0/*.so" +FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.la ${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/include" +FILES:${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadir}/bash-completion/helpers/gst*" -RDEPENDS_${PN}-ptest += "make" +RDEPENDS:${PN}-ptest += "make" delete_pkg_m4_file() { # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection @@ -67,7 +67,7 @@ delete_pkg_m4_file() { do_configure[prefuncs] += "delete_pkg_m4_file" -do_compile_prepend() { +do_compile:prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/.libs" } diff --git a/contrib/recipes-test/tegra-tests/gpu-burn_git.bb b/contrib/recipes-test/tegra-tests/gpu-burn_git.bb index 406948e4..69f9192f 100644 --- a/contrib/recipes-test/tegra-tests/gpu-burn_git.bb +++ b/contrib/recipes-test/tegra-tests/gpu-burn_git.bb @@ -17,4 +17,4 @@ inherit cuda cmake pkgconfig EXTRA_OECMAKE = "-DCMAKE_INSTALL_PREFIX=/opt/cudatests" lcl_maybe_fortify = "" -FILES_${PN} = "/opt/cudatests" +FILES:${PN} = "/opt/cudatests" diff --git a/external/meta-python/recipes-devtools/python3-tensorrt/python3-tensorrt_7.1.3-1.bb b/external/meta-python/recipes-devtools/python3-tensorrt/python3-tensorrt_7.1.3-1.bb index 29d46ff0..4f64f853 100644 --- a/external/meta-python/recipes-devtools/python3-tensorrt/python3-tensorrt_7.1.3-1.bb +++ b/external/meta-python/recipes-devtools/python3-tensorrt/python3-tensorrt_7.1.3-1.bb @@ -56,4 +56,4 @@ do_install() { distutils3_do_install } -RDEPENDS_${PN} = "python3-ctypes python3-numpy" +RDEPENDS:${PN} = "python3-ctypes python3-numpy" diff --git a/external/openembedded-layer/recipes-kernel/spidev-test/spidev-test.bbappend b/external/openembedded-layer/recipes-kernel/spidev-test/spidev-test.bbappend index 6e21f2d4..9e65f814 100644 --- a/external/openembedded-layer/recipes-kernel/spidev-test/spidev-test.bbappend +++ b/external/openembedded-layer/recipes-kernel/spidev-test/spidev-test.bbappend @@ -1,4 +1,4 @@ -do_install_tegra() { +do_install:tegra() { if egrep -q '^([23]\.|4\.([0-9]|1[0-3])\.)' ${STAGING_KERNEL_BUILDDIR}/kernel-abiversion; then install -d ${D}${bindir} install -m 0755 ${S}/tools/spi/spidev_test ${S}/tools/spi/spidev_fdx ${D}${bindir}/ @@ -7,4 +7,4 @@ do_install_tegra() { fi } -RRECOMMENDS_${PN}_append_tegra = " kernel-module-spidev" +RRECOMMENDS:${PN}:append:tegra = " kernel-module-spidev" diff --git a/external/openembedded-layer/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend b/external/openembedded-layer/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend index 1072745b..0cfad70f 100644 --- a/external/openembedded-layer/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend +++ b/external/openembedded-layer/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend @@ -1,15 +1,15 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append_tegra = " \ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI:append:tegra = " \ file://0001-Make-plugin-directory-relative-to-ORIGIN.patch \ file://0002-Replace-stat-fstat-calls-with-__xstat-__fxstat.patch \ " -EXTRA_OECONF_tegra = " --without-jpeg" -DEPENDS_remove_tegra = "jpeg" +EXTRA_OECONF:tegra = " --without-jpeg" +DEPENDS:remove:tegra = "jpeg" TEGRA_PLUGINS ?= "" -TEGRA_PLUGINS_tegra = "tegra-libraries-libv4l-plugins" -RRECOMMENDS_libv4l += "${TEGRA_PLUGINS}" +TEGRA_PLUGINS:tegra = "tegra-libraries-libv4l-plugins" +RRECOMMENDS:libv4l += "${TEGRA_PLUGINS}" inherit container-runtime-csv CONTAINER_CSV_BASENAME = "libv4l" @@ -17,6 +17,6 @@ CONTAINER_CSV_FILES = "${libdir}/*.so* ${libdir}/libv4l/ov* ${libdir}/libv4l/*.s # These files aren't in nvidia host-files-for-container.d/l4t.csv and conflict with attempts # to install v4l-utils inside the container (Invalid cross-device link) CONTAINER_CSV_EXCLUDE_FILES = "${libdir}/libv4l2rds*" -RDEPENDS_libv4l_append_tegra = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${CONTAINER_CSV_PKGNAME}', '', d)}" -RDEPENDS_${PN}_remove = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${CONTAINER_CSV_PKGNAME}', '', d)}" -PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}" +RDEPENDS:libv4l:append:tegra = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${CONTAINER_CSV_PKGNAME}', '', d)}" +RDEPENDS:${PN}:remove = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${CONTAINER_CSV_PKGNAME}', '', d)}" +PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}" diff --git a/external/openembedded-layer/recipes-support/libusbgx/libusbgx-config.bbappend b/external/openembedded-layer/recipes-support/libusbgx/libusbgx-config.bbappend index 3762022b..8a353781 100644 --- a/external/openembedded-layer/recipes-support/libusbgx/libusbgx-config.bbappend +++ b/external/openembedded-layer/recipes-support/libusbgx/libusbgx-config.bbappend @@ -1,12 +1,12 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -SRC_URI_append_tegra = " \ +SRC_URI:append:tegra = " \ file://l4t.schema.in \ file://usbgx-overrides.conf \ file://l4t-gadget-config-setup.sh \ " -do_install_append_tegra() { +do_install:append:tegra() { install -d ${D}${datadir}/usbgx install -m 0644 ${WORKDIR}/l4t.schema.in ${D}${datadir}/usbgx/ install -d ${D}${sysconfdir}/usbgx @@ -18,5 +18,5 @@ do_install_append_tegra() { sed -i -e's,^IMPORT_SCHEMAS=.*,IMPORT_SCHEMAS="l4t",' ${D}${sysconfdir}/default/usbgx } -FILES_${PN} += "${datadir}/usbgx" -PACKAGE_ARCH_tegra = "${MACHINE_ARCH}" +FILES:${PN} += "${datadir}/usbgx" +PACKAGE_ARCH:tegra = "${MACHINE_ARCH}" diff --git a/external/openembedded-layer/recipes-support/libusbgx/libusbgx_%.bbappend b/external/openembedded-layer/recipes-support/libusbgx/libusbgx_%.bbappend index cc6630e9..7508f25e 100644 --- a/external/openembedded-layer/recipes-support/libusbgx/libusbgx_%.bbappend +++ b/external/openembedded-layer/recipes-support/libusbgx/libusbgx_%.bbappend @@ -1,6 +1,6 @@ -PACKAGES_prepend_tegra = "${PN}-examples " -FILES_${PN}-examples = "${bindir}/gadget-acm-ecm ${bindir}/gadget-export ${bindir}/gadget-ffs \ +PACKAGES::prepend:tegra = "${PN}-examples " +FILES:${PN}-examples = "${bindir}/gadget-acm-ecm ${bindir}/gadget-export ${bindir}/gadget-ffs \ ${bindir}/gadget-hid ${bindir}/gadget-midi ${bindir}/gadget-ms \ ${bindir}/gadget-rndis-os-desc ${bindir}/gadget-uac2" -RRECOMMENDS_${PN}_append_tegra = " kernel-module-tegra-xudc" -PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}" +RRECOMMENDS:${PN}:append:tegra = " kernel-module-tegra-xudc" +PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}" diff --git a/external/openembedded-layer/recipes-support/opencv/opencv_4.5.%.bbappend b/external/openembedded-layer/recipes-support/opencv/opencv_4.5.%.bbappend index beec4c9b..d1d9f86f 100644 --- a/external/openembedded-layer/recipes-support/opencv/opencv_4.5.%.bbappend +++ b/external/openembedded-layer/recipes-support/opencv/opencv_4.5.%.bbappend @@ -1,12 +1,12 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" inherit cuda -EXTRA_OECMAKE_append_tegra210 = ' -DWITH_CUDA=ON -DCUDA_ARCH_BIN="5.3" -DCUDA_ARCH_PTX=""' -EXTRA_OECMAKE_append_tegra186 = ' -DWITH_CUDA=ON -DCUDA_ARCH_BIN="6.2" -DCUDA_ARCH_PTX=""' -EXTRA_OECMAKE_append_tegra194 = ' -DWITH_CUDA=ON -DCUDA_ARCH_BIN="7.2" -DCUDA_ARCH_PTX=""' +EXTRA_OECMAKE:append:tegra210 = ' -DWITH_CUDA=ON -DCUDA_ARCH_BIN="5.3" -DCUDA_ARCH_PTX=""' +EXTRA_OECMAKE:append:tegra186 = ' -DWITH_CUDA=ON -DCUDA_ARCH_BIN="6.2" -DCUDA_ARCH_PTX=""' +EXTRA_OECMAKE:append:tegra194 = ' -DWITH_CUDA=ON -DCUDA_ARCH_BIN="7.2" -DCUDA_ARCH_PTX=""' -EXTRA_OECMAKE_append = " -DOPENCV_GENERATE_PKGCONFIG=ON" +EXTRA_OECMAKE:append = " -DOPENCV_GENERATE_PKGCONFIG=ON" OPTICALFLOW_MD5 = "a73cd48b18dcc0cc8933b30796074191" OPTICALFLOW_HASH = "edb50da3cf849840d680249aa6dbef248ebce2ca" @@ -17,7 +17,7 @@ SRC_URI[opticalflow.md5sum] = "${OPTICALFLOW_MD5}" SRC_URI[opticalflow.sha256sum] = "e300c02e4900741700b2b857965d2589f803390849e1e2022732e02f4ae9be44" # No stable URI is available for NVIDIAOpticalFlowSDK -INSANE_SKIP_append = " src-uri-bad" +INSANE_SKIP:append = " src-uri-bad" -DEPENDS_append_cuda = "${@' cudnn' if 'dnn' in d.getVar('PACKAGECONFIG') else ''}" +DEPENDS:append:cuda = "${@' cudnn' if 'dnn' in d.getVar('PACKAGECONFIG') else ''}" SRC_URI += "file://0001-Fix-search-paths-in-FindCUDNN.cmake.patch" diff --git a/external/virtualization-layer/recipes-containers/docker/docker-ce_%.bbappend b/external/virtualization-layer/recipes-containers/docker/docker-ce_%.bbappend index 2ebffeb3..d5aafb6b 100644 --- a/external/virtualization-layer/recipes-containers/docker/docker-ce_%.bbappend +++ b/external/virtualization-layer/recipes-containers/docker/docker-ce_%.bbappend @@ -1,11 +1,11 @@ -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init fi } -RRECOMMENDS_${PN}_append = " \ +RRECOMMENDS:${PN}:append = " \ kernel-module-br-netfilter \ kernel-module-esp4 \ kernel-module-ip-vs \ diff --git a/external/virtualization-layer/recipes-containers/libnvidia-container-tools/libnvidia-container-tools_0.9.0.bb b/external/virtualization-layer/recipes-containers/libnvidia-container-tools/libnvidia-container-tools_0.9.0.bb index ce247713..5e383fc8 100644 --- a/external/virtualization-layer/recipes-containers/libnvidia-container-tools/libnvidia-container-tools_0.9.0.bb +++ b/external/virtualization-layer/recipes-containers/libnvidia-container-tools/libnvidia-container-tools_0.9.0.bb @@ -65,12 +65,12 @@ def build_date(d): # include bmake-native which does not exist at the moment. EXTRA_OEMAKE = "EXCLUDE_BUILD_FLAGS=1 PLATFORM=${HOST_ARCH} JETSON=TRUE WITH_LIBELF=yes ${@build_date(d)} ${PACKAGECONFIG_CONFARGS}" -CFLAGS_prepend = " -I=/usr/include/tirpc-1.2.6 " +CFLAGS:prepend = " -I=/usr/include/tirpc-1.2.6 " export OBJCPY="${OBJCOPY}" # Fix me: Create an independent recipe for nvidia-modprobe -do_configure_append() { +do_configure:append() { # Mark Nvidia modprobe as downloaded touch ${S}/deps/src/nvidia-modprobe-${NVIDIA_MODPROBE_VERSION}/.download_stamp } @@ -79,4 +79,4 @@ do_install () { oe_runmake install DESTDIR=${D} } -INSANE_SKIP_${PN} = "already-stripped" +INSANE_SKIP:${PN} = "already-stripped" diff --git a/external/virtualization-layer/recipes-containers/libnvidia-container-tools/libtirpc126_1.2.6.bb b/external/virtualization-layer/recipes-containers/libnvidia-container-tools/libtirpc126_1.2.6.bb index d2d851ee..36c2949c 100644 --- a/external/virtualization-layer/recipes-containers/libnvidia-container-tools/libtirpc126_1.2.6.bb +++ b/external/virtualization-layer/recipes-containers/libnvidia-container-tools/libtirpc126_1.2.6.bb @@ -19,7 +19,7 @@ inherit autotools pkgconfig DISABLE_STATIC = "" EXTRA_OECONF = "--disable-gssapi --enable-static" -do_install_append() { +do_install:append() { rm -r ${D}${sysconfdir} ${D}${datadir} ${D}${libdir}/pkgconfig rm ${D}${libdir}/*.so* mv ${D}${includedir}/tirpc ${D}${includedir}/tirpc-1.2.6 diff --git a/external/virtualization-layer/recipes-containers/nvidia-container-runtime/nvidia-container-runtime_3.1.0.bb b/external/virtualization-layer/recipes-containers/nvidia-container-runtime/nvidia-container-runtime_3.1.0.bb index f81d69c3..eaa34207 100644 --- a/external/virtualization-layer/recipes-containers/nvidia-container-runtime/nvidia-container-runtime_3.1.0.bb +++ b/external/virtualization-layer/recipes-containers/nvidia-container-runtime/nvidia-container-runtime_3.1.0.bb @@ -37,13 +37,13 @@ do_compile() { cd ${B} } -do_install_append_tegra() { +do_install:append:tegra() { install -d -m 755 ${D}${sysconfdir}/nvidia-container-runtime/host-files-for-container.d install -m 0644 ${WORKDIR}/l4t.csv ${D}${sysconfdir}/nvidia-container-runtime/host-files-for-container.d/l4t.csv } -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ nvidia-container-toolkit \ docker-ce \ " -RDEPENDS_${PN}-dev += "bash make" +RDEPENDS:${PN}-dev += "bash make" diff --git a/external/virtualization-layer/recipes-containers/nvidia-container-toolkit/nvidia-container-toolkit_1.0.5.bb b/external/virtualization-layer/recipes-containers/nvidia-container-toolkit/nvidia-container-toolkit_1.0.5.bb index 6ad7ad20..616d51ee 100644 --- a/external/virtualization-layer/recipes-containers/nvidia-container-toolkit/nvidia-container-toolkit_1.0.5.bb +++ b/external/virtualization-layer/recipes-containers/nvidia-container-toolkit/nvidia-container-toolkit_1.0.5.bb @@ -23,7 +23,7 @@ REQUIRED_DISTRO_FEATURES = "virtualization" inherit go features_check -do_install_append(){ +do_install:append(){ install -d ${D}${sysconfdir}/nvidia-container-runtime ${D}${libexecdir}/oci/hooks.d ${D}/${datadir}/oci/hooks.d install ${S}/src/${GO_IMPORT}/config/config.toml.centos ${D}${sysconfdir}/nvidia-container-runtime/config.toml install ${S}/src/${GO_IMPORT}/oci-nvidia-hook ${D}${libexecdir}/oci/hooks.d @@ -31,10 +31,10 @@ do_install_append(){ ln -sf nvidia-container-toolkit ${D}${bindir}/nvidia-container-runtime-hook } -FILES_${PN} += "${datadir}/oci" +FILES:${PN} += "${datadir}/oci" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ libnvidia-container-tools \ docker-ce \ " -RDEPENDS_${PN}-dev += "bash make" +RDEPENDS:${PN}-dev += "bash make" diff --git a/external/virtualization-layer/recipes-containers/nvidia-docker/nvidia-docker_2.2.2.bb b/external/virtualization-layer/recipes-containers/nvidia-docker/nvidia-docker_2.2.2.bb index 6418688b..c0378644 100644 --- a/external/virtualization-layer/recipes-containers/nvidia-docker/nvidia-docker_2.2.2.bb +++ b/external/virtualization-layer/recipes-containers/nvidia-docker/nvidia-docker_2.2.2.bb @@ -29,4 +29,4 @@ do_install() { install -m 644 ${S}/daemon.json ${D}/${sysconfdir}/docker } -RDEPENDS_${PN} = "nvidia-container-runtime bash" +RDEPENDS:${PN} = "nvidia-container-runtime bash" diff --git a/external/virtualization-layer/recipes-kernel/linux-tegra_%.bbappend b/external/virtualization-layer/recipes-kernel/linux-tegra_%.bbappend index 1ceba8e6..eab70a98 100644 --- a/external/virtualization-layer/recipes-kernel/linux-tegra_%.bbappend +++ b/external/virtualization-layer/recipes-kernel/linux-tegra_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'kvm', 'file://kvm.cfg', '', d)}" +SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'kvm', 'file://kvm.cfg', '', d)}" diff --git a/recipes-bsp/alsa-state/alsa-state.bbappend b/recipes-bsp/alsa-state/alsa-state.bbappend index eedb3ad2..82b3a6f6 100644 --- a/recipes-bsp/alsa-state/alsa-state.bbappend +++ b/recipes-bsp/alsa-state/alsa-state.bbappend @@ -1,9 +1,9 @@ -PACKAGE_ARCH_tegra = "${MACHINE_ARCH}" +PACKAGE_ARCH:tegra = "${MACHINE_ARCH}" -do_install_append_tegra() { +do_install:append:tegra() { rm ${D}${sysconfdir}/asound.conf rmdir ${D}${sysconfdir} 2>/dev/null || true } -RDEPENDS_${PN}_append_tegra = " tegra-configs-alsa" -ALLOW_EMPTY_${PN}_tegra = "1" +RDEPENDS:${PN}:append:tegra = " tegra-configs-alsa" +ALLOW_EMPTY:${PN:}:tegra = "1" diff --git a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc index cb0c9fb9..b26b352b 100644 --- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc +++ b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc @@ -23,7 +23,7 @@ AS[unexport] = "1" LD[unexport] = "1" TARGET_SOC = "t186" -TARGET_SOC_tegra194 = "t194" +TARGET_SOC:tegra194 = "t194" def generate_build_timestamp(d): from datetime import datetime @@ -38,7 +38,7 @@ BUILD_STRING ??= "" EXTRA_OEMAKE = 'BUILD_BASE=${B} CROSS_COMPILE="${TARGET_PREFIX}" PLAT=tegra \ DEBUG=0 LOG_LEVEL=20 V=0 TARGET_SOC=${TARGET_SOC} ${BUILDTIMESTAMP} ${BUILD_STRING} ${PACKAGECONFIG_CONFARGS}' -do_configure_append() { +do_configure:append() { oe_runmake -C ${S} clean } @@ -51,6 +51,6 @@ do_install() { install -m 0644 ${B}/tegra/${TARGET_SOC}/release/bl31.bin ${D}${datadir}/trusted-os/ } -ALLOW_EMPTY_${PN} = "1" -FILES_${PN}-dev = "${datadir}/trusted-os" +ALLOW_EMPTY:${PN} = "1" +FILES:${PN}-dev = "${datadir}/trusted-os" PACKAGE_ARCH = "${SOC_FAMILY_PKGARCH}" diff --git a/recipes-bsp/bootlogo/bootlogo-custom_1.0.bb b/recipes-bsp/bootlogo/bootlogo-custom_1.0.bb index 49baf0a2..a6468744 100644 --- a/recipes-bsp/bootlogo/bootlogo-custom_1.0.bb +++ b/recipes-bsp/bootlogo/bootlogo-custom_1.0.bb @@ -34,7 +34,7 @@ BMP_SYMLINK = "bootlogo-${MACHINE}.blob" include bootlogo.inc FLASHTOOLS_DIR = "${SOC_FAMILY}-flash" -FLASHTOOLS_DIR_tegra194 = "tegra186-flash" +FLASHTOOLS_DIR:tegra194 = "tegra186-flash" do_compile() { diff --git a/recipes-bsp/cboot/cboot-extlinux.bb b/recipes-bsp/cboot/cboot-extlinux.bb index 123b1b81..c86e6edf 100644 --- a/recipes-bsp/cboot/cboot-extlinux.bb +++ b/recipes-bsp/cboot/cboot-extlinux.bb @@ -90,5 +90,5 @@ do_install() { install -m 0644 ${B}/extlinux.conf ${D}/boot/extlinux/ } -FILES_${PN} = "/boot" +FILES:${PN} = "/boot" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/cboot/cboot-t18x_32.5.2.bb b/recipes-bsp/cboot/cboot-t18x_32.5.2.bb index 1968fa89..d4394577 100644 --- a/recipes-bsp/cboot/cboot-t18x_32.5.2.bb +++ b/recipes-bsp/cboot/cboot-t18x_32.5.2.bb @@ -25,6 +25,6 @@ PACKAGECONFIG[machine-id] = "CONFIG_ENABLE_MACHINE_ID=1,," TARGET_SOC = "t186" COMPATIBLE_MACHINE = "(tegra186)" -PROVIDES_append = "${@' virtual/bootloader' if (d.getVar('PREFERRED_PROVIDER_virtual/bootloader') or '').startswith('cboot') else ''}" +PROVIDES:append = "${@' virtual/bootloader' if (d.getVar('PREFERRED_PROVIDER_virtual/bootloader') or '').startswith('cboot') else ''}" require cboot-l4t.inc diff --git a/recipes-bsp/cboot/cboot-t19x_32.5.2.bb b/recipes-bsp/cboot/cboot-t19x_32.5.2.bb index f8655fe4..c8c56d01 100644 --- a/recipes-bsp/cboot/cboot-t19x_32.5.2.bb +++ b/recipes-bsp/cboot/cboot-t19x_32.5.2.bb @@ -32,7 +32,7 @@ PACKAGECONFIG[extlinux] = "CONFIG_ENABLE_EXTLINUX_BOOT=1,," PACKAGECONFIG[machine-id] = "CONFIG_ENABLE_MACHINE_ID=1,," # Xavier NX devkits *must* have this option, or they cannot boot from the SDcard: -EXTRA_GLOBAL_DEFINES_append_jetson-xavier-nx-devkit = " CONFIG_ENABLE_BOOT_DEVICE_SELECT=1" +EXTRA_GLOBAL_DEFINES:append:jetson-xavier-nx-devkit = " CONFIG_ENABLE_BOOT_DEVICE_SELECT=1" TARGET_SOC = "t194" COMPATIBLE_MACHINE = "(tegra194)" diff --git a/recipes-bsp/l4t-usb-device-mode/l4t-usb-device-mode.bb b/recipes-bsp/l4t-usb-device-mode/l4t-usb-device-mode.bb index 1b5b307d..737e213c 100644 --- a/recipes-bsp/l4t-usb-device-mode/l4t-usb-device-mode.bb +++ b/recipes-bsp/l4t-usb-device-mode/l4t-usb-device-mode.bb @@ -29,5 +29,5 @@ do_install() { install -m 0644 ${S}/98-usb-gadget-tty.rules ${D}${sysconfdir}/udev/rules.d/ } -RDEPENDS_${PN} = "libusbgx" +RDEPENDS:${PN} = "libusbgx" diff --git a/recipes-bsp/tegra-binaries/cboot-prebuilt_32.5.2.bb b/recipes-bsp/tegra-binaries/cboot-prebuilt_32.5.2.bb index 4a291073..6c04ba9e 100644 --- a/recipes-bsp/tegra-binaries/cboot-prebuilt_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/cboot-prebuilt_32.5.2.bb @@ -5,8 +5,8 @@ COMPATIBLE_MACHINE = "(tegra)" INHIBIT_DEFAULT_DEPS = "1" CBOOTBIN_PREBUILT = "cboot.bin" -CBOOTBIN_PREBUILT_tegra194 = "cboot_t194.bin" -CBOOTBIN_PREBUILT_tegra210 = "t210ref/cboot.bin" +CBOOTBIN_PREBUILT:tegra194 = "cboot_t194.bin" +CBOOTBIN_PREBUILT:tegra210 = "t210ref/cboot.bin" PREFERRED_PROVIDER_virtual/bootloader ??= "" PROVIDES = "cboot" PROVIDES += "${@'virtual/bootloader' if d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') else ''}" diff --git a/recipes-bsp/tegra-binaries/gstreamer1.0-plugins-tegra-binaryonly_32.5.2.bb b/recipes-bsp/tegra-binaries/gstreamer1.0-plugins-tegra-binaryonly_32.5.2.bb index 02bd8949..c6c901c9 100644 --- a/recipes-bsp/tegra-binaries/gstreamer1.0-plugins-tegra-binaryonly_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/gstreamer1.0-plugins-tegra-binaryonly_32.5.2.bb @@ -41,13 +41,13 @@ do_install() { } FILES_SOLIBSDEV = "" -FILES_${PN} = "${libdir}" -DEBIAN_NOAUTONAME_${PN} = "1" +FILES:${PN} = "${libdir}" +DEBIAN_NOAUTONAME:${PN} = "1" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -INSANE_SKIP_${PN}-nvcompositor = "dev-so ldflags build-deps" -INSANE_SKIP_${PN} = "dev-so ldflags build-deps" -RDEPENDS_${PN} = "gstreamer1.0 libgstvideo-1.0 glib-2.0 libegl tegra-libraries libdrm" -RRECOMMENDS_${PN} = "gstreamer1.0-plugins-nvarguscamerasrc gstreamer1.0-plugins-nvv4l2camerasrc" +INSANE_SKIP:${PN}-nvcompositor = "dev-so ldflags build-deps" +INSANE_SKIP:${PN} = "dev-so ldflags build-deps" +RDEPENDS:${PN} = "gstreamer1.0 libgstvideo-1.0 glib-2.0 libegl tegra-libraries libdrm" +RRECOMMENDS:${PN} = "gstreamer1.0-plugins-nvarguscamerasrc gstreamer1.0-plugins-nvv4l2camerasrc" diff --git a/recipes-bsp/tegra-binaries/libdrm-nvdc_32.5.2.bb b/recipes-bsp/tegra-binaries/libdrm-nvdc_32.5.2.bb index ab776766..7462b269 100644 --- a/recipes-bsp/tegra-binaries/libdrm-nvdc_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/libdrm-nvdc_32.5.2.bb @@ -22,14 +22,14 @@ do_install() { install -Dpm 644 tegra.conf ${D}${sysconfdir}/ld.so.conf.d/tegra.conf } -DEBIAN_NOAUTONAME_${PN} = "1" -DEBIAN_NOAUTONAME_${PN}-dev = "1" -DEBIAN_NOAUTONAME_${PN}-dbg = "1" -FILES_${PN} = "${libdir} ${sysconfdir}/ld.so.conf.d" -FILES_${PN}-dev = "" +DEBIAN_NOAUTONAME:${PN} = "1" +DEBIAN_NOAUTONAME:${PN}-dev = "1" +DEBIAN_NOAUTONAME:${PN}-dbg = "1" +FILES:${PN} = "${libdir} ${sysconfdir}/ld.so.conf.d" +FILES:${PN}-dev = "" PRIVATE_LIBS = "libdrm.so.2" -RDEPENDS_${PN} = "tegra-libraries" -INSANE_SKIP_${PN} = "ldflags dev-so" +RDEPENDS:${PN} = "tegra-libraries" +INSANE_SKIP:${PN} = "ldflags dev-so" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/recipes-bsp/tegra-binaries/nv-tegra-release_32.5.2.bb b/recipes-bsp/tegra-binaries/nv-tegra-release_32.5.2.bb index ea7ecb75..f9710b87 100644 --- a/recipes-bsp/tegra-binaries/nv-tegra-release_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/nv-tegra-release_32.5.2.bb @@ -19,5 +19,5 @@ do_install() { install -m 0644 ${B}/nv_tegra_release ${D}${datadir}/nv_tegra } -FILES_${PN} = "${sysconfdir}" -FILES_${PN}-dev = "${datadir}/nv_tegra" +FILES:${PN} = "${sysconfdir}" +FILES:${PN}-dev = "${datadir}/nv_tegra" diff --git a/recipes-bsp/tegra-binaries/tegra-argus-daemon_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-argus-daemon_32.5.2.bb index 3a90b326..24cd9b01 100644 --- a/recipes-bsp/tegra-binaries/tegra-argus-daemon_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-argus-daemon_32.5.2.bb @@ -23,5 +23,5 @@ inherit systemd update-rc.d INITSCRIPT_NAME = "nvargus-daemon" INITSCRIPT_PARAMS = "defaults" -SYSTEMD_SERVICE_${PN} = "nvargus-daemon.service" -RDEPENDS_${PN} = "tegra-libraries-argus-daemon-base" +SYSTEMD_SERVICE:${PN} = "nvargus-daemon.service" +RDEPENDS:${PN} = "tegra-libraries-argus-daemon-base" diff --git a/recipes-bsp/tegra-binaries/tegra-binaries-32.5.2.inc b/recipes-bsp/tegra-binaries/tegra-binaries-32.5.2.inc index 75acb292..478ed011 100644 --- a/recipes-bsp/tegra-binaries/tegra-binaries-32.5.2.inc +++ b/recipes-bsp/tegra-binaries/tegra-binaries-32.5.2.inc @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://nv_tegra/LICENSE;md5=2cc00be68c1227a7c42ff3620ef75d05 SRC_URI = "${L4T_URI_BASE}/${L4T_BSP_PREFIX}_Linux_R${L4T_VERSION}_aarch64.tbz2;name=l4t \ ${L4T_ALT_URI_BASE}/secureboot_R${L4T_ALT_VERSION}_aarch64.tbz2;downloadfilename=${L4T_BSP_PREFIX}_secureboot_${L4T_ALT_VERSION}.tbz2;name=sb" L4T_SHA256SUM = "308e21bb708c41bada1e349fbe6a1dd9fd7294826edf7aa81073a3ed11fb0c93" -L4T_SHA256SUM_tegra210 = "6e61a77739fc9184d6eda5aa3de5a0d6b69659a78411cd2d9bcb3a59416bb8cd" +L4T_SHA256SUM:tegra210 = "6e61a77739fc9184d6eda5aa3de5a0d6b69659a78411cd2d9bcb3a59416bb8cd" SRC_URI[l4t.sha256sum] = "${L4T_SHA256SUM}" SB_SHA256SUM = "a795ef0e433ac1b3991f5597dd79e15e88d648170edcc25f2f2f3c1dd62c533b" -SB_SHA256SUM_tegra210 = "0fc525061d203ec2929d985ec711f477cca679cc8e4f0a4a32ca384681811808" +SB_SHA256SUM:tegra210 = "0fc525061d203ec2929d985ec711f477cca679cc8e4f0a4a32ca384681811808" SRC_URI[sb.sha256sum] = "${SB_SHA256SUM}" inherit l4t_bsp diff --git a/recipes-bsp/tegra-binaries/tegra-bootfiles_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-bootfiles_32.5.2.bb index 14a896c4..6be0a2d5 100644 --- a/recipes-bsp/tegra-binaries/tegra-bootfiles_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-bootfiles_32.5.2.bb @@ -13,7 +13,7 @@ SMD_CFG ?= "${S}/bootloader/smd_info.cfg" CBOOTOPTION_FILE ?= "" ODMFUSE_FILE ?= "" -BOOTBINS_tegra186 = "\ +BOOTBINS:tegra186 = "\ adsp-fw.bin \ bpmp.bin \ camera-rtcpu-sce.img \ @@ -28,7 +28,7 @@ BOOTBINS_tegra186 = "\ preboot_d15_prod_cr.bin \ spe.bin \ " -BOOTBINS_tegra194 = "\ +BOOTBINS:tegra194 = "\ adsp-fw.bin \ bpmp_t194.bin \ camera-rtcpu-rce.img \ @@ -47,7 +47,7 @@ BOOTBINS_tegra194 = "\ warmboot_t194_prod.bin \ " -BOOTBINS_tegra210 = "\ +BOOTBINS:tegra210 = "\ eks.img \ nvtboot_cpu.bin \ nvtboot_recovery.bin \ @@ -56,13 +56,13 @@ BOOTBINS_tegra210 = "\ tos-mon-only.img \ " -BOOTBINS_MACHINE_SPECIFIC_tegra186 = "\ +BOOTBINS_MACHINE_SPECIFIC:tegra186 = "\ nvtboot.bin \ warmboot.bin \ " -BOOTBINS_MACHINE_SPECIFIC_tegra194 = "" +BOOTBINS_MACHINE_SPECIFIC:tegra194 = "" -BOOTBINS_MACHINE_SPECIFIC_tegra210 = "\ +BOOTBINS_MACHINE_SPECIFIC:tegra210 = "\ nvtboot.bin \ sc7entry-firmware.bin \ warmboot.bin \ @@ -71,12 +71,12 @@ do_compile() { : } -do_compile_append_tegra186() { +do_compile:append:tegra186() { ${STAGING_BINDIR_NATIVE}/tegra186-flash/nv_smd_generator ${SMD_CFG} ${B}/slot_metadata.bin } -do_compile_append_tegra194() { +do_compile:append:tegra194() { ${STAGING_BINDIR_NATIVE}/tegra186-flash/nv_smd_generator ${SMD_CFG} ${B}/slot_metadata.bin if [ -n "${CBOOTOPTION_FILE}" ]; then dtc -I dts -O dtb -o ${B}/cbo.dtb ${CBOOTOPTION_FILE} @@ -97,7 +97,7 @@ do_install() { [ -z "${ODMFUSE_FILE}" ] || install -m 0644 ${ODMFUSE_FILE} ${D}${datadir}/tegraflash/odmfuse_pkc_${MACHINE}.xml } -do_install_append_tegra186() { +do_install:append:tegra186() { install -m 0644 ${B}/slot_metadata.bin ${D}${datadir}/tegraflash/ install -m 0644 ${S}/bootloader/${NVIDIA_BOARD}/BCT/tegra186* ${D}${datadir}/tegraflash/ install -m 0644 ${S}/bootloader/${NVIDIA_BOARD}/tegra186*bpmp*dtb ${D}${datadir}/tegraflash/ @@ -106,12 +106,12 @@ do_install_append_tegra186() { install -m 0644 ${S}/bootloader/${NVIDIA_BOARD}/BCT/emmc.cfg ${D}${datadir}/tegraflash/ } -do_install_append_jetson-xavier-nx-devkit-tx2-nx() { +do_install:append:jetson-xavier-nx-devkit-tx2-nx() { # XXX only 16GiB eMMC on tx2-nx sed -i -e's,num_sectors="61071360",num_sectors="30777344",' ${D}${datadir}/tegraflash/${PARTITION_LAYOUT_TEMPLATE} } -do_install_append_tegra194() { +do_install:append:tegra194() { install -m 0644 ${B}/slot_metadata.bin ${D}${datadir}/tegraflash/ install -m 0644 ${BCT_OVERRIDE_TEMPLATE} ${D}${datadir}/tegraflash/${MACHINE}-override.cfg install -m 0644 ${S}/bootloader/${NVIDIA_BOARD}/BCT/tegra19* ${D}${datadir}/tegraflash/ @@ -122,11 +122,11 @@ do_install_append_tegra194() { fi } -do_install_append_tegra210() { +do_install:append:tegra210() { [ -z "${NVIDIA_BOARD_CFG}" ] || install -m 0644 ${BOARD_CFG} ${D}${datadir}/tegraflash/board_config_${MACHINE}.xml } PACKAGES = "${PN}-dev" -FILES_${PN}-dev = "${datadir}" -RDEPENDS_${PN}-dev = "" +FILES:${PN}-dev = "${datadir}" +RDEPENDS:${PN}-dev = "" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/tegra-binaries/tegra-brcm-patchram_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-brcm-patchram_32.5.2.bb index 9eeb59e7..4e178ae5 100644 --- a/recipes-bsp/tegra-binaries/tegra-brcm-patchram_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-brcm-patchram_32.5.2.bb @@ -13,4 +13,4 @@ do_install() { } PACKAGES = "${PN}" -RDEPENDS_${PN} = "tegra-firmware-brcm" +RDEPENDS:${PN} = "tegra-firmware-brcm" diff --git a/recipes-bsp/tegra-binaries/tegra-configs-alsa_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-configs-alsa_32.5.2.bb index 1d171575..f8576aba 100644 --- a/recipes-bsp/tegra-binaries/tegra-configs-alsa_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-configs-alsa_32.5.2.bb @@ -20,16 +20,16 @@ do_install() { install -d ${D}${datadir}/alsa/cards } -do_install_append_tegra186() { +do_install:append:tegra186() { install -m 0644 ${B}/usr/share/alsa/cards/tegra-hda.conf ${D}${datadir}/alsa/cards/ install -m 0644 ${B}/usr/share/alsa/cards/tegra-snd-t186r.conf ${D}${datadir}/alsa/cards/ } -do_install_append_tegra194() { +do_install:append:tegra194() { install -m 0644 ${B}/usr/share/alsa/cards/tegra-hda-galen.conf ${D}${datadir}/alsa/cards/ install -m 0644 ${B}/usr/share/alsa/cards/tegra-hda-xnx.conf ${D}${datadir}/alsa/cards/ install -m 0644 ${B}/usr/share/alsa/cards/jetson-xaviernx.conf ${D}${datadir}/alsa/cards/ install -m 0644 ${B}/usr/share/alsa/cards/tegra-snd-t19x-.conf ${D}${datadir}/alsa/cards/ } -FILES_${PN} = "${sysconfdir} ${datadir}/alsa" +FILES:${PN} = "${sysconfdir} ${datadir}/alsa" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/tegra-binaries/tegra-configs_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-configs_32.5.2.bb index 34f7d2cf..b8748a28 100644 --- a/recipes-bsp/tegra-binaries/tegra-configs_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-configs_32.5.2.bb @@ -31,20 +31,20 @@ EOF install -m 0644 ${B}/etc/enctune.conf ${D}${sysconfdir} } -do_install_append_tegra186() { +do_install:append:tegra186() { install -m 0644 ${B}/etc/X11/xorg.conf.t186_ref ${D}${sysconfdir}/X11/xorg.conf } -do_install_append_tegra194() { +do_install:append:tegra194() { install -m 0644 ${B}/etc/X11/xorg.conf.t194_ref ${D}${sysconfdir}/X11/xorg.conf } -do_install_append_tegra210() { +do_install:append:tegra210() { install -m 0644 ${B}/etc/X11/xorg.conf ${D}${sysconfdir}/X11/ } PACKAGES = "${PN}-udev ${PN}-omx-tegra ${PN}-xorg ${PN}-nvstartup" -FILES_${PN}-udev = "${sysconfdir}/udev/rules.d" -FILES_${PN}-xorg = "${sysconfdir}/X11" -FILES_${PN}-omx-tegra = "${sysconfdir}/enctune.conf" -FILES_${PN}-nvstartup = "${sbindir}" -RDEPENDS_${PN}-udev = "udev" -RDEPENDS_${PN}-nvstartup = "bash" +FILES:${PN}-udev = "${sysconfdir}/udev/rules.d" +FILES:${PN}-xorg = "${sysconfdir}/X11" +FILES:${PN}-omx-tegra = "${sysconfdir}/enctune.conf" +FILES:${PN}-nvstartup = "${sbindir}" +RDEPENDS:${PN}-udev = "udev" +RDEPENDS:${PN}-nvstartup = "bash" diff --git a/recipes-bsp/tegra-binaries/tegra-firmware_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-firmware_32.5.2.bb index dda44a1f..b52027f5 100644 --- a/recipes-bsp/tegra-binaries/tegra-firmware_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-firmware_32.5.2.bb @@ -16,7 +16,7 @@ do_install() { cp -R -f ${B}/lib/firmware ${D}${nonarch_base_libdir} } -do_install_append_tegra210() { +do_install:append:tegra210() { GPUFWDIR="${D}${nonarch_base_libdir}/firmware/gm20b" install -d "$GPUFWDIR" for f in acr_ucode.bin fecs.bin fecs_sig.bin gpccs.bin gpmu_ucode.bin \ @@ -28,29 +28,29 @@ do_install_append_tegra210() { } PACKAGES = "${PN}-rtl8822 ${PN}-brcm ${PN}-tegra186-xusb ${PN}-tegra194-xusb ${PN}-tegra210-xusb ${PN}-tegra186 ${PN}-tegra194 ${PN}-tegra210 ${PN}-xusb ${PN}" -FILES_${PN}-brcm = "${nonarch_base_libdir}/firmware/brcm ${nonarch_base_libdir}/firmware/bcm4354.hcd ${nonarch_base_libdir}/firmware/nv-*-Version" -FILES_${PN}-rtl8822 = "${nonarch_base_libdir}/firmware/rtl8822*" -FILES_${PN}-tegra186-xusb = "${nonarch_base_libdir}/firmware/tegra18x_xusb_firmware" -FILES_${PN}-tegra194-xusb = "${nonarch_base_libdir}/firmware/tegra19x_xusb_firmware" -FILES_${PN}-tegra210-xusb = "${nonarch_base_libdir}/firmware/tegra21x_xusb_firmware" -FILES_${PN}-tegra186 = "${nonarch_base_libdir}/firmware/tegra18x ${nonarch_base_libdir}/firmware/gp10b" -FILES_${PN}-tegra194 = "${nonarch_base_libdir}/firmware/tegra19x ${nonarch_base_libdir}/firmware/gv11b" -FILES_${PN}-tegra210 = "${nonarch_base_libdir}/firmware/tegra21x ${nonarch_base_libdir}/firmware/gm20b ${nonarch_base_libdir}/firmware/adsp.elf" -INSANE_SKIP_${PN}-tegra210 = "arch" -FILES_${PN}-xusb = "" -ALLOW_EMPTY_${PN}-xusb = "1" -FILES_${PN} = "" -ALLOW_EMPTY_${PN} = "1" +FILES:${PN}-brcm = "${nonarch_base_libdir}/firmware/brcm ${nonarch_base_libdir}/firmware/bcm4354.hcd ${nonarch_base_libdir}/firmware/nv-*-Version" +FILES:${PN}-rtl8822 = "${nonarch_base_libdir}/firmware/rtl8822*" +FILES:${PN}-tegra186-xusb = "${nonarch_base_libdir}/firmware/tegra18x_xusb_firmware" +FILES:${PN}-tegra194-xusb = "${nonarch_base_libdir}/firmware/tegra19x_xusb_firmware" +FILES:${PN}-tegra210-xusb = "${nonarch_base_libdir}/firmware/tegra21x_xusb_firmware" +FILES:${PN}-tegra186 = "${nonarch_base_libdir}/firmware/tegra18x ${nonarch_base_libdir}/firmware/gp10b" +FILES:${PN}-tegra194 = "${nonarch_base_libdir}/firmware/tegra19x ${nonarch_base_libdir}/firmware/gv11b" +FILES:${PN}-tegra210 = "${nonarch_base_libdir}/firmware/tegra21x ${nonarch_base_libdir}/firmware/gm20b ${nonarch_base_libdir}/firmware/adsp.elf" +INSANE_SKIP:${PN}-tegra210 = "arch" +FILES:${PN}-xusb = "" +ALLOW_EMPTY:${PN}-xusb = "1" +FILES:${PN} = "" +ALLOW_EMPTY:${PN} = "1" XUSBDEPS = "" -XUSBDEPS_tegra186 = "${PN}-tegra186-xusb" -XUSBDEPS_tegra194 = "${PN}-tegra194-xusb" -XUSBDEPS_tegra210 = "${PN}-tegra210-xusb" -RDEPENDS_${PN}-xusb = "${XUSBDEPS}" +XUSBDEPS:tegra186 = "${PN}-tegra186-xusb" +XUSBDEPS:tegra194 = "${PN}-tegra194-xusb" +XUSBDEPS:tegra210 = "${PN}-tegra210-xusb" +RDEPENDS:${PN}-xusb = "${XUSBDEPS}" FWDEPS = "" -FWDEPS_tegra186 = "${PN}-tegra186" -FWDEPS_tegra194 = "${PN}-tegra194" -FWDEPS_tegra210 = "${PN}-tegra210" -RDEPENDS_${PN} = "${FWDEPS} ${PN}-xusb" +FWDEPS:tegra186 = "${PN}-tegra186" +FWDEPS:tegra194 = "${PN}-tegra194" +FWDEPS:tegra210 = "${PN}-tegra210" +RDEPENDS:${PN} = "${FWDEPS} ${PN}-xusb" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" diff --git a/recipes-bsp/tegra-binaries/tegra-flashvars_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-flashvars_32.5.2.bb index 8a65ea10..cb6db55d 100644 --- a/recipes-bsp/tegra-binaries/tegra-flashvars_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-flashvars_32.5.2.bb @@ -18,5 +18,5 @@ do_install() { install -m 0644 ${S}/flashvars ${D}${datadir}/tegraflash/ } -FILES_${PN} = "${datadir}/tegraflash" +FILES:${PN} = "${datadir}/tegraflash" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/tegra-binaries/tegra-libraries_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-libraries_32.5.2.bb index ab67e022..dc29c2ae 100644 --- a/recipes-bsp/tegra-binaries/tegra-libraries_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-libraries_32.5.2.bb @@ -76,7 +76,7 @@ do_install() { rm ${D}${libdir}/libnvidia-egl-wayland* } -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { # argus and scf libraries hard-coded to use this path install -d $D/usr/lib/aarch64-linux-gnu/tegra-egl ln $D${libdir}/libEGL_nvidia.so.0 $D/usr/lib/aarch64-linux-gnu/tegra-egl/ @@ -84,25 +84,25 @@ pkg_postinst_${PN}() { PACKAGES = "${PN}-libv4l-plugins ${PN}-argus ${PN}-argus-daemon-base ${PN}-libnvosd ${PN}-dev ${PN}" -FILES_${PN}-libv4l-plugins = "${libdir}/libv4l" -FILES_${PN}-argus = "${libdir}/libnvargus*" -FILES_${PN}-argus-daemon-base = "${sbindir}/nvargus-daemon" -FILES_${PN}-libnvosd = "${libdir}/libnvosd*" -FILES_${PN} = "${libdir} ${sbindir} ${nonarch_libdir} ${localstatedir} ${sysconfdir} ${datadir} \ +FILES:${PN}-libv4l-plugins = "${libdir}/libv4l" +FILES:${PN}-argus = "${libdir}/libnvargus*" +FILES:${PN}-argus-daemon-base = "${sbindir}/nvargus-daemon" +FILES:${PN}-libnvosd = "${libdir}/libnvosd*" +FILES:${PN} = "${libdir} ${sbindir} ${nonarch_libdir} ${localstatedir} ${sysconfdir} ${datadir} \ /usr/lib/aarch64-linux-gnu/tegra/nvidia_icd.json" -FILES_${PN}-dev = "${libdir}/lib*GL*.so" -RDEPENDS_${PN} = "libasound" -RDEPENDS_${PN}-argus = "tegra-argus-daemon" -RDEPENDS_${PN}-argus-daemon-base = "${PN} libglvnd" -RDEPENDS_${PN}-libnvosd = "${PN} pango cairo glib-2.0" -RRECOMMENDS_${PN}-libnvosd = "liberation-fonts" -RRECOMMENDS_${PN} = "kernel-module-nvgpu" +FILES:${PN}-dev = "${libdir}/lib*GL*.so" +RDEPENDS:${PN} = "libasound" +RDEPENDS:${PN}-argus = "tegra-argus-daemon" +RDEPENDS:${PN}-argus-daemon-base = "${PN} libglvnd" +RDEPENDS:${PN}-libnvosd = "${PN} pango cairo glib-2.0" +RRECOMMENDS:${PN}-libnvosd = "liberation-fonts" +RRECOMMENDS:${PN} = "kernel-module-nvgpu" -INSANE_SKIP_${PN}-libv4l-plugins = "dev-so textrel ldflags build-deps" -INSANE_SKIP_${PN} = "dev-so textrel ldflags build-deps libdir" -INSANE_SKIP_${PN}-argus = "dev-so ldflags" -INSANE_SKIP_${PN}-argus-daemon-base = "ldflags" -INSANE_SKIP_${PN}-libnvosd = "dev-so ldflags" +INSANE_SKIP:${PN}-libv4l-plugins = "dev-so textrel ldflags build-deps" +INSANE_SKIP:${PN} = "dev-so textrel ldflags build-deps libdir" +INSANE_SKIP:${PN}-argus = "dev-so ldflags" +INSANE_SKIP:${PN}-argus-daemon-base = "ldflags" +INSANE_SKIP:${PN}-libnvosd = "dev-so ldflags" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/recipes-bsp/tegra-binaries/tegra-nvphs-base_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-nvphs-base_32.5.2.bb index 4891a683..fc0c7672 100644 --- a/recipes-bsp/tegra-binaries/tegra-nvphs-base_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-nvphs-base_32.5.2.bb @@ -7,8 +7,8 @@ inherit container-runtime-csv COMPATIBLE_MACHINE = "(tegra)" NVPHSD_MACHINE_CONF = "nvphsd.conf" -NVPHSD_MACHINE_CONF_tegra186 = "nvphsd.conf.t186" -NVPHSD_MACHINE_CONF_tegra194 = "nvphsd.conf.t194" +NVPHSD_MACHINE_CONF:tegra186 = "nvphsd.conf.t186" +NVPHSD_MACHINE_CONF:tegra194 = "nvphsd.conf.t194" do_configure() { tar -C ${B} -x -f ${S}/nv_tegra/nvidia_drivers.tbz2 usr/sbin/nvphsd usr/lib/aarch64-linux-gnu/tegra @@ -27,9 +27,9 @@ do_install() { } PACKAGES = "${PN}" -FILES_${PN} = "${sbindir} ${sysconfdir} ${libdir}" -RDEPENDS_${PN} = "bash tegra-libraries" -INSANE_SKIP_${PN} = "ldflags dev-so" +FILES:${PN} = "${sbindir} ${sysconfdir} ${libdir}" +RDEPENDS:${PN} = "bash tegra-libraries" +INSANE_SKIP:${PN} = "ldflags dev-so" INHIBIT_SYSROOT_STRIP = "1" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/recipes-bsp/tegra-binaries/tegra-nvphs_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-nvphs_32.5.2.bb index 251a7ef3..4f74fd84 100644 --- a/recipes-bsp/tegra-binaries/tegra-nvphs_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-nvphs_32.5.2.bb @@ -23,6 +23,6 @@ inherit systemd update-rc.d INITSCRIPT_NAME = "nvphs" INITSCRIPT_PARAMS = "defaults" -SYSTEMD_SERVICE_${PN} = "nvphs.service" +SYSTEMD_SERVICE:${PN} = "nvphs.service" -RDEPENDS_${PN} = "tegra-nvphs-base" +RDEPENDS:${PN} = "tegra-nvphs-base" diff --git a/recipes-bsp/tegra-binaries/tegra-nvpmodel-base_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-nvpmodel-base_32.5.2.bb index 9ac497bb..b27dc624 100644 --- a/recipes-bsp/tegra-binaries/tegra-nvpmodel-base_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-nvpmodel-base_32.5.2.bb @@ -24,7 +24,7 @@ do_install() { fi } -FILES_${PN} = "${sbindir}/nvpmodel ${sysconfdir}" -INSANE_SKIP_${PN} = "ldflags" +FILES:${PN} = "${sbindir}/nvpmodel ${sysconfdir}" +INSANE_SKIP:${PN} = "ldflags" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/tegra-binaries/tegra-nvpmodel_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-nvpmodel_32.5.2.bb index 5ddb32b5..b6fa7070 100644 --- a/recipes-bsp/tegra-binaries/tegra-nvpmodel_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-nvpmodel_32.5.2.bb @@ -23,5 +23,5 @@ inherit systemd update-rc.d INITSCRIPT_NAME = "nvpmodel" INITSCRIPT_PARAMS = "defaults" -SYSTEMD_SERVICE_${PN} = "nvpmodel.service" -RDEPENDS_${PN} = "tegra-nvpmodel-base" +SYSTEMD_SERVICE:${PN} = "nvpmodel.service" +RDEPENDS:${PN} = "tegra-nvpmodel-base" diff --git a/recipes-bsp/tegra-binaries/tegra-nvs-base_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-nvs-base_32.5.2.bb index 0549eb06..a9fc0703 100644 --- a/recipes-bsp/tegra-binaries/tegra-nvs-base_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-nvs-base_32.5.2.bb @@ -17,6 +17,6 @@ do_install() { } PACKAGES = "${PN}" -FILES_${PN} = "${sbindir} ${sysconfdir}" -RDEPENDS_${PN} = "bash tegra-libraries" -INSANE_SKIP_${PN} = "ldflags" +FILES:${PN} = "${sbindir} ${sysconfdir}" +RDEPENDS:${PN} = "bash tegra-libraries" +INSANE_SKIP:${PN} = "ldflags" diff --git a/recipes-bsp/tegra-binaries/tegra-nvs-service_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-nvs-service_32.5.2.bb index 1eb315ba..23e0028f 100644 --- a/recipes-bsp/tegra-binaries/tegra-nvs-service_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-nvs-service_32.5.2.bb @@ -23,7 +23,7 @@ inherit systemd update-rc.d INITSCRIPT_NAME = "nvs-service" INITSCRIPT_PARAMS = "defaults" -SYSTEMD_SERVICE_${PN} = "nvs-service.service" -RDEPENDS_${PN} = "tegra-nvs-base" +SYSTEMD_SERVICE:${PN} = "nvs-service.service" +RDEPENDS:${PN} = "tegra-nvs-base" PACKAGE_ARCH = "${TEGRA_PKGARCH}" diff --git a/recipes-bsp/tegra-binaries/tegra-nvstartup_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-nvstartup_32.5.2.bb index 194acc23..509ed0e3 100644 --- a/recipes-bsp/tegra-binaries/tegra-nvstartup_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-nvstartup_32.5.2.bb @@ -22,5 +22,5 @@ inherit systemd update-rc.d INITSCRIPT_NAME = "nvstartup" INITSCRIPT_PARAMS = "defaults 00" -SYSTEMD_SERVICE_${PN} = "nvstartup.service" -RDEPENDS_${PN} = "tegra-configs-nvstartup" +SYSTEMD_SERVICE:${PN} = "nvstartup.service" +RDEPENDS:${PN} = "tegra-configs-nvstartup" diff --git a/recipes-bsp/tegra-binaries/tegra-redundant-boot-base_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-redundant-boot-base_32.5.2.bb index 001ff668..cc33691a 100644 --- a/recipes-bsp/tegra-binaries/tegra-redundant-boot-base_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-redundant-boot-base_32.5.2.bb @@ -12,7 +12,7 @@ do_configure() { tar -C ${B} -x -f ${S}/nv_tegra/config.tbz2 etc } -do_configure_append_tegra210() { +do_configure:append:tegra210() { quilt import ${STAGING_DATADIR}/l4t-patches-${PV}/Convert-l4t_payload_updater_t210-to-Python3.patch quilt push } @@ -29,7 +29,7 @@ do_install() { install -d ${D}/opt/ota_package } -do_install_tegra210() { +do_install:tegra210() { install -d ${D}${sbindir} install -m 0755 ${B}/usr/sbin/l4t_payload_updater_t210 ${D}${sbindir} install -d ${D}/opt/ota_package @@ -39,12 +39,12 @@ INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" INHIBIT_SYSROOT_STRIP = "1" PACKAGES = "tegra-redundant-boot-nvbootctrl ${PN} ${PN}-dev" -FILES_tegra-redundant-boot-nvbootctrl = "${sbindir}/nvbootctrl" -FILES_${PN} += "/opt/ota_package" -RDEPENDS_${PN} = "tegra-redundant-boot-nvbootctrl setup-nv-boot-control-service" -RDEPENDS_${PN}_tegra210 = "setup-nv-boot-control-service python3-core" -INSANE_SKIP_${PN} = "ldflags" -RDEPENDS_tegra-redundant-boot-nvbootctrl = "setup-nv-boot-control" -RDEPENDS_tegra-redundant-boot-nvbootctrl_tegra210 = "" -ALLOW_EMPTY_tegra-redundant-boot-nvbootctrl_tegra210 = "1" -INSANE_SKIP_tegra-redundant-boot-nvbootctrl = "ldflags" +FILES:tegra-redundant-boot-nvbootctrl = "${sbindir}/nvbootctrl" +FILES:${PN} += "/opt/ota_package" +RDEPENDS:${PN} = "tegra-redundant-boot-nvbootctrl setup-nv-boot-control-service" +RDEPENDS:${PN:}:tegra210 = "setup-nv-boot-control-service python3-core" +INSANE_SKIP:${PN} = "ldflags" +RDEPENDS:tegra-redundant-boot-nvbootctrl = "setup-nv-boot-control" +RDEPENDS:tegra-redundant-boot-nvbootctrl:tegra210 = "" +ALLOW_EMPTY:tegra-redundant-boot-nvbootctrl:tegra210 = "1" +INSANE_SKIP:tegra-redundant-boot-nvbootctrl = "ldflags" diff --git a/recipes-bsp/tegra-binaries/tegra-redundant-boot-rollback_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-redundant-boot-rollback_32.5.2.bb index 70642934..3be063af 100644 --- a/recipes-bsp/tegra-binaries/tegra-redundant-boot-rollback_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-redundant-boot-rollback_32.5.2.bb @@ -18,12 +18,12 @@ do_install() { : } -do_install_append_tegra186() { +do_install:append:tegra186() { install -d ${D}${datadir}/nv_tegra/rollback/t18x install -m 0644 ${S}/bootloader/rollback/t18x/rollback.cfg ${D}${datadir}/nv_tegra/rollback/t18x/ } -do_install_append_tegra194() { +do_install:append:tegra194() { install -d ${D}${datadir}/nv_tegra/rollback/t19x install -m 0644 ${S}/bootloader/rollback/t19x/rollback.cfg ${D}${datadir}/nv_tegra/rollback/t19x/ } diff --git a/recipes-bsp/tegra-binaries/tegra-redundant-boot_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-redundant-boot_32.5.2.bb index f1da0f36..0cf8ca8d 100644 --- a/recipes-bsp/tegra-binaries/tegra-redundant-boot_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-redundant-boot_32.5.2.bb @@ -20,18 +20,18 @@ do_install() { install -m 0644 ${S}/nv_update_verifier.service ${D}${systemd_system_unitdir} } -do_install_tegra210() { +do_install:tegra210() { : } inherit update-rc.d systemd -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_PACKAGES_tegra210 = "" +INITSCRIPT_PACKAGES:tegra210 = "" INITSCRIPT_NAME = "nv_update_verifier" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_PACKAGES_tegra210 = "" -SYSTEMD_SERVICE_${PN} = "nv_update_verifier.service" -RDEPENDS_${PN} = "tegra-redundant-boot-base" +SYSTEMD_PACKAGES:tegra210 = "" +SYSTEMD_SERVICE:${PN} = "nv_update_verifier.service" +RDEPENDS:${PN} = "tegra-redundant-boot-base" PACKAGE_ARCH = "${L4T_BSP_PKGARCH}" diff --git a/recipes-bsp/tegra-binaries/tegra-tools_32.5.2.bb b/recipes-bsp/tegra-binaries/tegra-tools_32.5.2.bb index ab6d165a..024763ba 100644 --- a/recipes-bsp/tegra-binaries/tegra-tools_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tegra-tools_32.5.2.bb @@ -16,9 +16,9 @@ do_install() { } PACKAGES = "${PN}-tegrastats ${PN}-jetson-clocks ${PN}" -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} = "${PN}-tegrastats ${PN}-jetson-clocks" -FILES_${PN}-tegrastats = "${bindir}/tegrastats" -INSANE_SKIP_${PN}-tegrastats = "ldflags" -FILES_${PN}-jetson-clocks = "${bindir}/jetson_clocks" -RDEPENDS_${PN}-jetson-clocks = "bash" +ALLOW_EMPTY:${PN} = "1" +RDEPENDS:${PN} = "${PN}-tegrastats ${PN}-jetson-clocks" +FILES:${PN}-tegrastats = "${bindir}/tegrastats" +INSANE_SKIP:${PN}-tegrastats = "ldflags" +FILES:${PN}-jetson-clocks = "${bindir}/jetson_clocks" +RDEPENDS:${PN}-jetson-clocks = "bash" diff --git a/recipes-bsp/tegra-binaries/tos-prebuilt_32.5.2.bb b/recipes-bsp/tegra-binaries/tos-prebuilt_32.5.2.bb index 101b65aa..c89c7158 100644 --- a/recipes-bsp/tegra-binaries/tos-prebuilt_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/tos-prebuilt_32.5.2.bb @@ -5,8 +5,8 @@ COMPATIBLE_MACHINE = "(tegra)" INHIBIT_DEFAULT_DEPS = "1" TOSIMG_PREBUILT = "tos-trusty.img" -TOSIMG_PREBUILT_tegra194 = "tos-trusty_t194.img" -TOSIMG_PREBUILT_tegra210 = "tos-mon-only.img" +TOSIMG_PREBUILT:tegra194 = "tos-trusty_t194.img" +TOSIMG_PREBUILT:tegra210 = "tos-mon-only.img" PREFERRED_PROVIDER_virtual/secure-os ??= "" PROVIDES = "trusted-os virtual/secure-os" TOS_IMAGE ?= "tos-${MACHINE}-${PV}-${PR}.img" diff --git a/recipes-bsp/tegra-binaries/xserver-xorg-video-nvidia.inc b/recipes-bsp/tegra-binaries/xserver-xorg-video-nvidia.inc index a0faca32..c8843889 100644 --- a/recipes-bsp/tegra-binaries/xserver-xorg-video-nvidia.inc +++ b/recipes-bsp/tegra-binaries/xserver-xorg-video-nvidia.inc @@ -21,12 +21,12 @@ do_install() { } PACKAGES = "${PN}" -RDEPENDS_${PN} = "tegra-libraries" -FILES_${PN} = "${libdir} ${datadir}" -RPROVIDES_${PN} += "xserver-xorg-extension-glx" -RCONFLICTS_${PN} = "xserver-xorg-extension-glx" +RDEPENDS:${PN} = "tegra-libraries" +FILES:${PN} = "${libdir} ${datadir}" +RPROVIDES:${PN} += "xserver-xorg-extension-glx" +RCONFLICTS:${PN} = "xserver-xorg-extension-glx" -INSANE_SKIP_${PN} = "dev-so textrel ldflags xorg-driver-abi" +INSANE_SKIP:${PN} = "dev-so textrel ldflags xorg-driver-abi" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/recipes-bsp/tegra-binaries/xserver-xorg-video-nvidia_32.5.2.bb b/recipes-bsp/tegra-binaries/xserver-xorg-video-nvidia_32.5.2.bb index 3c88d0de..50f5399e 100644 --- a/recipes-bsp/tegra-binaries/xserver-xorg-video-nvidia_32.5.2.bb +++ b/recipes-bsp/tegra-binaries/xserver-xorg-video-nvidia_32.5.2.bb @@ -7,4 +7,4 @@ require xserver-xorg-video-nvidia.inc # Starting with R28.1, we extract the xorg.conf fragment # from the configs tarball -RDEPENDS_${PN} += "tegra-configs-xorg" +RDEPENDS:${PN} += "tegra-configs-xorg" diff --git a/recipes-bsp/tegra-bluetooth/tegra-bluetooth_1.0.bb b/recipes-bsp/tegra-bluetooth/tegra-bluetooth_1.0.bb index 3be7bdea..7f6c1d30 100644 --- a/recipes-bsp/tegra-bluetooth/tegra-bluetooth_1.0.bb +++ b/recipes-bsp/tegra-bluetooth/tegra-bluetooth_1.0.bb @@ -28,9 +28,9 @@ do_install() { fi } -ALLOW_EMPTY_${PN} = "1" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', 'tegra-bluetooth.service', '', d)}" -FILES_${PN} += "${nonarch_base_libdir}/udev/rules.d" -RDEPENDS_${PN} = "${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', '${TEGRA_BT_SUPPORT_PACKAGE}', '', d)}" -RRECOMMENDS_${PN} = "kernel-module-bluedroid-pm" +ALLOW_EMPTY:${PN} = "1" +SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', 'tegra-bluetooth.service', '', d)}" +FILES:${PN} += "${nonarch_base_libdir}/udev/rules.d" +RDEPENDS:${PN} = "${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', '${TEGRA_BT_SUPPORT_PACKAGE}', '', d)}" +RRECOMMENDS:${PN} = "kernel-module-bluedroid-pm" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/tegra-bup-payload/tegra-bup-payload_1.0.bb b/recipes-bsp/tegra-bup-payload/tegra-bup-payload_1.0.bb index 8257ae4a..75b45e19 100644 --- a/recipes-bsp/tegra-bup-payload/tegra-bup-payload_1.0.bb +++ b/recipes-bsp/tegra-bup-payload/tegra-bup-payload_1.0.bb @@ -36,9 +36,9 @@ do_install() { install -m 0644 ${DEPLOY_DIR_IMAGE}/${BUPFILE} ${D}/opt/ota_package/bl_update_payload } -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" do_install[depends] += "${@bup_dependency(d)}" -FILES_${PN} = "/opt/ota_package/bl_update_payload" -RDEPENDS_${PN} += "tegra-redundant-boot" +FILES:${PN} = "/opt/ota_package/bl_update_payload" +RDEPENDS:${PN} += "tegra-redundant-boot" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/tegra-sources/tegra-sources-32.5.2.inc b/recipes-bsp/tegra-sources/tegra-sources-32.5.2.inc index c9b446e8..a8461fbf 100644 --- a/recipes-bsp/tegra-sources/tegra-sources-32.5.2.inc +++ b/recipes-bsp/tegra-sources/tegra-sources-32.5.2.inc @@ -1,7 +1,7 @@ L4T_BSP_NAME = "${L4T_SRCS_NAME}" SRC_URI = "${L4T_URI_BASE}/public_sources.tbz2;downloadfilename=${L4T_BSP_PREFIX}-public_sources-${L4T_VERSION}.tbz2" SRC_SHA256SUM = "660bd06ba0b7f23e4f19f95cb2a3cf441dd5d753e00f5e40bcb7b18d4e569513" -SRC_SHA256SUM_tegra210 = "57f8b3269849640d3be0fcacae1d3b038997baddbd2700da6173c7d18e18d101" +SRC_SHA256SUM:tegra210 = "57f8b3269849640d3be0fcacae1d3b038997baddbd2700da6173c7d18e18d101" SRC_URI[sha256sum] = "${SRC_SHA256SUM}" inherit l4t_bsp diff --git a/recipes-bsp/tegra-wifi/tegra-wifi_1.0.bb b/recipes-bsp/tegra-wifi/tegra-wifi_1.0.bb index d608cb97..f8f83841 100644 --- a/recipes-bsp/tegra-wifi/tegra-wifi_1.0.bb +++ b/recipes-bsp/tegra-wifi/tegra-wifi_1.0.bb @@ -17,6 +17,6 @@ do_install() { fi } -ALLOW_EMPTY_${PN} = "1" -FILES_${PN} += "${nonarch_base_libdir}/udev/rules.d" +ALLOW_EMPTY:${PN} = "1" +FILES:${PN} += "${nonarch_base_libdir}/udev/rules.d" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/tools/setup-nv-boot-control_1.0.bb b/recipes-bsp/tools/setup-nv-boot-control_1.0.bb index 763750fb..112a9948 100644 --- a/recipes-bsp/tools/setup-nv-boot-control_1.0.bb +++ b/recipes-bsp/tools/setup-nv-boot-control_1.0.bb @@ -44,11 +44,11 @@ INITSCRIPT_PACKAGES = "${PN}-service" INITSCRIPT_NAME = "setup-nv-boot-control" INITSCRIPT_PARAMS = "defaults 12" SYSTEMD_PACKAGES = "${PN}-service" -SYSTEMD_SERVICE_${PN}-service = "setup-nv-boot-control.service" -RDEPENDS_${PN}-service = "${PN}" -RDEPENDS_${PN} = "tegra-nv-boot-control-config tegra-eeprom-tool-boardspec" +SYSTEMD_SERVICE:${PN}-service = "setup-nv-boot-control.service" +RDEPENDS:${PN}-service = "${PN}" +RDEPENDS:${PN} = "tegra-nv-boot-control-config tegra-eeprom-tool-boardspec" -FILES_${PN} = "${bindir}/setup-nv-boot-control" -FILES_${PN}-service = "${sysconfdir} ${systemd_system_unitdir}" +FILES:${PN} = "${bindir}/setup-nv-boot-control" +FILES:${PN}-service = "${sysconfdir} ${systemd_system_unitdir}" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/tools/tegra-boot-tools_2.4.0.bb b/recipes-bsp/tools/tegra-boot-tools_2.4.0.bb index 98e34f6d..ac071967 100644 --- a/recipes-bsp/tools/tegra-boot-tools_2.4.0.bb +++ b/recipes-bsp/tools/tegra-boot-tools_2.4.0.bb @@ -23,26 +23,26 @@ SYSTEMD_PACKAGES = "${PN}-earlyboot ${PN}-lateboot" PACKAGES =+ "libtegra-boot-tools ${PN}-earlyboot ${PN}-lateboot ${PN}-updater ${PN}-nvbootctrl ${PN}-nv-update-engine" -SYSTEMD_SERVICE_${PN}-earlyboot = "bootcountcheck.service" -SYSTEMD_SERVICE_${PN}-lateboot = "update_bootinfo.service" +SYSTEMD_SERVICE:${PN}-earlyboot = "bootcountcheck.service" +SYSTEMD_SERVICE:${PN}-lateboot = "update_bootinfo.service" -FILES_libtegra-boot-tools = "${libdir}/libtegra-boot-tools${SOLIBS} ${datadir}/tegra-boot-tools" +FILES:libtegra-boot-tools = "${libdir}/libtegra-boot-tools${SOLIBS} ${datadir}/tegra-boot-tools" -FILES_${PN}-earlyboot = "${sbindir}/bootcountcheck" -RDEPENDS_${PN}-earlyboot = "${PN}" +FILES:${PN}-earlyboot = "${sbindir}/bootcountcheck" +RDEPENDS:${PN}-earlyboot = "${PN}" -RDEPENDS_${PN}-lateboot = "${PN}" +RDEPENDS:${PN}-lateboot = "${PN}" -FILES_${PN}-updater = "${bindir}/tegra-bootloader-update" -RDEPENDS_${PN}-updater = "${PN} tegra-bootpart-config" +FILES:${PN}-updater = "${bindir}/tegra-bootloader-update" +RDEPENDS:${PN}-updater = "${PN} tegra-bootpart-config" -FILES_${PN} += "${libdir}/tmpfiles.d" +FILES:${PN} += "${libdir}/tmpfiles.d" -FILES_${PN}-nvbootctrl = "${sbindir}/nvbootctrl" -RDEPENDS_${PN}-nvbootctrl = "${PN}" -RCONFLICTS_${PN}-nvbootctrl = "tegra-redundant-boot-nvbootctrl" -FILES_${PN}-nv-update-engine = "${sbindir}/nv_update_engine" -RDEPENDS_${PN}-nv-update-engine = "${PN}-updater ${PN}" -RCONFLICTS_${PN}-nv-update-engine = "tegra-redundant-boot-base" +FILES:${PN}-nvbootctrl = "${sbindir}/nvbootctrl" +RDEPENDS:${PN}-nvbootctrl = "${PN}" +RCONFLICTS:${PN}-nvbootctrl = "tegra-redundant-boot-nvbootctrl" +FILES:${PN}-nv-update-engine = "${sbindir}/nv_update_engine" +RDEPENDS:${PN}-nv-update-engine = "${PN}-updater ${PN}" +RCONFLICTS:${PN}-nv-update-engine = "tegra-redundant-boot-base" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/tools/tegra-bootpart-config_1.0.bb b/recipes-bsp/tools/tegra-bootpart-config_1.0.bb index 0fcf2226..50b0459d 100644 --- a/recipes-bsp/tools/tegra-bootpart-config_1.0.bb +++ b/recipes-bsp/tools/tegra-bootpart-config_1.0.bb @@ -7,11 +7,11 @@ COMPATIBLE_MACHINE = "(tegra)" DEPENDS = "tegra-bootfiles tegra-helper-scripts-native" FLASHTOOLS_PATH = "${STAGING_BINDIR_NATIVE}/${SOC_FAMILY}-flash" -FLASHTOOLS_PATH_tegra194 = "${STAGING_BINDIR_NATIVE}/tegra186-flash" +FLASHTOOLS_PATH:tegra194 = "${STAGING_BINDIR_NATIVE}/tegra186-flash" PATH =. "${FLASHTOOLS_PATH}:" BOOTDEVNAME = "${@'spi' if d.getVar('TEGRA_SPIFLASH_BOOT') == '1' else 'sdmmc_boot'}" -BOOTDEVNAME_xavier-nx = "spi" +BOOTDEVNAME:xavier-nx = "spi" USERDEVNAME = "${@'sdcard' if d.getVar('TEGRA_SPIFLASH_BOOT') == '1' else 'sdmmc_user'}" inherit image_types_tegra @@ -62,5 +62,5 @@ do_install() { install -m 0644 ${B}/all-partitions.conf ${D}${datadir}/tegra-boot-tools/ } -FILES_${PN} = "${datadir}/tegra-boot-tools" +FILES:${PN} = "${datadir}/tegra-boot-tools" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/tools/tegra-eeprom-tool_1.2.0.bb b/recipes-bsp/tools/tegra-eeprom-tool_1.2.0.bb index c837a88e..26d66d13 100644 --- a/recipes-bsp/tools/tegra-eeprom-tool_1.2.0.bb +++ b/recipes-bsp/tools/tegra-eeprom-tool_1.2.0.bb @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "e65452e4abb682063d6b2b37e12596a3e8494bb5325e9fa94e65db078e inherit autotools pkgconfig -RRECOMMENDS_${PN} += "kernel-module-at24" +RRECOMMENDS:${PN} += "kernel-module-at24" PACKAGES =+ "${PN}-boardspec" -FILES_${PN}-boardspec = "${bindir}/tegra-boardspec" +FILES:${PN}-boardspec = "${bindir}/tegra-boardspec" diff --git a/recipes-bsp/trusty/tos-trusty.bb b/recipes-bsp/trusty/tos-trusty.bb index fdbdba73..704e494a 100644 --- a/recipes-bsp/trusty/tos-trusty.bb +++ b/recipes-bsp/trusty/tos-trusty.bb @@ -12,7 +12,7 @@ PV = "${L4T_VERSION}" PROVIDES += "virtual/secure-os" TOSIMG = "tos-trusty.img" -TOSIMG_tegra194 = "tos-trusty_t194.img" +TOSIMG:tegra194 = "tos-trusty_t194.img" TOS_IMAGE ?= "tos-${MACHINE}-${PV}-${PR}.img" TOS_SYMLINK ?= "tos-${MACHINE}.img" diff --git a/recipes-bsp/trusty/trusty-l4t.inc b/recipes-bsp/trusty/trusty-l4t.inc index a16d3bc8..47a7eb4f 100644 --- a/recipes-bsp/trusty/trusty-l4t.inc +++ b/recipes-bsp/trusty/trusty-l4t.inc @@ -25,8 +25,8 @@ AS[unexport] = "1" LD[unexport] = "1" TARGET_SOC = "t186" -TARGET_SOC_tegra194 = "t194" -PATH_prepend = "${B}/bin-${BUILD_ARCH}:${STAGING_DATADIR_NATIVE}/gcc-linaro-baremetal-arm/bin:" +TARGET_SOC:tegra194 = "t194" +PATH:prepend = "${B}/bin-${BUILD_ARCH}:${STAGING_DATADIR_NATIVE}/gcc-linaro-baremetal-arm/bin:" make_tc_wrappers() { tgtdir="$1" @@ -64,8 +64,8 @@ VERSION_DEFS ?= "VERSION_MAJOR=${@extract_version(0, d)} VERSION_MINOR=${@extrac BUILDTIMESTAMP ?= "${@generate_build_timestamp(d)}" EXTRA_OEMAKE = 'PROJECT=t186 TARGET=t186 BUILDROOT=${B} \ - TOOLCHAIN_PREFIX="${TARGET_PREFIX}" ARCH_arm64_TOOLCHAIN_PREFIX="${TARGET_PREFIX}" \ - ARCH_arm_TOOLCHAIN_PREFIX="arm-eabi-" \ + TOOLCHAIN_PREFIX="${TARGET_PREFIX}" ARCH:arm64_TOOLCHAIN_PREFIX="${TARGET_PREFIX}" \ + ARCH:arm_TOOLCHAIN_PREFIX="arm-eabi-" \ DEBUG=0 DEBUG_LVL=0 V=0 DEFAULT_OTE_APP_DEBUGLEVEL=1 NOECHO=@ \ TRUSTY_VARIANT=l4t-public TRUSTY_MULTI_GUEST_CONFIGURATION= \ TARGET_SOC=${TARGET_SOC} ${VERSION_DEFS} ${BUILDTIMESTAMP}' @@ -79,6 +79,6 @@ do_install() { install -m 0644 ${B}/build-t186/lk.bin ${D}${datadir}/trusted-os/ } -ALLOW_EMPTY_${PN} = "1" -FILES_${PN}-dev = "${datadir}/trusted-os" +ALLOW_EMPTY:${PN} = "1" +FILES:${PN}-dev = "${datadir}/trusted-os" PACKAGE_ARCH = "${SOC_FAMILY_PKGARCH}" diff --git a/recipes-bsp/u-boot/u-boot-tegra-bootimg.inc b/recipes-bsp/u-boot/u-boot-tegra-bootimg.inc index 47c71141..cd44799d 100644 --- a/recipes-bsp/u-boot/u-boot-tegra-bootimg.inc +++ b/recipes-bsp/u-boot/u-boot-tegra-bootimg.inc @@ -36,16 +36,16 @@ uboot_make_bootimg() { fi } -do_compile_append_tegra() { +do_compile:append:tegra() { uboot_make_bootimg } -do_install_append_tegra() { +do_install:append:tegra() { if [ -n "${INITRAMFS_IMAGE}" -a "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then install -m 0644 ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz ${D}/boot/initrd fi } EXTRADOINSTDEPS = "" -EXTRADOINSTDEPS_tegra = "${@'${INITRAMFS_IMAGE}:do_image_complete' if d.getVar('INITRAMFS_IMAGE') != '' and d.getVar('INITRAMFS_IMAGE_BUNDLE') != '1' else ''}" +EXTRADOINSTDEPS:tegra = "${@'${INITRAMFS_IMAGE}:do_image_complete' if d.getVar('INITRAMFS_IMAGE') != '' and d.getVar('INITRAMFS_IMAGE_BUNDLE') != '1' else ''}" do_install[depends] += "${EXTRADOINSTDEPS}" diff --git a/recipes-bsp/u-boot/u-boot-tegra_2021.04.bb b/recipes-bsp/u-boot/u-boot-tegra_2021.04.bb index 2ada0d04..bc7df48d 100644 --- a/recipes-bsp/u-boot/u-boot-tegra_2021.04.bb +++ b/recipes-bsp/u-boot/u-boot-tegra_2021.04.bb @@ -25,8 +25,8 @@ PROVIDES += "u-boot" require u-boot-tegra-bootimg.inc PACKAGES =+ "${PN}-extlinux" -FILES_${PN}-extlinux = "/boot/extlinux /boot/initrd" -ALLOW_EMPTY_${PN}-extlinux = "1" -RPROVIDES_${PN}-extlinux += "u-boot-extlinux" -RPROVIDES_${PN} += "u-boot" -RDEPENDS_${PN} += "${PN}-extlinux" +FILES:${PN}-extlinux = "/boot/extlinux /boot/initrd" +ALLOW_EMPTY:${PN}-extlinux = "1" +RPROVIDES:${PN}-extlinux += "u-boot-extlinux" +RPROVIDES:${PN} += "u-boot" +RDEPENDS:${PN} += "${PN}-extlinux" diff --git a/recipes-core/busybox/busybox_%.bbappend b/recipes-core/busybox/busybox_%.bbappend index 75e0f91a..b2dba3fa 100644 --- a/recipes-core/busybox/busybox_%.bbappend +++ b/recipes-core/busybox/busybox_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" -SRC_URI_append_tegra = " file://cksum.cfg" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" +SRC_URI:append:tegra = " file://cksum.cfg" -PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}" +PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}" diff --git a/recipes-core/images/tegra-minimal-initramfs.bb b/recipes-core/images/tegra-minimal-initramfs.bb index 2a3a670c..b821b7b4 100644 --- a/recipes-core/images/tegra-minimal-initramfs.bb +++ b/recipes-core/images/tegra-minimal-initramfs.bb @@ -32,8 +32,8 @@ inherit core-image IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" -SSTATE_SKIP_CREATION_task-image-complete = "0" -SSTATE_SKIP_CREATION_task-image-qa = "0" +SSTATE_SKIP_CREATION:task-image-complete = "0" +SSTATE_SKIP_CREATION:task-image-qa = "0" do_image_complete[vardepsexclude] += "rm_work_rootfs" IMAGE_POSTPROCESS_COMMAND = "" inherit nopackages diff --git a/recipes-core/initrdscripts/tegra-minimal-init_1.0.bb b/recipes-core/initrdscripts/tegra-minimal-init_1.0.bb index bb971efb..14f3bc01 100644 --- a/recipes-core/initrdscripts/tegra-minimal-init_1.0.bb +++ b/recipes-core/initrdscripts/tegra-minimal-init_1.0.bb @@ -27,5 +27,5 @@ do_install() { fi } -RDEPENDS_${PN} = "${@'util-linux-blkid' if d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') else ''}" -FILES_${PN} = "/" +RDEPENDS:${PN} = "${@'util-linux-blkid' if d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') else ''}" +FILES:${PN} = "/" diff --git a/recipes-core/packagegroups/nativesdk-packagegroup-cuda-sdk-host.bb b/recipes-core/packagegroups/nativesdk-packagegroup-cuda-sdk-host.bb index 161ebd3a..a59cc58c 100644 --- a/recipes-core/packagegroups/nativesdk-packagegroup-cuda-sdk-host.bb +++ b/recipes-core/packagegroups/nativesdk-packagegroup-cuda-sdk-host.bb @@ -4,6 +4,6 @@ inherit packagegroup nativesdk PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ nativesdk-cuda-compiler \ " diff --git a/recipes-core/packagegroups/packagegroup-base.bbappend b/recipes-core/packagegroups/packagegroup-base.bbappend index 91487232..68d2dad6 100644 --- a/recipes-core/packagegroups/packagegroup-base.bbappend +++ b/recipes-core/packagegroups/packagegroup-base.bbappend @@ -1,2 +1,2 @@ -RDEPENDS_packagegroup-base-bluetooth_append_tegra = " tegra-bluetooth" -RDEPENDS_packagegroup-base-wifi_append_tegra = " tegra-wifi" +RDEPENDS:packagegroup-base-bluetooth:append:tegra = " tegra-bluetooth" +RDEPENDS:packagegroup-base-wifi:append:tegra = " tegra-wifi" diff --git a/recipes-devtools/cmake/tegra-cmake-overrides_1.0.2.bb b/recipes-devtools/cmake/tegra-cmake-overrides_1.0.2.bb index 214e90d9..33fae38a 100644 --- a/recipes-devtools/cmake/tegra-cmake-overrides_1.0.2.bb +++ b/recipes-devtools/cmake/tegra-cmake-overrides_1.0.2.bb @@ -16,5 +16,5 @@ do_install() { oe_runmake install DESTDIR="${D}" } -FILES_${PN}-dev += "${datadir}/cmake" -ALLOW_EMPTY_${PN} = "1" +FILES:${PN}-dev += "${datadir}/cmake" +ALLOW_EMPTY:${PN} = "1" diff --git a/recipes-devtools/cuda/cuda-binaries-common-defs.inc b/recipes-devtools/cuda/cuda-binaries-common-defs.inc index da9d44dc..a5319a3d 100644 --- a/recipes-devtools/cuda/cuda-binaries-common-defs.inc +++ b/recipes-devtools/cuda/cuda-binaries-common-defs.inc @@ -1,4 +1,4 @@ -COMPATIBLE_MACHINE_class-target = "(cuda)" +COMPATIBLE_MACHINE:class-target = "(cuda)" COMPATIBLE_HOST = "(x86_64|aarch64)" CUDA_VERSION ??= "10.2" CUDA_FULL_VERSION ?= "${PV}" diff --git a/recipes-devtools/cuda/cuda-command-line-tools_10.2.89-1.bb b/recipes-devtools/cuda/cuda-command-line-tools_10.2.89-1.bb index 851b9118..c8ef5d98 100644 --- a/recipes-devtools/cuda/cuda-command-line-tools_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-command-line-tools_10.2.89-1.bb @@ -13,10 +13,10 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_install[noexec] = "1" -COMPATIBLE_MACHINE_class-target = "tegra" -PACKAGE_ARCH_class-target = "${TEGRA_PKGARCH}" +COMPATIBLE_MACHINE:class-target = "tegra" +PACKAGE_ARCH:class-target = "${TEGRA_PKGARCH}" PACKAGES = "${PN} ${PN}-dev" -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} = "${CUDA_COMPONENTS}" +ALLOW_EMPTY:${PN} = "1" +RDEPENDS:${PN} = "${CUDA_COMPONENTS}" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-compiler_10.2.89-1.bb b/recipes-devtools/cuda/cuda-compiler_10.2.89-1.bb index 68eb6ea2..3235c330 100644 --- a/recipes-devtools/cuda/cuda-compiler_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-compiler_10.2.89-1.bb @@ -13,10 +13,10 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_install[noexec] = "1" -COMPATIBLE_MACHINE_class-target = "tegra" -PACKAGE_ARCH_class-target = "${TEGRA_PKGARCH}" +COMPATIBLE_MACHINE:class-target = "tegra" +PACKAGE_ARCH:class-target = "${TEGRA_PKGARCH}" PACKAGES = "${PN} ${PN}-dev" -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} = "${CUDA_COMPONENTS}" +ALLOW_EMPTY:${PN} = "1" +RDEPENDS:${PN} = "${CUDA_COMPONENTS}" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-cudart_10.2.89-1.bb b/recipes-devtools/cuda/cuda-cudart_10.2.89-1.bb index 04299638..d4628f07 100644 --- a/recipes-devtools/cuda/cuda-cudart_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-cudart_10.2.89-1.bb @@ -3,14 +3,14 @@ DEPENDS = "cuda-driver cuda-misc-headers cuda-nvcc-headers" require cuda-shared-binaries-${PV}.inc MAINSUM = "2a718596cf1162bf0076d4ec6db52a5f7c3617b7ab7cd243887376e841a99915" -MAINSUM_x86-64 = "fde9942850342aa5fcba1bef7922e15033f046fb7d7243743d13f284206a4517" +MAINSUM:x86-64 = "fde9942850342aa5fcba1bef7922e15033f046fb7d7243743d13f284206a4517" DEVSUM = "5aa2bf1e8e9d467dacbff778b0d2d4a7bd31077a443b7a49711cc798562ea37d" -DEVSUM_x86-64 = "0d8e97b450685b6013ed33f0b96b1c80fad6e813721561a8b5fd83712a678a75" +DEVSUM:x86-64 = "0d8e97b450685b6013ed33f0b96b1c80fad6e813721561a8b5fd83712a678a75" inherit container-runtime-csv siteinfo CONTAINER_CSV_FILES = "${sysconfdir}/ld.so.conf.d/cuda-${CUDA_VERSION_DASHED}.conf" -do_compile_append() { +do_compile:append() { echo "${prefix}/local/cuda-${CUDA_VERSION}/${baselib}" > ${B}/cuda-${CUDA_VERSION_DASHED}.conf if [ "${baselib}" != "lib64" -a "${SITEINFO_BITS}" = "64" ]; then if [ -e ${B}/usr/local/cuda-${CUDA_VERSION}/${baselib} ]; then @@ -19,14 +19,14 @@ do_compile_append() { fi } -do_install_append_class-target() { +do_install:append:class-target() { install -d ${D}${sysconfdir}/ld.so.conf.d install -m 0644 ${B}/cuda-${CUDA_VERSION_DASHED}.conf ${D}${sysconfdir}/ld.so.conf.d/ } -FILES_${PN}-dev += "${prefix}/local/cuda-${CUDA_VERSION}/${baselib}/*.a \ +FILES:${PN}-dev += "${prefix}/local/cuda-${CUDA_VERSION}/${baselib}/*.a \ ${@' ${prefix}/local/cuda-${CUDA_VERSION}/lib64' if d.getVar('baselib') != 'lib64' and d.getVar('SITEINFO_BITS') == '64' else ''}" -FILES_${PN}-staticdev = "" -INSANE_SKIP_${PN}-dev += "staticdev" -RDEPENDS_${PN}-dev_append_class-target = " cuda-nvcc-headers cuda-target-environment" +FILES:${PN}-staticdev = "" +INSANE_SKIP:${PN}-dev += "staticdev" +RDEPENDS:${PN}-dev:append:class-target = " cuda-nvcc-headers cuda-target-environment" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-cufft_10.2.89-1.bb b/recipes-devtools/cuda/cuda-cufft_10.2.89-1.bb index 1610ae2a..f69a8a23 100644 --- a/recipes-devtools/cuda/cuda-cufft_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-cufft_10.2.89-1.bb @@ -1,9 +1,9 @@ require cuda-shared-binaries-${PV}.inc MAINSUM = "7d06a0bdd16b16c2384de79e488cde5bb580b3bc9ee46bd1e23d17ce6d260e01" -MAINSUM_x86-64 = "2b708db5e0db3306dcf8fc209a70667e9b291429cd9821da34c538752e93df96" +MAINSUM:x86-64 = "2b708db5e0db3306dcf8fc209a70667e9b291429cd9821da34c538752e93df96" DEVSUM = "239060c552e98511b8a752127c57bd86cd1261af5062b99f85d94a12ef61d876" -DEVSUM_x86-64 = "caeccf3d860939a8e31a4ab9941aac4994bf0aabea42cf75c131b6fa7dffaeb9" +DEVSUM:x86-64 = "caeccf3d860939a8e31a4ab9941aac4994bf0aabea42cf75c131b6fa7dffaeb9" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-cuobjdump_10.2.89-1.bb b/recipes-devtools/cuda/cuda-cuobjdump_10.2.89-1.bb index 2b90ac13..7ecadd01 100644 --- a/recipes-devtools/cuda/cuda-cuobjdump_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-cuobjdump_10.2.89-1.bb @@ -3,5 +3,5 @@ CUDA_PKG = "${BPN}" require cuda-shared-binaries-${PV}.inc MAINSUM = "719b32f039cd8ed6123e1f9e3fa9badcf4c6ba5ac4a0b24a97d2db88e0764e1e" -MAINSUM_x86-64 = "3b61bf94e4f2eb1bc250848badcae753b13aeae7b4e0482fd42ed47e928b9fa3" +MAINSUM:x86-64 = "3b61bf94e4f2eb1bc250848badcae753b13aeae7b4e0482fd42ed47e928b9fa3" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-cupti_10.2.89-1.bb b/recipes-devtools/cuda/cuda-cupti_10.2.89-1.bb index cbee7f22..2e1b2682 100644 --- a/recipes-devtools/cuda/cuda-cupti_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-cupti_10.2.89-1.bb @@ -1,11 +1,11 @@ require cuda-shared-binaries-${PV}.inc MAINSUM = "319771f42db1d9a4a273bc5ff753148247ece9cf7544d2008d57d9061e6964f9" -MAINSUM_x86-64 = "5e431c6f9da2b11d9b64fe5e8e1bd6d9d61759b275f7835f3cf546a985c2b440" +MAINSUM:x86-64 = "5e431c6f9da2b11d9b64fe5e8e1bd6d9d61759b275f7835f3cf546a985c2b440" DEVSUM = "3bd27507b8eef4ae9d5faf8671e8843ef7bd4cede82dc76a8e6519390e22a5dc" -DEVSUM_x86-64 = "511439b3f21837d3ba42862f33b44fbec44ceba23abff1e687126981a07d62e2" +DEVSUM:x86-64 = "511439b3f21837d3ba42862f33b44fbec44ceba23abff1e687126981a07d62e2" -FILES_${PN}-dev += "${prefix}/local/cuda-${CUDA_VERSION}/extras/CUPTI/Readme.txt \ +FILES:${PN}-dev += "${prefix}/local/cuda-${CUDA_VERSION}/extras/CUPTI/Readme.txt \ ${prefix}/local/cuda-${CUDA_VERSION}/extras/CUPTI/include ${prefix}/local/cuda-${CUDA_VERSION}/extras/CUPTI/sample" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-curand_10.2.89-1.bb b/recipes-devtools/cuda/cuda-curand_10.2.89-1.bb index 32c2ec3a..8ef931ea 100644 --- a/recipes-devtools/cuda/cuda-curand_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-curand_10.2.89-1.bb @@ -1,8 +1,8 @@ require cuda-shared-binaries-${PV}.inc MAINSUM = "1cf024814383a2ec21e562e1e89809050dbae36bceed6ee276affe03185ca266" -MAINSUM_x86-64 = "dc4d4ae191f8855718147b5fff50f2b3ea24d776abe57089e08b847820bc0420" +MAINSUM:x86-64 = "dc4d4ae191f8855718147b5fff50f2b3ea24d776abe57089e08b847820bc0420" DEVSUM = "f6594cd55b89a4e45ca3a382cef99c6bd3d2efb7ab222a82f261a79cc9e066ce" -DEVSUM_x86-64 = "287501f3bac8a421f86129083bb53bde156aa47d1d908da1f26b51efa2b30d8a" +DEVSUM:x86-64 = "287501f3bac8a421f86129083bb53bde156aa47d1d908da1f26b51efa2b30d8a" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-cusolver_10.2.89-1.bb b/recipes-devtools/cuda/cuda-cusolver_10.2.89-1.bb index 06a325cc..c0f4b65a 100644 --- a/recipes-devtools/cuda/cuda-cusolver_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-cusolver_10.2.89-1.bb @@ -1,8 +1,8 @@ require cuda-shared-binaries-${PV}.inc MAINSUM = "ede4930b8a7d8098590b3691785cf225fdbb08e3cb7853ca8f0ffc7313e89b3f" -MAINSUM_x86-64 = "2aecbc3c808c0f9806a29a664215aada09e58ceeaf2f5013b251cbfa68059153" +MAINSUM:x86-64 = "2aecbc3c808c0f9806a29a664215aada09e58ceeaf2f5013b251cbfa68059153" DEVSUM = "e3d786efc6d92e24c2527a2a76685de4cfc92e609a3b6ab1258cc820a5c867e4" -DEVSUM_x86-64 = "cc3ed9cdfa44f16e54c593326bfaaf2336806e59f17e7329461b40faa9d2c0fd" +DEVSUM:x86-64 = "cc3ed9cdfa44f16e54c593326bfaaf2336806e59f17e7329461b40faa9d2c0fd" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-cusparse_10.2.89-1.bb b/recipes-devtools/cuda/cuda-cusparse_10.2.89-1.bb index d51fe808..3515878f 100644 --- a/recipes-devtools/cuda/cuda-cusparse_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-cusparse_10.2.89-1.bb @@ -1,8 +1,8 @@ require cuda-shared-binaries-${PV}.inc MAINSUM = "459f9e41ac458eef3c94ba0a5d367182af83c070454d9e38b3565252c039a827" -MAINSUM_x86-64 = "d109051dafc2594611c92108a2682f233e539bffd338133c70998d53fd840d2e" +MAINSUM:x86-64 = "d109051dafc2594611c92108a2682f233e539bffd338133c70998d53fd840d2e" DEVSUM = "3a9ccd17e6916fda5cede14c206a8199fdba27f1118947a1f31cbf33132241df" -DEVSUM_x86-64 = "9c7b5beb34c1c6f827715ee9391793465f03b7e2ee8e32a989b0e1989db40cc1" +DEVSUM:x86-64 = "9c7b5beb34c1c6f827715ee9391793465f03b7e2ee8e32a989b0e1989db40cc1" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-driver_10.2.89-1.bb b/recipes-devtools/cuda/cuda-driver_10.2.89-1.bb index b30e8246..14218cdf 100644 --- a/recipes-devtools/cuda/cuda-driver_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-driver_10.2.89-1.bb @@ -4,9 +4,9 @@ CUDA_PKG = "${BPN}-dev" require cuda-shared-binaries-${PV}.inc DEVSUM = "c1c55ba59d8a28a7d56800504c65683a4d392893f35d08ec7bddf6b45efda468" -DEVSUM_x86-64 = "4e57a63577872f1b8ae9a65b81b4d015f3c9c7533e81f48655d33ecca611caf3" +DEVSUM:x86-64 = "4e57a63577872f1b8ae9a65b81b4d015f3c9c7533e81f48655d33ecca611caf3" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" PRIVATE_LIBS = "libcuda.so.1" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-gdb_10.2.89-1.bb b/recipes-devtools/cuda/cuda-gdb_10.2.89-1.bb index fd9367fe..c2aa8dc1 100644 --- a/recipes-devtools/cuda/cuda-gdb_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-gdb_10.2.89-1.bb @@ -3,15 +3,15 @@ CUDA_PKG = "${BPN}" require cuda-shared-binaries-${PV}.inc MAINSUM = "d3fef316b7d5b215cf11ff0190c69d9e8a2652b9dd37f454c7350110954e3496" -MAINSUM_x86-64 = "c982d10e7c79fe1c7b8fe96f1011bf15da4a55e8b46408144a4bc4685a7ed1fb" +MAINSUM:x86-64 = "c982d10e7c79fe1c7b8fe96f1011bf15da4a55e8b46408144a4bc4685a7ed1fb" DEPENDS = "ncurses expat" -do_compile_append() { +do_compile:append() { sed -i -r -e 's,^(\s*)print (.*)$,\1print(\2),' ${B}/usr/local/cuda-${CUDA_VERSION}/share/gdb/system-gdbinit/*.py } -FILES_${PN}-dev += "${prefix}/local/cuda-${CUDA_VERSION}/share/gdb" -RDEPENDS_${PN}-dev += "python3" -INSANE_SKIP_${PN}-dev += "staticdev" +FILES:${PN}-dev += "${prefix}/local/cuda-${CUDA_VERSION}/share/gdb" +RDEPENDS:${PN}-dev += "python3" +INSANE_SKIP:${PN}-dev += "staticdev" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-libraries_10.2.89-1.bb b/recipes-devtools/cuda/cuda-libraries_10.2.89-1.bb index c93c675c..b8cf3219 100644 --- a/recipes-devtools/cuda/cuda-libraries_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-libraries_10.2.89-1.bb @@ -21,11 +21,11 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_install[noexec] = "1" -COMPATIBLE_MACHINE_class-target = "tegra" -PACKAGE_ARCH_class-target = "${TEGRA_PKGARCH}" +COMPATIBLE_MACHINE:class-target = "tegra" +PACKAGE_ARCH:class-target = "${TEGRA_PKGARCH}" PACKAGES = "${PN} ${PN}-dev" -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} = "${CUDA_COMPONENTS}" -RDEPENDS_${PN}-dev = "${@' '.join(['%s-dev' % pkg for pkg in d.getVar('CUDA_COMPONENTS').split()])} cuda-nvml-dev cuda-nvcc-headers" +ALLOW_EMPTY:${PN} = "1" +RDEPENDS:${PN} = "${CUDA_COMPONENTS}" +RDEPENDS:${PN}-dev = "${@' '.join(['%s-dev' % pkg for pkg in d.getVar('CUDA_COMPONENTS').split()])} cuda-nvml-dev cuda-nvcc-headers" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-memcheck_10.2.89-1.bb b/recipes-devtools/cuda/cuda-memcheck_10.2.89-1.bb index cfe82762..c0d70ec3 100644 --- a/recipes-devtools/cuda/cuda-memcheck_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-memcheck_10.2.89-1.bb @@ -3,6 +3,6 @@ CUDA_PKG = "${BPN}" require cuda-shared-binaries-${PV}.inc MAINSUM = "f8f498108e1e4e3fdc40a1cb80cec44bb3da987b2160a3128d3bcf85a8533bbf" -MAINSUM_x86-64 = "9881098dd47b9d0f4a265904129726f2bb5c6e61041d95e84a276073a4edefe8" +MAINSUM:x86-64 = "9881098dd47b9d0f4a265904129726f2bb5c6e61041d95e84a276073a4edefe8" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-misc-headers_10.2.89-1.bb b/recipes-devtools/cuda/cuda-misc-headers_10.2.89-1.bb index 2fc296ad..3755cdc9 100644 --- a/recipes-devtools/cuda/cuda-misc-headers_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-misc-headers_10.2.89-1.bb @@ -3,7 +3,7 @@ CUDA_PKG = "${BPN}" require cuda-shared-binaries-${PV}.inc MAINSUM = "e92834f576241295c74393b478cb7121d9e20cb3454aed26c464c3523eaeadde" -MAINSUM_x86-64 = "cdacec79c3ac1ab591a133f11258067b977a0f670de50f2f2355cafe0a34e850" +MAINSUM:x86-64 = "cdacec79c3ac1ab591a133f11258067b977a0f670de50f2f2355cafe0a34e850" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-npp_10.2.89-1.bb b/recipes-devtools/cuda/cuda-npp_10.2.89-1.bb index 9134e6fb..d73e8760 100644 --- a/recipes-devtools/cuda/cuda-npp_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-npp_10.2.89-1.bb @@ -1,8 +1,8 @@ require cuda-shared-binaries-${PV}.inc MAINSUM = "a01a204e6afefb0072424817c7133c5c18a9f3996fbf48f0b31297cb7c07e1ac" -MAINSUM_x86-64 = "225dc09c4d0ee8324dd578ae3619620d44fe7d64fb6fd98b8077503414ad3f75" +MAINSUM:x86-64 = "225dc09c4d0ee8324dd578ae3619620d44fe7d64fb6fd98b8077503414ad3f75" DEVSUM = "4d572a2472564f5008c3cfe9b24dbef765a1531a73c43436c66a146b4d16cace" -DEVSUM_x86-64 = "c72f2ab87fe76457d3ecf91f9990748206a0e663c5644914f1eec0928ea0230a" +DEVSUM:x86-64 = "c72f2ab87fe76457d3ecf91f9990748206a0e663c5644914f1eec0928ea0230a" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-nvcc-headers_10.2.89-1.bb b/recipes-devtools/cuda/cuda-nvcc-headers_10.2.89-1.bb index 43ae78c6..ffe766a3 100644 --- a/recipes-devtools/cuda/cuda-nvcc-headers_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-nvcc-headers_10.2.89-1.bb @@ -3,9 +3,9 @@ CUDA_PKG = "cuda-nvcc" require cuda-shared-binaries-${PV}.inc MAINSUM = "1a0ea57d4c1b1d9394d7e4f6ab94baa2aa49883f4ba2d59a60b750bb88d0fdeb" -MAINSUM_x86-64 = "a4d649cb1433f7f9e2453abf2caf606819db0eb57def025568f276c31da53f85" +MAINSUM:x86-64 = "a4d649cb1433f7f9e2453abf2caf606819db0eb57def025568f276c31da53f85" -do_install_append() { +do_install:append() { for d in bin nvvm nvvmx; do rm -rf ${D}${prefix}/local/cuda-${CUDA_VERSION}/$d done @@ -13,7 +13,7 @@ do_install_append() { CONTAINER_CSV_FILES = "" CONTAINER_CSV_PKGNAME = "" -FILES_${PN} = "${prefix}/local/cuda-${CUDA_VERSION}/include" -FILES_${PN}-dev = "" +FILES:${PN} = "${prefix}/local/cuda-${CUDA_VERSION}/include" +FILES:${PN}-dev = "" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-nvcc_10.2.89-1.bb b/recipes-devtools/cuda/cuda-nvcc_10.2.89-1.bb index 07e2caf0..5b55192c 100644 --- a/recipes-devtools/cuda/cuda-nvcc_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-nvcc_10.2.89-1.bb @@ -3,17 +3,17 @@ CUDA_PKG = "${BPN}" require cuda-shared-binaries-${PV}.inc MAINSUM = "1a0ea57d4c1b1d9394d7e4f6ab94baa2aa49883f4ba2d59a60b750bb88d0fdeb" -MAINSUM_x86-64 = "a4d649cb1433f7f9e2453abf2caf606819db0eb57def025568f276c31da53f85" +MAINSUM:x86-64 = "a4d649cb1433f7f9e2453abf2caf606819db0eb57def025568f276c31da53f85" # header files are populated by cuda-nvcc-headers recipes -do_install_append() { +do_install:append() { rm -rf ${D}${prefix}/local/cuda-${CUDA_VERSION}/include } -FILES_${PN} = "${prefix}/local/cuda-${CUDA_VERSION}" -FILES_${PN}-dev = "" -INSANE_SKIP_${PN} += "dev-so" -RDEPENDS_${PN} = "${BPN}-headers" -RDEPENDS_${PN}_append_class-nativesdk = " nativesdk-cuda-environment" +FILES:${PN} = "${prefix}/local/cuda-${CUDA_VERSION}" +FILES:${PN}-dev = "" +INSANE_SKIP:${PN} += "dev-so" +RDEPENDS:${PN} = "${BPN}-headers" +RDEPENDS:${PN}:append:class-nativesdk = " nativesdk-cuda-environment" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-nvdisasm_10.2.89-1.bb b/recipes-devtools/cuda/cuda-nvdisasm_10.2.89-1.bb index 7c79b6de..3a6b9796 100644 --- a/recipes-devtools/cuda/cuda-nvdisasm_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-nvdisasm_10.2.89-1.bb @@ -3,6 +3,6 @@ CUDA_PKG = "${BPN}" require cuda-shared-binaries-${PV}.inc MAINSUM = "9523033692cca5a2b29cd69942d69036deedacb8eb3273395662f6024b2c27f9" -MAINSUM_x86-64 = "b2fc9a5cdf02dec9df7bd91ef9815e1b50e500afc130d537cd1c72f54441dd44" +MAINSUM:x86-64 = "b2fc9a5cdf02dec9df7bd91ef9815e1b50e500afc130d537cd1c72f54441dd44" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-nvgraph_10.2.89-1.bb b/recipes-devtools/cuda/cuda-nvgraph_10.2.89-1.bb index c9aacdcf..ce430b15 100644 --- a/recipes-devtools/cuda/cuda-nvgraph_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-nvgraph_10.2.89-1.bb @@ -3,8 +3,8 @@ DEPENDS = "cuda-curand cuda-cusolver" require cuda-shared-binaries-${PV}.inc MAINSUM = "f800974ac6cb3fb6595a08e613fc0f376d7b91f43eed1b5306b0496f9588e441" -MAINSUM_x86-64 = "74504993bfe8ca45d23e4b70d0e8b27d067f36e36a0b7f1823616e713dccb2c8" +MAINSUM:x86-64 = "74504993bfe8ca45d23e4b70d0e8b27d067f36e36a0b7f1823616e713dccb2c8" DEVSUM = "cc2d9897c54f27a20f90bea5df391875b3f8163ec69745fb7546c1ce57e1d718" -DEVSUM_x86-64 = "42c83e9ee5350578f173849dc7ef7b46535d8cad777ddfa8b2a568d53cb1909f" +DEVSUM:x86-64 = "42c83e9ee5350578f173849dc7ef7b46535d8cad777ddfa8b2a568d53cb1909f" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-nvml_10.2.89-1.bb b/recipes-devtools/cuda/cuda-nvml_10.2.89-1.bb index 4dbfdd02..5a0e671d 100644 --- a/recipes-devtools/cuda/cuda-nvml_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-nvml_10.2.89-1.bb @@ -3,9 +3,9 @@ CUDA_PKG = "${BPN}-dev" require cuda-shared-binaries-${PV}.inc DEVSUM = "c8743e69c84a432c5e6dea6edfcacf1bb6b09b028bee61c8aece7a41d0447265" -DEVSUM_x86-64 = "fe21076a38bd066b1c7d0c9bc0124e9dfc816b84f40e1fe1d20156c6bb5869fc" +DEVSUM:x86-64 = "fe21076a38bd066b1c7d0c9bc0124e9dfc816b84f40e1fe1d20156c6bb5869fc" -ALLOW_EMPTY_${PN} = "1" -FILES_${PN}-dev += "${prefix}/local/cuda-${CUDA_VERSION}/nvml/example" +ALLOW_EMPTY:${PN} = "1" +FILES:${PN}-dev += "${prefix}/local/cuda-${CUDA_VERSION}/nvml/example" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-nvprof_10.2.89-1.bb b/recipes-devtools/cuda/cuda-nvprof_10.2.89-1.bb index 7b10523a..9cfade27 100644 --- a/recipes-devtools/cuda/cuda-nvprof_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-nvprof_10.2.89-1.bb @@ -3,7 +3,7 @@ CUDA_PKG = "${BPN}" require cuda-shared-binaries-${PV}.inc MAINSUM = "54d96b9cdba5a53da92b2cdaada27ec7a886b3a6a29e7d33b5fdf429ad788681" -MAINSUM_x86-64 = "1250be701216367d55476fbb1842389ffe2b58f0dce045151ffa9e17fe61d195" +MAINSUM:x86-64 = "1250be701216367d55476fbb1842389ffe2b58f0dce045151ffa9e17fe61d195" DEPENDS = "cuda-cupti" diff --git a/recipes-devtools/cuda/cuda-nvprune_10.2.89-1.bb b/recipes-devtools/cuda/cuda-nvprune_10.2.89-1.bb index d6226276..b964dd02 100644 --- a/recipes-devtools/cuda/cuda-nvprune_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-nvprune_10.2.89-1.bb @@ -3,6 +3,6 @@ CUDA_PKG = "${BPN}" require cuda-shared-binaries-${PV}.inc MAINSUM = "1e04820f53fb96b737c6b5d92ae2c1c54414e84a87ae9a55a00fc78c05e4e33f" -MAINSUM_x86-64 = "99fe77894938fecd6eb3172580f5c17a24686167ab222250eaa1c62e2f147372" +MAINSUM:x86-64 = "99fe77894938fecd6eb3172580f5c17a24686167ab222250eaa1c62e2f147372" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-nvrtc_10.2.89-1.bb b/recipes-devtools/cuda/cuda-nvrtc_10.2.89-1.bb index 5821ade7..9e415473 100644 --- a/recipes-devtools/cuda/cuda-nvrtc_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-nvrtc_10.2.89-1.bb @@ -1,8 +1,8 @@ require cuda-shared-binaries-${PV}.inc MAINSUM = "fe9cc7cbdab29035371e5f77d190aecd97bbf31ca66b3f62612bf62580417b16" -MAINSUM_x86-64 = "4ec0c9130e41b75efb46da9a1ff0df479fb4deeea3b377eacd3e942311cef9e5" +MAINSUM:x86-64 = "4ec0c9130e41b75efb46da9a1ff0df479fb4deeea3b377eacd3e942311cef9e5" DEVSUM = "5c3bd9bc84170ec0c3465444409e7912046e2523e6a18d331b53901c0e57d229" -DEVSUM_x86-64 = "61aa1d77e33853f13dab7aadf3d2e035317428cc56411cc4a5bb5093928b8e85" +DEVSUM:x86-64 = "61aa1d77e33853f13dab7aadf3d2e035317428cc56411cc4a5bb5093928b8e85" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-nvtx_10.2.89-1.bb b/recipes-devtools/cuda/cuda-nvtx_10.2.89-1.bb index 93c9a53e..aac75215 100644 --- a/recipes-devtools/cuda/cuda-nvtx_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-nvtx_10.2.89-1.bb @@ -3,6 +3,6 @@ CUDA_PKG = "${BPN}" require cuda-shared-binaries-${PV}.inc MAINSUM = "b4f9dedf0c21dbc75daadbabfde6aa17a73b6bdad0d5a18fae3da6e9717bfc99" -MAINSUM_x86-64 = "39e003953fe1efb566b78c5523bedf96d9ce812a11efae6eab7250b13d984f6e" +MAINSUM:x86-64 = "39e003953fe1efb566b78c5523bedf96d9ce812a11efae6eab7250b13d984f6e" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/cuda-samples_10.2.89-1.bb b/recipes-devtools/cuda/cuda-samples_10.2.89-1.bb index d71567c8..bcf4c7f7 100644 --- a/recipes-devtools/cuda/cuda-samples_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-samples_10.2.89-1.bb @@ -7,11 +7,11 @@ COMPATIBLE_MACHINE = "(tegra)" L4T_DEB_GROUP = "cuda-samples" CUDA_VERSION_DASHED = "${@d.getVar('CUDA_VERSION').replace('.','-')}" -SRC_COMMON_DEBS = "${BPN}-${CUDA_VERSION_DASHED}_${PV}_arm64.deb;unpack=false" +SRC_COMMON_DEBS = "${BPN}-${CUDA_VERSION_DASHED}_${PV}:arm64.deb;unpack=false" SRC_URI[sha256sum] = "121e273d8586bde904ceeab72a603a86d781f3bac6d3a21732703ca2ca9ec528" do_unpack_samples() { - dpkg-deb --fsys-tarfile ${WORKDIR}/cuda-samples-10-2_${PV}_arm64.deb | \ + dpkg-deb --fsys-tarfile ${WORKDIR}/cuda-samples-10-2_${PV}:arm64.deb | \ tar --strip-components=5 --exclude="*/doc/*" --exclude="*/bin/*" -x -f- -C ${S} } @@ -91,12 +91,12 @@ do_install() { [ -e "$f" ] || continue install -m 0755 "$f" ${D}${bindir}/cuda-samples/ done - dpkg-deb --fsys-tarfile ${WORKDIR}/cuda-samples-10-2_${PV}_arm64.deb | \ + dpkg-deb --fsys-tarfile ${WORKDIR}/cuda-samples-10-2_${PV}:arm64.deb | \ tar --exclude="*usr/share*" -x -f- -C ${D} } INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -FILES_${PN} = "${bindir}/cuda-samples" -FILES_${PN}-dev = "${CUDA_PATH}" -INSANE_SKIP_${PN}-dev = "staticdev" +FILES:${PN} = "${bindir}/cuda-samples" +FILES:${PN}-dev = "${CUDA_PATH}" +INSANE_SKIP:${PN}-dev = "staticdev" PACKAGE_ARCH = "${TEGRA_PKGARCH}" diff --git a/recipes-devtools/cuda/cuda-shared-binaries-10.2.89-1.inc b/recipes-devtools/cuda/cuda-shared-binaries-10.2.89-1.inc index 10a2d360..98f897c3 100644 --- a/recipes-devtools/cuda/cuda-shared-binaries-10.2.89-1.inc +++ b/recipes-devtools/cuda/cuda-shared-binaries-10.2.89-1.inc @@ -12,7 +12,7 @@ SRC_COMMON_DEBS = "${@' '.join(['%s-${CUDA_VERSION_DASHED}_${PV}_${CUDA_DEB_PKGA SRC_URI[main.sha256sum] = "${MAINSUM}" SRC_URI[dev.sha256sum] = "${DEVSUM}" LICSUM = "8a862acbff5b33904bfe7ec3e92a553a8312da1db9f651b6cfe14db137a139ce" -LICSUM_x86-64 = "daf3f9891b290b64ae1130546aaadabd6631b44d08c69a76a74e94a111b6ecec" +LICSUM:x86-64 = "daf3f9891b290b64ae1130546aaadabd6631b44d08c69a76a74e94a111b6ecec" SRC_URI[lic.sha256sum] = "${LICSUM}" CUDA_DL_CLASS = "l4t_deb_pkgfeed" @@ -85,21 +85,21 @@ do_install() { rm -f ${D}${prefix}/local/cuda-${CUDA_VERSION}/LICENSE ${D}${prefix}/local/cuda-${CUDA_VERSION}/README ${D}${prefix}/local/cuda-${CUDA_VERSION}/version.txt } -FILES_${PN} += "${prefix}/local/cuda-${CUDA_VERSION}/${baselib}/*${SOLIBS} ${prefix}/local/cuda-${CUDA_VERSION}/bin" -FILES_${PN}-dev += "${prefix}/local/cuda-${CUDA_VERSION}/extras ${prefix}/local/cuda-${CUDA_VERSION}/include ${prefix}/local/cuda-${CUDA_VERSION}/${baselib}/stubs \ +FILES:${PN} += "${prefix}/local/cuda-${CUDA_VERSION}/${baselib}/*${SOLIBS} ${prefix}/local/cuda-${CUDA_VERSION}/bin" +FILES:${PN}-dev += "${prefix}/local/cuda-${CUDA_VERSION}/extras ${prefix}/local/cuda-${CUDA_VERSION}/include ${prefix}/local/cuda-${CUDA_VERSION}/${baselib}/stubs \ ${prefix}/local/cuda-${CUDA_VERSION}/${baselib}/*${SOLIBSDEV}" -FILES_${PN}-staticdev += "${prefix}/local/cuda-${CUDA_VERSION}/${baselib}/*.a" -RDEPENDS_${PN}_class-target = "tegra-libraries" +FILES:${PN}-staticdev += "${prefix}/local/cuda-${CUDA_VERSION}/${baselib}/*.a" +RDEPENDS:${PN}:class-target = "tegra-libraries" -INSANE_SKIP_${PN} = "ldflags libdir" -INSANE_SKIP_${PN}-dev = "ldflags libdir dev-elf" +INSANE_SKIP:${PN} = "ldflags libdir" +INSANE_SKIP:${PN}-dev = "ldflags libdir dev-elf" -sysroot_stage_dirs_append() { +sysroot_stage_dirs:append() { sysroot_stage_dir $from${prefix}/local/cuda-${CUDA_VERSION} $to${prefix}/local/cuda-${CUDA_VERSION} } inherit container-runtime-csv CONTAINER_CSV_FILES = "${prefix}/local/*" -COMPATIBLE_MACHINE_class-target = "(tegra)" -PACKAGE_ARCH_class-target = "${TEGRA_PKGARCH}" +COMPATIBLE_MACHINE:class-target = "(tegra)" +PACKAGE_ARCH:class-target = "${TEGRA_PKGARCH}" diff --git a/recipes-devtools/cuda/cuda-target-environment_1.0.bb b/recipes-devtools/cuda/cuda-target-environment_1.0.bb index 75ff0f3b..c55d961d 100644 --- a/recipes-devtools/cuda/cuda-target-environment_1.0.bb +++ b/recipes-devtools/cuda/cuda-target-environment_1.0.bb @@ -27,6 +27,6 @@ do_install() { install -m 0644 ${B}/cuda_target.sh ${D}/environment-setup.d/ } -FILES_${PN} = "/environment-setup.d" -RDEPENDS_${PN} = "tegra-cmake-overrides" -PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}" +FILES:${PN} = "/environment-setup.d" +RDEPENDS:${PN} = "tegra-cmake-overrides" +PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}" diff --git a/recipes-devtools/cuda/cuda-toolkit_10.2.89-1.bb b/recipes-devtools/cuda/cuda-toolkit_10.2.89-1.bb index ef7f7be5..6a9b2efe 100644 --- a/recipes-devtools/cuda/cuda-toolkit_10.2.89-1.bb +++ b/recipes-devtools/cuda/cuda-toolkit_10.2.89-1.bb @@ -15,11 +15,11 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_install[noexec] = "1" -COMPATIBLE_MACHINE_class-target = "tegra" -PACKAGE_ARCH_class-target = "${TEGRA_PKGARCH}" +COMPATIBLE_MACHINE:class-target = "tegra" +PACKAGE_ARCH:class-target = "${TEGRA_PKGARCH}" PACKAGES = "${PN} ${PN}-dev" -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} = "cuda-command-line-tools cuda-compiler cuda-libraries-dev cuda-nvml-dev" -INSANE_SKIP_${PN} = "dev-deps" +ALLOW_EMPTY:${PN} = "1" +RDEPENDS:${PN} = "cuda-command-line-tools cuda-compiler cuda-libraries-dev cuda-nvml-dev" +INSANE_SKIP:${PN} = "dev-deps" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/cuda/libcublas_10.2.2.89-1.bb b/recipes-devtools/cuda/libcublas_10.2.2.89-1.bb index 1a0b5ba0..6a4c2cff 100644 --- a/recipes-devtools/cuda/libcublas_10.2.2.89-1.bb +++ b/recipes-devtools/cuda/libcublas_10.2.2.89-1.bb @@ -6,13 +6,13 @@ require cuda-shared-binaries-${CUDA_FULL_VERSION}.inc L4T_DEB_GROUP = "cublas" SRC_COMMON_DEBS = "libcublas10_10.2.2.89-1_${CUDA_DEB_PKGARCH}.deb;name=main;subdir=${BP} \ libcublas-dev_10.2.2.89-1_${CUDA_DEB_PKGARCH}.deb;name=dev;subdir=${BP}" -SRC_URI_append = " ${L4T_DEB_FEED_BASE}/common/pool/main/c/cuda/cuda-license-${CUDA_VERSION_DASHED}_10.2.89-1_${CUDA_DEB_PKGARCH}.deb;name=lic;subdir=${BP}" +SRC_URI:append = " ${L4T_DEB_FEED_BASE}/common/pool/main/c/cuda/cuda-license-${CUDA_VERSION_DASHED}_10.2.89-1_${CUDA_DEB_PKGARCH}.deb;name=lic;subdir=${BP}" MAINSUM = "d0299b139a163136432dfb2c028769944b6c5636ad9238614860c196a1c91aea" -MAINSUM_x86-64 = "e28a243120d72ddb4dd75dfa3894330394318df87ebe5f1d4611b0ca0e8ade2b" +MAINSUM:x86-64 = "e28a243120d72ddb4dd75dfa3894330394318df87ebe5f1d4611b0ca0e8ade2b" DEVSUM = "5fa7e3e8fe266fdea7e91778610b7e8d3d85d8950875a4915ce3626c9e564365" -DEVSUM_x86-64 = "2d36e90ca3c1835577bdea35db5980058c3eb35b24961c8764cdd2fa607cad7d" +DEVSUM:x86-64 = "2d36e90ca3c1835577bdea35db5980058c3eb35b24961c8764cdd2fa607cad7d" -do_compile_append() { +do_compile:append() { if [ -d ${B}/usr/${baselib}/${HOST_ARCH}-linux-gnu ]; then for f in ${B}/usr/${baselib}/${HOST_ARCH}-linux-gnu/lib*; do [ -e "$f" ] || continue @@ -25,7 +25,7 @@ do_compile_append() { ln -sf cublas-10.pc ${B}/usr/${baselib}/pkgconfig/cublas-10.2.pc } -do_install_append() { +do_install:append() { rm -rf ${D}${prefix}/local } diff --git a/recipes-devtools/cuda/nativesdk-cuda-environment_1.0.bb b/recipes-devtools/cuda/nativesdk-cuda-environment_1.0.bb index b89d10c0..0f6e1dec 100644 --- a/recipes-devtools/cuda/nativesdk-cuda-environment_1.0.bb +++ b/recipes-devtools/cuda/nativesdk-cuda-environment_1.0.bb @@ -17,5 +17,5 @@ do_install() { chmod 0644 ${D}${SDKPATHNATIVE}/environment-setup.d/cuda.sh } -FILES_${PN} = "${SDKPATHNATIVE}" -FILES_${PN}-dev = "" +FILES:${PN} = "${SDKPATHNATIVE}" +FILES:${PN}-dev = "" diff --git a/recipes-devtools/cudnn/cudnn_8.0.0.180-1.bb b/recipes-devtools/cudnn/cudnn_8.0.0.180-1.bb index 5b7c5ac3..6587548a 100644 --- a/recipes-devtools/cudnn/cudnn_8.0.0.180-1.bb +++ b/recipes-devtools/cudnn/cudnn_8.0.0.180-1.bb @@ -61,13 +61,13 @@ do_install() { } PACKAGES += "${PN}-samples" -FILES_${PN}-samples = "${prefix}/src" -INSANE_SKIP_${PN} = "ldflags" +FILES:${PN}-samples = "${prefix}/src" +INSANE_SKIP:${PN} = "ldflags" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" INHIBIT_SYSROOT_STRIP = "1" -RDEPENDS_${PN}-samples = "libcublas libcublas-dev cuda-cudart" -RPROVIDES_${PN}-samples = "${PN}-examples" -INSANE_SKIP_${PN}-samples = "build-deps dev-deps ldflags staticdev" +RDEPENDS:${PN}-samples = "libcublas libcublas-dev cuda-cudart" +RPROVIDES:${PN}-samples = "${PN}-examples" +INSANE_SKIP:${PN}-samples = "build-deps dev-deps ldflags staticdev" diff --git a/recipes-devtools/deepstream/deepstream-5.1_5.1.0-1.bb b/recipes-devtools/deepstream/deepstream-5.1_5.1.0-1.bb index 587b12f1..9e0bd077 100644 --- a/recipes-devtools/deepstream/deepstream-5.1_5.1.0-1.bb +++ b/recipes-devtools/deepstream/deepstream-5.1_5.1.0-1.bb @@ -9,7 +9,7 @@ HOMEPAGE = "https://developer.nvidia.com/deepstream-sdk" inherit l4t_deb_pkgfeed -SRC_COMMON_DEBS = "${BPN}_${PV}_arm64.deb;subdir=${BPN}" +SRC_COMMON_DEBS = "${BPN}_${PV}:arm64.deb;subdir=${BPN}" SRC_URI[sha256sum] = "68b5ddff8b8682ed657fe8554cfb492f36621274a7593d9660f335ce8ba926a5" COMPATIBLE_MACHINE = "(tegra)" @@ -84,15 +84,15 @@ PKGCONF_PACKAGES = "${@pkgconf_packages(d)}" PACKAGES =+ "${PN}-samples-data ${PN}-samples ${PN}-sources ${PN}-iothub-client ${PN}-azure-edge ${PN}-triton-plugins ${PKGCONF_PACKAGES}" -FILES_${PN} = "${sysconfdir}/ld.so.conf.d/ \ +FILES:${PN} = "${sysconfdir}/ld.so.conf.d/ \ ${libdir}/gstreamer-1.0/deepstream \ ${DEEPSTREAM_PATH}/lib \ " -FILES_${PN}-dev = "${includedir}" +FILES:${PN}-dev = "${includedir}" -FILES_${PN}-samples = "${bindir}/*" -FILES_${PN}-samples-data = "\ +FILES:${PN}-samples = "${bindir}/*" +FILES:${PN}-samples-data = "\ ${DEEPSTREAM_PATH}/samples \ ${DEEPSTREAM_PATH}/sources/apps/sample_apps/*/*.txt \ ${DEEPSTREAM_PATH}/sources/apps/sample_apps/*/README \ @@ -101,17 +101,17 @@ FILES_${PN}-samples-data = "\ ${DEEPSTREAM_PATH}/sources/apps/sample_apps/*/csv_files/ \ " -FILES_${PN}-sources = "${DEEPSTREAM_PATH}/sources" +FILES:${PN}-sources = "${DEEPSTREAM_PATH}/sources" -FILES_${PN}-iothub-client = "${DEEPSTREAM_PATH}/lib/libiothub_client.so" -FILES_${PN}-azure-edge = "${DEEPSTREAM_PATH}/lib/libazure*" -FILES_${PN}-triton-plugins = "${DEEPSTREAM_PATH}/lib/triton_backends" -FILES_${PN}-amqp = "${DEEPSTREAM_PATH}/lib/libnvds_amqp*" -FILES_${PN}-kafka = "${DEEPSTREAM_PATH}/lib/libnvds_kafka*" -FILES_${PN}-redis = "${DEEPSTREAM_PATH}/lib/libnvds_redis*" +FILES:${PN}-iothub-client = "${DEEPSTREAM_PATH}/lib/libiothub_client.so" +FILES:${PN}-azure-edge = "${DEEPSTREAM_PATH}/lib/libazure*" +FILES:${PN}-triton-plugins = "${DEEPSTREAM_PATH}/lib/triton_backends" +FILES:${PN}-amqp = "${DEEPSTREAM_PATH}/lib/libnvds_amqp*" +FILES:${PN}-kafka = "${DEEPSTREAM_PATH}/lib/libnvds_kafka*" +FILES:${PN}-redis = "${DEEPSTREAM_PATH}/lib/libnvds_redis*" -RDEPENDS_${PN} = "cuda-cufft libvisionworks-devso-symlink" -RDEPENDS_${PN}-samples = "${PN}-samples-data" -RDEPENDS_${PN}-samples-data = "bash" -RDEPENDS_${PN}-sources = "bash ${PN}-samples-data ${PN}" -RRECOMMENDS_${PN} = "liberation-fonts" +RDEPENDS:${PN} = "cuda-cufft libvisionworks-devso-symlink" +RDEPENDS:${PN}-samples = "${PN}-samples-data" +RDEPENDS:${PN}-samples-data = "bash" +RDEPENDS:${PN}-sources = "bash ${PN}-samples-data ${PN}" +RRECOMMENDS:${PN} = "liberation-fonts" diff --git a/recipes-devtools/gie/tensorrt_7.1.3-1.bb b/recipes-devtools/gie/tensorrt_7.1.3-1.bb index 240daf9b..2d8cb84c 100644 --- a/recipes-devtools/gie/tensorrt_7.1.3-1.bb +++ b/recipes-devtools/gie/tensorrt_7.1.3-1.bb @@ -6,7 +6,7 @@ inherit l4t_deb_pkgfeed container-runtime-csv HOMEPAGE = "http://developer.nvidia.com/tensorrt" PREFIX = "NoDLA-" -PREFIX_tegra194 = "DLA-" +PREFIX:tegra194 = "DLA-" L4T_DEB_GROUP = "tensorrt" @@ -34,16 +34,16 @@ PLUGINSHA256SUM = "a57ea8b4757fa4592c6ba1555bc07045909b553a493c0bde8c8b23c74cf08 PLUGINDEVSHA256SUM = "94820301980118e34cc1ab99570d3a7a13b96f4811828908b63bf638b4252edd" BINSHA256SUM = "94927076974c59ae45b0c56300387816b8fa03d397d1503d8633e7989b4a20f6" -LIBSHA256SUM_tegra194 = "6f6b0e27339ff352f975c65842f4b315db8b341ae5c7d92545c2fe8b3a727ce3" -DEVSHA256SUM_tegra194 = "b494da5c43360bd20b832854c766b4d4e3cfecdfbd73bef8d96c4ce9ae7f022c" -SAMPSHA256SUM_tegra194 = "87d32bb231c19717c4690e05c770eb51d3d5ad4bea8fbd0ee46ba4d1a386ad9f" -NVPSHA256SUM_tegra194 = "65db2ae0f5d7dbb452306823ac4b6ea27386a5650db337c7fa50969f3d9d3cea" -NVPDEVSHA256SUM_tegra194 = "dc48c0dc44ff69246f3062a480e9d5ac8f72f5bc798bdfad401ebbcb9912e475" -ONNXSHA256SUM_tegra194 = "26109c58e8eab9dc746fb3fc39cc39bf5a8bf2d61a27b5d9e7aa035fc0b97b4c" -ONNXDEVSHA256SUM_tegra194 = "52783ca7245171eb83c623a08851c0cfdc659696272b2edf6dfe3503ae9bc49b" -PLUGINSHA256SUM_tegra194 = "680c7849542dca1cac68fc94f7474f31446cf093b6e6df1d7bab8c24a6122aa3" -PLUGINDEVSHA256SUM_tegra194 = "bac84671b2990b8110d4f2ac69b4a29cf230346db37a902d1f47cf7a9be4601e" -BINSHA256SUM_tegra194 = "56275d8cba17be877af063db49ecb7b6e02bed5f8d387b1182a6a7ec2cabee2a" +LIBSHA256SUM:tegra194 = "6f6b0e27339ff352f975c65842f4b315db8b341ae5c7d92545c2fe8b3a727ce3" +DEVSHA256SUM:tegra194 = "b494da5c43360bd20b832854c766b4d4e3cfecdfbd73bef8d96c4ce9ae7f022c" +SAMPSHA256SUM:tegra194 = "87d32bb231c19717c4690e05c770eb51d3d5ad4bea8fbd0ee46ba4d1a386ad9f" +NVPSHA256SUM:tegra194 = "65db2ae0f5d7dbb452306823ac4b6ea27386a5650db337c7fa50969f3d9d3cea" +NVPDEVSHA256SUM:tegra194 = "dc48c0dc44ff69246f3062a480e9d5ac8f72f5bc798bdfad401ebbcb9912e475" +ONNXSHA256SUM:tegra194 = "26109c58e8eab9dc746fb3fc39cc39bf5a8bf2d61a27b5d9e7aa035fc0b97b4c" +ONNXDEVSHA256SUM:tegra194 = "52783ca7245171eb83c623a08851c0cfdc659696272b2edf6dfe3503ae9bc49b" +PLUGINSHA256SUM:tegra194 = "680c7849542dca1cac68fc94f7474f31446cf093b6e6df1d7bab8c24a6122aa3" +PLUGINDEVSHA256SUM:tegra194 = "bac84671b2990b8110d4f2ac69b4a29cf230346db37a902d1f47cf7a9be4601e" +BINSHA256SUM:tegra194 = "56275d8cba17be877af063db49ecb7b6e02bed5f8d387b1182a6a7ec2cabee2a" SRC_URI[lib.sha256sum] = "${LIBSHA256SUM}" SRC_URI[dev.sha256sum] = "${DEVSHA256SUM}" @@ -63,7 +63,7 @@ LIC_FILES_CHKSUM = "file://usr/include/aarch64-linux-gnu/NvInfer.h;endline=48;md S = "${WORKDIR}/tensorrt" DEPENDS = "libcublas cudnn cuda-cudart cuda-nvrtc libglvnd" -DEPENDS_append_tegra194 = " tegra-libraries" +DEPENDS:append:tegra194 = " tegra-libraries" CONTAINER_CSV_FILES = "${libdir}/*.so* /usr/src/*" @@ -84,17 +84,17 @@ do_install() { cp --preserve=mode,timestamps --recursive ${S}/usr/src/tensorrt ${D}${prefix}/src/ } PACKAGES += "${PN}-samples" -FILES_${PN} += "${prefix}/src/tensorrt/bin" -FILES_${PN}-samples = "${prefix}/src" +FILES:${PN} += "${prefix}/src/tensorrt/bin" +FILES:${PN}-samples = "${prefix}/src" -RDEPENDS_${PN} += "libstdc++ cudnn libcublas cuda-cudart cuda-nvrtc cuda-nvtx tegra-libraries libglvnd" -RDEPENDS_${PN}-samples += "tegra-libraries bash python3 libglvnd cudnn cuda-cudart libcublas" -RPROVIDES_${PN}-samples = "${PN}-examples" +RDEPENDS:${PN} += "libstdc++ cudnn libcublas cuda-cudart cuda-nvrtc cuda-nvtx tegra-libraries libglvnd" +RDEPENDS:${PN}-samples += "tegra-libraries bash python3 libglvnd cudnn cuda-cudart libcublas" +RPROVIDES:${PN}-samples = "${PN}-examples" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" INHIBIT_SYSROOT_STRIP = "1" -INSANE_SKIP_${PN} = "textrel ldflags" -INSANE_SKIP_${PN}-samples = "ldflags" +INSANE_SKIP:${PN} = "textrel ldflags" +INSANE_SKIP:${PN}-samples = "ldflags" PACKAGE_ARCH = "${TEGRA_PKGARCH}" -PACKAGE_ARCH_tegra194 = "${SOC_FAMILY_PKGARCH}" +PACKAGE_ARCH:tegra194 = "${SOC_FAMILY_PKGARCH}" diff --git a/recipes-devtools/nsight-systems/nsight-systems-cli_2020.5.3.17.bb b/recipes-devtools/nsight-systems/nsight-systems-cli_2020.5.3.17.bb index fbf30f9e..d31bb178 100644 --- a/recipes-devtools/nsight-systems/nsight-systems-cli_2020.5.3.17.bb +++ b/recipes-devtools/nsight-systems/nsight-systems-cli_2020.5.3.17.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \ inherit l4t_deb_pkgfeed -SRC_COMMON_DEBS = "${BPN}-${BASE_VERSION}_${PV}-0256620_arm64.deb;subdir=${BPN}" +SRC_COMMON_DEBS = "${BPN}-${BASE_VERSION}_${PV}-0256620:arm64.deb;subdir=${BPN}" SRC_URI[sha256sum] = "8a1d1bc76ee4a88793e1df26214e0df9aa69e0b435f9e79acdca84a41e7b3c8f" S = "${WORKDIR}/${BPN}" @@ -39,11 +39,11 @@ INHIBIT_SYSROOT_STRIP = "1" EXCLUDE_FROM_SHLIBS = "1" PACKAGES += "${PN}-qdstrmimporter" -FILES_${PN} = " \ +FILES:${PN} = " \ /opt/nvidia/${BPN}/${BASE_VERSION}/target-linux-armv8 \ /opt/nvidia/${BPN}/${BASE_VERSION}/bin \ " -FILES_${PN}-qdstrmimporter = "/opt/nvidia/${BPN}/${BASE_VERSION}/host-linux-armv8" -INSANE_SKIP_${PN} = "ldflags file-rdeps" -INSANE_SKIP_${PN}-qdstrmimporter = "ldflags file-rdeps" +FILES:${PN}-qdstrmimporter = "/opt/nvidia/${BPN}/${BASE_VERSION}/host-linux-armv8" +INSANE_SKIP:${PN} = "ldflags file-rdeps" +INSANE_SKIP:${PN}-qdstrmimporter = "ldflags file-rdeps" PACKAGE_ARCH = "${TEGRA_PKGARCH}" diff --git a/recipes-devtools/visionworks/libvisionworks-sfm_0.90.4.501.bb b/recipes-devtools/visionworks/libvisionworks-sfm_0.90.4.501.bb index b3324705..35e4144c 100644 --- a/recipes-devtools/visionworks/libvisionworks-sfm_0.90.4.501.bb +++ b/recipes-devtools/visionworks/libvisionworks-sfm_0.90.4.501.bb @@ -9,8 +9,8 @@ inherit l4t_deb_pkgfeed container-runtime-csv HOMEPAGE = "https://developer.nvidia.com/embedded/visionworks" SRC_COMMON_DEBS = "\ - libvisionworks-sfm_${PV}_arm64.deb;subdir=${BPN};name=lib \ - libvisionworks-sfm-dev_${PV}_arm64.deb;subdir=${BPN};name=dev \ + libvisionworks-sfm_${PV}:arm64.deb;subdir=${BPN};name=lib \ + libvisionworks-sfm-dev_${PV}:arm64.deb;subdir=${BPN};name=dev \ " SRC_URI[lib.sha256sum] = "f0aa8309f87791c8766b5ac86d4f218692d91479d4109b90081579b0e635e9d3" @@ -39,8 +39,8 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" INHIBIT_SYSROOT_STRIP = "1" PACKAGES += "${PN}-samples" -FILES_${PN}-dev += "${datadir}/visionworks-sfm/cmake" -FILES_${PN}-doc += "${datadir}/visionworks-sfm/docs" -FILES_${PN}-samples += "${datadir}/visionworks-sfm/sources" -RDEPENDS_${PN} = "libstdc++" +FILES:${PN}-dev += "${datadir}/visionworks-sfm/cmake" +FILES:${PN}-doc += "${datadir}/visionworks-sfm/docs" +FILES:${PN}-samples += "${datadir}/visionworks-sfm/sources" +RDEPENDS:${PN} = "libstdc++" PACKAGE_ARCH = "${TEGRA_PKGARCH}" diff --git a/recipes-devtools/visionworks/libvisionworks-tracking_0.88.2.501.bb b/recipes-devtools/visionworks/libvisionworks-tracking_0.88.2.501.bb index 3d8c6f5a..f47aa297 100644 --- a/recipes-devtools/visionworks/libvisionworks-tracking_0.88.2.501.bb +++ b/recipes-devtools/visionworks/libvisionworks-tracking_0.88.2.501.bb @@ -7,8 +7,8 @@ inherit l4t_deb_pkgfeed container-runtime-csv HOMEPAGE = "https://developer.nvidia.com/embedded/visionworks" SRC_COMMON_DEBS = "\ - libvisionworks-tracking_${PV}_arm64.deb;subdir=${BPN};name=lib \ - libvisionworks-tracking-dev_${PV}_arm64.deb;subdir=${BPN};name=dev \ + libvisionworks-tracking_${PV}:arm64.deb;subdir=${BPN};name=lib \ + libvisionworks-tracking-dev_${PV}:arm64.deb;subdir=${BPN};name=dev \ " SRC_URI[lib.sha256sum] = "2d4c9149f40948810a3731f17240167cb21e81aff720cc7454dc358b17ba5b98" @@ -37,8 +37,8 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" INHIBIT_SYSROOT_STRIP = "1" PACKAGES += "${PN}-samples" -FILES_${PN}-dev += "${datadir}/visionworks-tracking/cmake" -FILES_${PN}-doc += "${datadir}/visionworks-tracking/docs" -FILES_${PN}-samples += "${datadir}/visionworks-tracking/sources" -RDEPENDS_${PN} = "libstdc++" +FILES:${PN}-dev += "${datadir}/visionworks-tracking/cmake" +FILES:${PN}-doc += "${datadir}/visionworks-tracking/docs" +FILES:${PN}-samples += "${datadir}/visionworks-tracking/sources" +RDEPENDS:${PN} = "libstdc++" PACKAGE_ARCH = "${TEGRA_PKGARCH}" diff --git a/recipes-devtools/visionworks/libvisionworks_1.6.0.501.bb b/recipes-devtools/visionworks/libvisionworks_1.6.0.501.bb index 01648c27..b26e9792 100644 --- a/recipes-devtools/visionworks/libvisionworks_1.6.0.501.bb +++ b/recipes-devtools/visionworks/libvisionworks_1.6.0.501.bb @@ -7,7 +7,7 @@ inherit l4t_deb_pkgfeed container-runtime-csv HOMEPAGE = "https://developer.nvidia.com/embedded/visionworks" SRC_COMMON_DEBS = "\ - libvisionworks_${PV}_arm64.deb;subdir=${BPN};name=lib \ + libvisionworks_${PV}:arm64.deb;subdir=${BPN};name=lib \ libvisionworks-dev_${PV}_all.deb;subdir=${BPN};name=dev \ " @@ -38,10 +38,10 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" INHIBIT_SYSROOT_STRIP = "1" PACKAGES =+ "${PN}-devso-symlink" -FILES_${PN}-devso-symlink = "${libdir}/libvisionworks${SOLIBSDEV}" -FILES_${PN}-dev += "${datadir}/visionworks" -RDEPENDS_${PN}-devso-symlink = "${PN}" -INSANE_SKIP_${PN}-devso-symlink = "dev-so" -RDEPENDS_${PN}-dev += "${PN}-devso-symlink" -RDEPENDS_${PN} = "libstdc++" +FILES:${PN}-devso-symlink = "${libdir}/libvisionworks${SOLIBSDEV}" +FILES:${PN}-dev += "${datadir}/visionworks" +RDEPENDS:${PN}-devso-symlink = "${PN}" +INSANE_SKIP:${PN}-devso-symlink = "dev-so" +RDEPENDS:${PN}-dev += "${PN}-devso-symlink" +RDEPENDS:${PN} = "libstdc++" PACKAGE_ARCH = "${TEGRA_PKGARCH}" diff --git a/recipes-devtools/vpi/libnvvpi1_1.0.15.bb b/recipes-devtools/vpi/libnvvpi1_1.0.15.bb index b2aeb0af..b1c2aaeb 100644 --- a/recipes-devtools/vpi/libnvvpi1_1.0.15.bb +++ b/recipes-devtools/vpi/libnvvpi1_1.0.15.bb @@ -9,19 +9,19 @@ LIC_FILES_CHKSUM = " \ inherit l4t_deb_pkgfeed SRC_COMMON_DEBS = "\ - libnvvpi1_${PV}_arm64.deb;name=lib;subdir=vpi1 \ - vpi1-dev_${PV}_arm64.deb;name=dev;subdir=vpi1 \ + libnvvpi1_${PV}:arm64.deb;name=lib;subdir=vpi1 \ + vpi1-dev_${PV}:arm64.deb;name=dev;subdir=vpi1 \ " SRC_URI[lib.sha256sum] = "6c82f73820ab6a7b991cf88e28722a73b65979236a35d5e3bf4567130b283d99" SRC_URI[dev.sha256sum] = "7863af049be6bf7ef24d68412d8eb1c68f08f5f87059f2e6a3f57308b973a727" -SRC_URI_append = " file://0001-vpi-config-allow-to-compute-the-installation-prefix.patch" +SRC_URI:append = " file://0001-vpi-config-allow-to-compute-the-installation-prefix.patch" S = "${WORKDIR}/vpi1" B = "${S}" DEPENDS = "cuda-cudart cuda-cufft tegra-libraries" -SYSROOT_DIRS_append = " /opt" +SYSROOT_DIRS:append = " /opt" COMPATIBLE_MACHINE = "(tegra)" @@ -45,6 +45,6 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" INHIBIT_SYSROOT_STRIP = "1" PACKAGES = "${PN} ${PN}-dev" -FILES_${PN} = "/opt/nvidia/vpi1/lib64/libnvvpi.so.1* ${sysconfdir}/ld.so.conf.d" -FILES_${PN}-dev = "/opt/nvidia/vpi1/lib64/libnvvpi.so /opt/nvidia/vpi1/include ${datadir}/vpi1/cmake" +FILES:${PN} = "/opt/nvidia/vpi1/lib64/libnvvpi.so.1* ${sysconfdir}/ld.so.conf.d" +FILES:${PN}-dev = "/opt/nvidia/vpi1/lib64/libnvvpi.so /opt/nvidia/vpi1/include ${datadir}/vpi1/cmake" PACKAGE_ARCH = "${TEGRA_PKGARCH}" diff --git a/recipes-graphics/cairo/cairo_%.bbappend b/recipes-graphics/cairo/cairo_%.bbappend index ebd11b49..c91784dd 100644 --- a/recipes-graphics/cairo/cairo_%.bbappend +++ b/recipes-graphics/cairo/cairo_%.bbappend @@ -1,3 +1,3 @@ -PACKAGECONFIG_append_tegra = " egl glesv2" -PACKAGECONFIG_remove_tegra = "opengl" -PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}" +PACKAGECONFIG:append:tegra = " egl glesv2" +PACKAGECONFIG:remove:tegra = "opengl" +PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}" diff --git a/recipes-graphics/drm/libdrm_%.bbappend b/recipes-graphics/drm/libdrm_%.bbappend index a610ddff..cc222116 100644 --- a/recipes-graphics/drm/libdrm_%.bbappend +++ b/recipes-graphics/drm/libdrm_%.bbappend @@ -1,9 +1,9 @@ -RDEPENDS_${PN}_tegra = "libdrm-nvdc" +RDEPENDS:${PN:}:tegra = "libdrm-nvdc" # Ensure libdrm uses its helpers and doesn't call back into libdrm-nvdc -LDFLAGS_append_tegra = " -Wl,-Bsymbolic-functions" +LDFLAGS:append:tegra = " -Wl,-Bsymbolic-functions" -pkg_postinst_${PN}_tegra() { +pkg_postinst:${PN:}:tegra() { ln -sf libdrm_nvdc.so $D${libdir}/libdrm.so.2 } -PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}" +PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}" diff --git a/recipes-graphics/l4t-graphics-demos/l4t-graphics-demos.inc b/recipes-graphics/l4t-graphics-demos/l4t-graphics-demos.inc index 193a6d77..030367d3 100644 --- a/recipes-graphics/l4t-graphics-demos/l4t-graphics-demos.inc +++ b/recipes-graphics/l4t-graphics-demos/l4t-graphics-demos.inc @@ -4,7 +4,7 @@ COMPATIBLE_MACHINE = "(tegra)" # The sources for t186 and t210 are identical, so just pick one L4T_DEB_SOCNAME = "t186" -SRC_SOC_DEBS = "nvidia-l4t-graphics-demos_${PV}-20210519111140_arm64.deb;subdir=l4t-graphics-demos" +SRC_SOC_DEBS = "nvidia-l4t-graphics-demos_${PV}-20210519111140:arm64.deb;subdir=l4t-graphics-demos" inherit l4t_deb_pkgfeed diff --git a/recipes-graphics/l4t-graphics-demos/l4t-graphics-demos_32.5.1.bb b/recipes-graphics/l4t-graphics-demos/l4t-graphics-demos_32.5.1.bb index 1c9b8757..daccf9ba 100644 --- a/recipes-graphics/l4t-graphics-demos/l4t-graphics-demos_32.5.1.bb +++ b/recipes-graphics/l4t-graphics-demos/l4t-graphics-demos_32.5.1.bb @@ -62,9 +62,9 @@ do_install() { } PACKAGES =+ "${PN}-x11 ${PN}-wayland ${PN}-egldevice" -FILES_${PN}-x11 = "${bindir}/${BPN}/x11" -FILES_${PN}-wayland = "${bindir}/${BPN}/wayland" -FILES_${PN}-egldevice = "${bindir}/${BPN}/egldevice" -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN}-egldevice = "libdrm" -RDEPENDS_${PN} = "${PN}-egldevice ${@' '.join(['${PN}-%s' % p for p in d.getVar('PACKAGECONFIG').split()])}" +FILES:${PN}-x11 = "${bindir}/${BPN}/x11" +FILES:${PN}-wayland = "${bindir}/${BPN}/wayland" +FILES:${PN}-egldevice = "${bindir}/${BPN}/egldevice" +ALLOW_EMPTY:${PN} = "1" +RDEPENDS:${PN}-egldevice = "libdrm" +RDEPENDS:${PN} = "${PN}-egldevice ${@' '.join(['${PN}-%s' % p for p in d.getVar('PACKAGECONFIG').split()])}" diff --git a/recipes-graphics/l4t-graphics-demos/l4t-nvidia-glheaders_32.5.1.bb b/recipes-graphics/l4t-graphics-demos/l4t-nvidia-glheaders_32.5.1.bb index f20b4c55..c53350b0 100644 --- a/recipes-graphics/l4t-graphics-demos/l4t-nvidia-glheaders_32.5.1.bb +++ b/recipes-graphics/l4t-graphics-demos/l4t-nvidia-glheaders_32.5.1.bb @@ -15,4 +15,4 @@ do_install() { } PACKAGES = "${PN}-dev ${PN}" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/recipes-graphics/libglvnd/libglvnd_1.3.3.bb b/recipes-graphics/libglvnd/libglvnd_1.3.3.bb index ff613b8c..314ccbb9 100644 --- a/recipes-graphics/libglvnd/libglvnd_1.3.3.bb +++ b/recipes-graphics/libglvnd/libglvnd_1.3.3.bb @@ -22,7 +22,7 @@ inherit meson pkgconfig features_check python3native S = "${WORKDIR}/git" -PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}" +PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ @@ -31,7 +31,7 @@ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} PACKAGECONFIG[x11] = "-Dx11=enabled -Dglx=enabled,-Dx11=disabled -Dglx=disabled,libx11 libxext xorgproto" PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland" -do_install_append() { +do_install:append() { ## no-X11 hack included from mesa: #because we cannot rely on the fact that all apps will use pkgconfig, @@ -43,12 +43,12 @@ do_install_append() { fi } -RPROVIDES_${PN} += "libegl libgl libgles1 libgles2" -RPROVIDES_${PN}-dev += "libegl-dev libgl-dev libgles1-dev libgles2-dev" -RCONFLICTS_${PN} = "libegl libgl ligbles1 libgles2" -RCONFLICTS_${PN}-dev += "libegl-dev libgl-dev libgles1-dev libgles2-dev" -RREPLACES_${PN} = "libegl libgl libgles1 ligbles2" +RPROVIDES:${PN} += "libegl libgl libgles1 libgles2" +RPROVIDES:${PN}-dev += "libegl-dev libgl-dev libgles1-dev libgles2-dev" +RCONFLICTS:${PN} = "libegl libgl ligbles1 libgles2" +RCONFLICTS:${PN}-dev += "libegl-dev libgl-dev libgles1-dev libgles2-dev" +RREPLACES:${PN} = "libegl libgl libgles1 ligbles2" RREPLACESS_${PN}-dev += "libegl-dev libgl-dev libgles1-dev libgles2-dev" -RDEPENDS_${PN}_append_tegra = " tegra-libraries" -RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)}" +RDEPENDS:${PN}:append:tegra = " tegra-libraries" +RRECOMMENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)}" diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend index b27b0bf8..e15b0a11 100644 --- a/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -1,2 +1,2 @@ -PACKAGECONFIG_tegra = "egl gles2 x11 glx" -PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}" +PACKAGECONFIG:tegra = "egl gles2 x11 glx" +PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}" diff --git a/recipes-graphics/mesa/mesa-gl_%.bbappend b/recipes-graphics/mesa/mesa-gl_%.bbappend index cb190642..5fed308d 100644 --- a/recipes-graphics/mesa/mesa-gl_%.bbappend +++ b/recipes-graphics/mesa/mesa-gl_%.bbappend @@ -1 +1 @@ -COMPATIBLE_MACHINE_tegra = "(-)" +COMPATIBLE_MACHINE:tegra = "(-)" diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index e36214c4..9b40456f 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -1,22 +1,22 @@ -EXTRA_OEMESON_append_tegra = " -Dglvnd=true" -DEPENDS_append_tegra = " libglvnd" -PROVIDES_tegra = "virtual/mesa virtual/libgbm" +EXTRA_OEMESON:append:tegra = " -Dglvnd=true" +DEPENDS:append:tegra = " libglvnd" +PROVIDES:tegra = "virtual/mesa virtual/libgbm" -# Workaround for the do_install_append() present in the OE-Core recipe -do_install_prepend_tegra() { +# Workaround for the do_install:append() present in the OE-Core recipe +do_install::prepend:tegra() { install -d ${D}${includedir}/EGL touch ${D}${includedir}/EGL/eglplatform.h } -do_install_append_tegra() { +do_install:append:tegra() { rm -rf ${D}${includedir}/EGL } -PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}" -FILES_libegl-mesa_append_tegra = " ${libdir}/libEGL_mesa.so.* ${datadir}/glvnd" -FILES_libegl-mesa-dev_append_tegra = " ${libdir}/libEGL_mesa.so" -FILES_libgl-mesa_append_tegra = " ${libdir}/libGLX_mesa.so.*" -FILES_libgl-mesa-dev_append_tegra = " ${libdir}/libGLX_mesa.so" +PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}" +FILES:libegl-mesa:append:tegra = " ${libdir}/libEGL_mesa.so.* ${datadir}/glvnd" +FILES:libegl-mesa-dev:append:tegra = " ${libdir}/libEGL_mesa.so" +FILES:libgl-mesa:append:tegra = " ${libdir}/libGLX_mesa.so.*" +FILES:libgl-mesa-dev:append:tegra = " ${libdir}/libGLX_mesa.so" python __anonymous() { if "tegra" not in d.getVar('OVERRIDES').split(':'): @@ -30,13 +30,13 @@ python __anonymous() { if not p[0] in pkgconfig: continue fullp = p[1] + "-mesa" - d.delVar("RREPLACES_" + fullp) - d.delVar("RPROVIDES_" + fullp) - d.delVar("RCONFLICTS_" + fullp) + d.delVar("RREPLACES:" + fullp) + d.delVar("RPROVIDES:" + fullp) + d.delVar("RCONFLICTS:" + fullp) # For -dev, the first element is both the Debian and original name fullp += "-dev" - d.delVar("RREPLACES_" + fullp) - d.delVar("RPROVIDES_" + fullp) - d.delVar("RCONFLICTS_" + fullp) + d.delVar("RREPLACES:" + fullp) + d.delVar("RPROVIDES:" + fullp) + d.delVar("RCONFLICTS:" + fullp) } diff --git a/recipes-graphics/vulkan/vulkan-loader_1.2.%.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.2.%.bbappend index 7b8084d5..bc743879 100644 --- a/recipes-graphics/vulkan/vulkan-loader_1.2.%.bbappend +++ b/recipes-graphics/vulkan/vulkan-loader_1.2.%.bbappend @@ -1,5 +1,5 @@ -PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}" -PACKAGECONFIG_remove_tegra = "wayland" -RRECOMMENDS_${PN}_remove_tegra = "mesa-vulkan-drivers" -RDEPENDS_${PN}_tegra = "tegra-libraries libxcb libxcb-glx0" -INSANE_SKIP_${PN}_append_tegra = " build-deps" +PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}" +PACKAGECONFIG:remove:tegra = "wayland" +RRECOMMENDS:${PN}:remove:tegra = "mesa-vulkan-drivers" +RDEPENDS:${PN:}:tegra = "tegra-libraries libxcb libxcb-glx0" +INSANE_SKIP:${PN}:append:tegra = " build-deps" diff --git a/recipes-graphics/vulkan/vulkan-tools_1.2.%.bbappend b/recipes-graphics/vulkan/vulkan-tools_1.2.%.bbappend index f86c9d21..2d0a2640 100644 --- a/recipes-graphics/vulkan/vulkan-tools_1.2.%.bbappend +++ b/recipes-graphics/vulkan/vulkan-tools_1.2.%.bbappend @@ -1,2 +1,2 @@ -PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}" -PACKAGECONFIG_remove_tegra = "wayland" +PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}" +PACKAGECONFIG:remove:tegra = "wayland" diff --git a/recipes-graphics/wayland/egl-wayland_1.1.7.bb b/recipes-graphics/wayland/egl-wayland_1.1.7.bb index 89957537..c573a75e 100644 --- a/recipes-graphics/wayland/egl-wayland_1.1.7.bb +++ b/recipes-graphics/wayland/egl-wayland_1.1.7.bb @@ -16,12 +16,12 @@ S = "${WORKDIR}/git" inherit meson pkgconfig -do_install_append() { +do_install:append() { install -d ${D}${datadir}/egl/egl_external_platform.d install -m 0644 ${WORKDIR}/nvidia_wayland.json ${D}${datadir}/egl/egl_external_platform.d/ } -FILES_${PN} += "${datadir}/egl" -FILES_${PN}-dev += "${datadir}/wayland-eglstream" +FILES:${PN} += "${datadir}/egl" +FILES:${PN}-dev += "${datadir}/wayland-eglstream" diff --git a/recipes-graphics/wayland/eglexternalplatform_1.1.bb b/recipes-graphics/wayland/eglexternalplatform_1.1.bb index 7aa673cc..882e6a96 100644 --- a/recipes-graphics/wayland/eglexternalplatform_1.1.bb +++ b/recipes-graphics/wayland/eglexternalplatform_1.1.bb @@ -20,6 +20,6 @@ do_install() { install -m 0644 ${S}/eglexternalplatform.pc ${D}${datadir}/pkgconfig/ } -ALLOW_EMPTY_${PN} = "1" -FILES_${PN}-dev = "${includedir} ${datadir}/pkgconfig" +ALLOW_EMPTY:${PN} = "1" +FILES:${PN}-dev = "${includedir} ${datadir}/pkgconfig" diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend index ae8f4bc1..32cfb973 100644 --- a/recipes-graphics/wayland/weston-init.bbappend +++ b/recipes-graphics/wayland/weston-init.bbappend @@ -1,13 +1,13 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -SRC_URI_append_tegra = "\ +SRC_URI:append:tegra = "\ file://weston-tegra-overrides.conf \ file://xwayland-tegra-start.sh \ " XWAYLAND_SUPPORT = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '#', d)}" -do_install_append_tegra() { +do_install:append:tegra() { install -d ${D}${sysconfdir}/systemd/system/weston.service.d install -m 0644 ${WORKDIR}/weston-tegra-overrides.conf ${D}${sysconfdir}/systemd/system/weston.service.d/ install -d ${D}${bindir} @@ -17,4 +17,4 @@ do_install_append_tegra() { sed -i -e's,@XWAYLAND@,${XWAYLAND_SUPPORT},' ${D}${sysconfdir}/xdg/weston/weston.ini } -PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}" +PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}" diff --git a/recipes-graphics/wayland/weston_9.0.0.bbappend b/recipes-graphics/wayland/weston_9.0.0.bbappend index 6dc0a537..ae83c80a 100644 --- a/recipes-graphics/wayland/weston_9.0.0.bbappend +++ b/recipes-graphics/wayland/weston_9.0.0.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BP}:${THISDIR}/${BPN}:" -SRC_URI_append_tegra = " \ +SRC_URI:append:tegra = " \ file://0001-gl-renderer-Add-EGLDevice-enumeration-support.patch \ file://0002-gl-renderer-Add-support-for-EGLDevice-composited-fra.patch \ file://0003-gl-renderer-Add-EGL-client-support-for-EGLStream-fra.patch \ @@ -8,11 +8,11 @@ SRC_URI_append_tegra = " \ file://0005-backend-drm-Add-support-for-EGLDevice-EGLOutput.patch \ file://0006-compositor-Process-stream-attach-requests-with-wl_eg.patch \ " -LIC_FILES_CHKSUM_tegra = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ +LIC_FILES_CHKSUM:tegra = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ file://libweston/compositor.c;endline=28;md5=866f3381d3f7d9e7035d6b2c895fb668" -DEPENDS_append_tegra = " egl-wayland" -PACKAGECONFIG_remove_tegra = "fbdev" -PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}" +DEPENDS:append:tegra = " egl-wayland" +PACKAGECONFIG:remove:tegra = "fbdev" +PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}" -RDEPENDS_${PN}_append_tegra = " egl-wayland tegra-udrm-probeconf" +RDEPENDS:${PN}:append:tegra = " egl-wayland tegra-udrm-probeconf" diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend index 0f3b2858..f12940fd 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend @@ -1,5 +1,5 @@ -OPENGL_PKGCONFIGS_remove_tegra = "glamor" -PACKAGECONFIG_remove_tegra = "dri2" -PACKAGECONFIG_append_tegra = " xinerama" +OPENGL_PKGCONFIGS:remove:tegra = "glamor" +PACKAGECONFIG:remove:tegra = "dri2" +PACKAGECONFIG:append:tegra = " xinerama" -PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}" +PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}" diff --git a/recipes-graphics/xwayland/xwayland_21.1%.bbappend b/recipes-graphics/xwayland/xwayland_21.1%.bbappend index 0f475e5b..b6ff82f8 100644 --- a/recipes-graphics/xwayland/xwayland_21.1%.bbappend +++ b/recipes-graphics/xwayland/xwayland_21.1%.bbappend @@ -1,5 +1,5 @@ -EXTRA_OEMESON_append_tegra = " -Dglx=false -Dxwayland_eglstream=true" -DEPENDS_append_tegra = " egl-wayland libxshmfence mesa" -PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}" +EXTRA_OEMESON:append:tegra = " -Dglx=false -Dxwayland_eglstream=true" +DEPENDS:append:tegra = " egl-wayland libxshmfence mesa" +PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}" -RDEPENDS_${PN}_append_tegra = " egl-wayland xkbcomp" +RDEPENDS:${PN}:append:tegra = " egl-wayland xkbcomp" diff --git a/recipes-kernel/linux/kernel-devsrc.bbappend b/recipes-kernel/linux/kernel-devsrc.bbappend index 8e480fe7..7dcc19f6 100644 --- a/recipes-kernel/linux/kernel-devsrc.bbappend +++ b/recipes-kernel/linux/kernel-devsrc.bbappend @@ -1,6 +1,6 @@ KERNEL_AWKSCRIPTDIRS ?= "scripts tools arch/*/tools" -do_install_append_tegra() { +do_install:append:tegra() { ( cd $kerneldir/build for i in $(grep -srI "^#!/bin/awk" ${KERNEL_AWKSCRIPTDIRS} | cut -d":" -f1); do diff --git a/recipes-kernel/linux/linux-tegra_4.9.bb b/recipes-kernel/linux/linux-tegra_4.9.bb index 7a406e76..405bf259 100644 --- a/recipes-kernel/linux/linux-tegra_4.9.bb +++ b/recipes-kernel/linux/linux-tegra_4.9.bb @@ -7,12 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" inherit l4t_bsp require recipes-kernel/linux/linux-yocto.inc -DEPENDS_remove = "kern-tools-native" -DEPENDS_append = " kern-tools-tegra-native" +DEPENDS:remove = "kern-tools-native" +DEPENDS:append = " kern-tools-tegra-native" LINUX_VERSION ?= "4.9.201" PV = "${LINUX_VERSION}+git${SRCPV}" -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1]}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1]}:" LINUX_VERSION_EXTENSION ?= "-l4t-r${@'.'.join(d.getVar('L4T_VERSION').split('.')[:2])}" SCMVERSION ??= "y" @@ -27,7 +27,7 @@ SRC_URI = "git://${KERNEL_REPO};name=machine;branch=${KBRANCH} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://systemd.cfg', '', d)} \ " -PATH_prepend = "${STAGING_BINDIR_NATIVE}/kern-tools-tegra:" +PATH:prepend = "${STAGING_BINDIR_NATIVE}/kern-tools-tegra:" KBUILD_DEFCONFIG = "tegra_defconfig" KCONFIG_MODE = "--alldefconfig" @@ -40,7 +40,7 @@ set_scmversion() { } do_kernel_checkout[postfuncs] += "set_scmversion" -python do_kernel_configcheck_prepend() { +python do_kernel_configcheck:prepend() { os.environ['KERNEL_OVERLAYS'] = d.expand("${S}/nvidia ${S}/nvidia/nvgpu") } @@ -79,21 +79,21 @@ bootimg_from_bundled_initramfs() { done fi } -do_deploy_append_tegra186() { +do_deploy:append:tegra186() { bootimg_from_bundled_initramfs } -do_deploy_append_tegra194() { +do_deploy:append:tegra194() { bootimg_from_bundled_initramfs } EXTRADEPLOYDEPS = "" -EXTRADEPLOYDEPS_tegra186 = "tegra186-flashtools-native:do_populate_sysroot" -EXTRADEPLOYDEPS_tegra194 = "tegra186-flashtools-native:do_populate_sysroot" +EXTRADEPLOYDEPS:tegra186 = "tegra186-flashtools-native:do_populate_sysroot" +EXTRADEPLOYDEPS:tegra194 = "tegra186-flashtools-native:do_populate_sysroot" do_deploy[depends] += "${EXTRADEPLOYDEPS}" COMPATIBLE_MACHINE = "(tegra)" -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "${@'' if d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') else '${KERNEL_PACKAGE_NAME}-image'}" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "${@'' if d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') else '${KERNEL_PACKAGE_NAME}-image'}" # kernel.bbclass automatically adds a dependency on the intramfs image # even if INITRAMFS_IMAGE_BUNDLE is disabled. This creates a circular diff --git a/recipes-multimedia/argus/tegra-mmapi-32.5.1.inc b/recipes-multimedia/argus/tegra-mmapi-32.5.1.inc index 61533a7a..153167f1 100644 --- a/recipes-multimedia/argus/tegra-mmapi-32.5.1.inc +++ b/recipes-multimedia/argus/tegra-mmapi-32.5.1.inc @@ -1,10 +1,10 @@ HOMEPAGE = "http://developer.nvidia.com" LICENSE = "Proprietary & BSD" -SRC_SOC_DEBS = "nvidia-l4t-jetson-multimedia-api_${PV}-20210519111140_arm64.deb;subdir=tegra-mmapi" -SRC_SOC_DEBS_tegra210 = "nvidia-l4t-jetson-multimedia-api_${PV}-20210519110732_arm64.deb;subdir=tegra-mmapi" +SRC_SOC_DEBS = "nvidia-l4t-jetson-multimedia-api_${PV}-20210519111140:arm64.deb;subdir=tegra-mmapi" +SRC_SOC_DEBS:tegra210 = "nvidia-l4t-jetson-multimedia-api_${PV}-20210519110732:arm64.deb;subdir=tegra-mmapi" SRC_SHA256SUM = "61e24f12e1ca420fc2a31ef21000ec30979b5b9008989f1fd8f8830965db8573" -SRC_SHA256SUM_tegra210 = "0678aa3f5f8682e19b5aa8e8a8b0fa203ad72f3813b54e2cfe8bb179f3a213e5" +SRC_SHA256SUM:tegra210 = "0678aa3f5f8682e19b5aa8e8a8b0fa203ad72f3813b54e2cfe8bb179f3a213e5" SRC_URI[sha256sum] = "${SRC_SHA256SUM}" inherit l4t_deb_pkgfeed @@ -18,4 +18,4 @@ B = "${S}" COMPATIBLE_MACHINE = "(tegra)" PACKAGE_ARCH = "${TEGRA_PKGARCH}" -PACKAGE_ARCH_tegra210 = "${SOC_FAMILY_PKGARCH}" +PACKAGE_ARCH:tegra210 = "${SOC_FAMILY_PKGARCH}" diff --git a/recipes-multimedia/argus/tegra-mmapi_32.5.1.bb b/recipes-multimedia/argus/tegra-mmapi_32.5.1.bb index a3db806e..459323f7 100644 --- a/recipes-multimedia/argus/tegra-mmapi_32.5.1.bb +++ b/recipes-multimedia/argus/tegra-mmapi_32.5.1.bb @@ -26,4 +26,4 @@ do_install() { } PACKAGES = "${PN}-dev ${PN}" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx-tegra_1.0.0-r32.5.2.bb b/recipes-multimedia/gstreamer/gstreamer1.0-omx-tegra_1.0.0-r32.5.2.bb index c10f093e..6301b436 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-omx-tegra_1.0.0-r32.5.2.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-omx-tegra_1.0.0-r32.5.2.bb @@ -10,7 +10,7 @@ require recipes-bsp/tegra-sources/tegra-sources-32.5.2.inc # Plugin needs a couple of header files that it does not include, but # they are present in the V4L2 plugin source package, so extract them # from there. -unpack_tar_in_tar_append() { +unpack_tar_in_tar:append() { tar -x -j -f ${SRC_ARCHIVE} Linux_for_Tegra/source/public/gst-nvvideo4linux2_src.tbz2 \ --to-command="tar -C ${S}/omx -x -j --no-same-owner -f- nvbufsurface.h nvbuf_utils.h" } @@ -33,7 +33,7 @@ inherit autotools pkgconfig gettext container-runtime-csv CONTAINER_CSV_FILES = "${libdir}/gstreamer-1.0/*.so*" -do_configure_append() { +do_configure:append() { touch ${S}/omx/gstnvivameta_api.h } @@ -41,8 +41,8 @@ acpaths = "-I ${S}/common/m4 -I ${S}/m4" EXTRA_OECONF += "--disable-valgrind --with-omx-target=tegra" -FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" -FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" -RDEPENDS_${PN} += "tegra-configs-omx-tegra gstreamer1.0-plugins-nveglgles-nveglglessink" +FILES:${PN} += "${libdir}/gstreamer-1.0/*.so" +FILES:${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" +FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.la" +FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" +RDEPENDS:${PN} += "tegra-configs-omx-tegra gstreamer1.0-plugins-nveglgles-nveglglessink" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend index 6245a293..801a14d6 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend @@ -1,2 +1,2 @@ -PACKAGECONFIG_append_tegra = " v4l2" -PACKAGE_ARCH_tegra = "${TEGRA_PKGARCH}" +PACKAGECONFIG:append:tegra = " v4l2" +PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvarguscamerasrc_1.0.0-r32.5.2.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvarguscamerasrc_1.0.0-r32.5.2.bb index 9d04d1e6..8380ecd8 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvarguscamerasrc_1.0.0-r32.5.2.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvarguscamerasrc_1.0.0-r32.5.2.bb @@ -27,4 +27,4 @@ CONTAINER_CSV_FILES = "${libdir}/gstreamer-1.0/*.so*" do_install() { oe_runmake install DESTDIR="${D}" } -FILES_${PN} = "${libdir}/gstreamer-1.0" +FILES:${PN} = "${libdir}/gstreamer-1.0" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvcompositor_1.14.0-r32.5.2.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvcompositor_1.14.0-r32.5.2.bb index d29f9840..6c655991 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvcompositor_1.14.0-r32.5.2.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvcompositor_1.14.0-r32.5.2.bb @@ -20,4 +20,4 @@ CONTAINER_CSV_FILES = "${libdir}/gstreamer-1.0/*.so*" do_install() { oe_runmake install DESTDIR="${D}" } -FILES_${PN} = "${libdir}/gstreamer-1.0" +FILES:${PN} = "${libdir}/gstreamer-1.0" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvdrmvideosink_1.14.0-r32.5.2.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvdrmvideosink_1.14.0-r32.5.2.bb index e54e8488..e61a1475 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvdrmvideosink_1.14.0-r32.5.2.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvdrmvideosink_1.14.0-r32.5.2.bb @@ -15,9 +15,9 @@ inherit pkgconfig container-runtime-csv CONTAINER_CSV_FILES = "${libdir}/gstreamer-1.0/*.so*" -CFLAGS_append = " -fpic" +CFLAGS:append = " -fpic" do_install() { oe_runmake install DESTDIR="${D}" } -FILES_${PN} = "${libdir}/gstreamer-1.0" +FILES:${PN} = "${libdir}/gstreamer-1.0" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nveglgles_1.2.3-r32.5.2.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nveglgles_1.2.3-r32.5.2.bb index 528f6e7d..caeac660 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nveglgles_1.2.3-r32.5.2.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nveglgles_1.2.3-r32.5.2.bb @@ -41,16 +41,16 @@ delete_pkg_m4_file() { do_configure[prefuncs] += " delete_pkg_m4_file" -do_configure_append() { +do_configure:append() { rm -f ${S}/po/POTFILES.in echo "" > ${S}/po/POTFILES.in } -do_compile_prepend() { +do_compile:prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/egl/.libs" } -do_install_append() { +do_install:append() { sed -i -e's,${STAGING_INCDIR},${includedir},g' ${D}${libdir}/pkgconfig/gstreamer-egl-1.0.pc } @@ -63,10 +63,10 @@ python add_container_csv_dependency() { if 'virtualization' not in features: return for pkg in ['libgstegl-1.0', 'gstreamer1.0-plugins-nveglgles-nveglglessink']: - if d.getVar('RDEPENDS_%s' % pkg): - d.appendVar('RDEPENDS_%s' % pkg, ' ${CONTAINER_CSV_PKGNAME}') + if d.getVar('RDEPENDS:%s' % pkg): + d.appendVar('RDEPENDS:%s' % pkg, ' ${CONTAINER_CSV_PKGNAME}') else: - d.setVar('RDEPENDS_%s' % pkg, '${CONTAINER_CSV_PKGNAME}') + d.setVar('RDEPENDS:%s' % pkg, '${CONTAINER_CSV_PKGNAME}') } -PACKAGESPLITFUNCS_append = " add_container_csv_dependency " +PACKAGESPLITFUNCS:append = " add_container_csv_dependency " diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvtee_1.14.0-r32.5.2.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvtee_1.14.0-r32.5.2.bb index 52ef4c82..5dfcfb34 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvtee_1.14.0-r32.5.2.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvtee_1.14.0-r32.5.2.bb @@ -19,4 +19,4 @@ CONTAINER_CSV_FILES = "${libdir}/gstreamer-1.0/*.so*" do_install() { oe_runmake install DESTDIR="${D}" } -FILES_${PN} = "${libdir}/gstreamer-1.0" +FILES:${PN} = "${libdir}/gstreamer-1.0" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvv4l2camerasrc_1.14.0-r32.5.2.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvv4l2camerasrc_1.14.0-r32.5.2.bb index c04fcce0..b00d859f 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvv4l2camerasrc_1.14.0-r32.5.2.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvv4l2camerasrc_1.14.0-r32.5.2.bb @@ -28,4 +28,4 @@ CONTAINER_CSV_FILES = "${libdir}/gstreamer-1.0/*.so*" do_install() { oe_runmake install DESTDIR="${D}" } -FILES_${PN} = "${libdir}/gstreamer-1.0" +FILES:${PN} = "${libdir}/gstreamer-1.0" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvidconv_1.14.0-r32.5.2.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvidconv_1.14.0-r32.5.2.bb index 821a1a90..421a6b40 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvidconv_1.14.0-r32.5.2.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvidconv_1.14.0-r32.5.2.bb @@ -24,4 +24,4 @@ CONTAINER_CSV_FILES = "${libdir}/gstreamer-1.0/*.so*" do_install() { oe_runmake install DESTDIR="${D}" } -FILES_${PN} = "${libdir}/gstreamer-1.0" +FILES:${PN} = "${libdir}/gstreamer-1.0" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvideo4linux2_1.14.0-r32.5.2.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvideo4linux2_1.14.0-r32.5.2.bb index 667ce8f4..c44e86fc 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvideo4linux2_1.14.0-r32.5.2.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvideo4linux2_1.14.0-r32.5.2.bb @@ -40,7 +40,7 @@ copy_headers() { cp ${WORKDIR}/v4l2_nv_extensions.h ${S}/ } -do_unpack_append() { +do_unpack:append() { if not bb.data.inherits_class("externalsrc", d): bb.build.exec_func("copy_headers", d) } @@ -48,4 +48,4 @@ do_unpack_append() { do_install() { oe_runmake install DESTDIR="${D}" } -FILES_${PN} = "${libdir}/gstreamer-1.0" +FILES:${PN} = "${libdir}/gstreamer-1.0" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvideosinks_1.14.0-r32.5.2.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvideosinks_1.14.0-r32.5.2.bb index c79b8233..f7e65141 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvideosinks_1.14.0-r32.5.2.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-nvvideosinks_1.14.0-r32.5.2.bb @@ -25,4 +25,4 @@ CONTAINER_CSV_FILES = "${libdir}/gstreamer-1.0/*.so*" do_install() { oe_runmake install DESTDIR="${D}" } -FILES_${PN} = "${libdir}/gstreamer-1.0" +FILES:${PN} = "${libdir}/gstreamer-1.0" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-tegra_1.14.0-r32.5.2.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-tegra_1.14.0-r32.5.2.bb index 1764d49b..7989604b 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-tegra_1.14.0-r32.5.2.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-tegra_1.14.0-r32.5.2.bb @@ -27,5 +27,5 @@ COMPATIBLE_MACHINE = "(tegra)" PACKAGE_ARCH = "${TEGRA_PKGARCH}" PACKAGES = "${PN} ${PN}-dev" -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} = "${PLUGINS}" +ALLOW_EMPTY:${PN} = "1" +RDEPENDS:${PN} = "${PLUGINS}" diff --git a/recipes-multimedia/gstreamer/nvgstapps_32.5.2.bb b/recipes-multimedia/gstreamer/nvgstapps_32.5.2.bb index 953c578a..e7e6c5e4 100644 --- a/recipes-multimedia/gstreamer/nvgstapps_32.5.2.bb +++ b/recipes-multimedia/gstreamer/nvgstapps_32.5.2.bb @@ -49,10 +49,10 @@ do_install() { } PACKAGES =+ "nvgstcapture nvgstplayer" -FILES_nvgstplayer = "${bindir}/nvgstplayer-1.0" -FILES_nvgstcapture = "${bindir}/nvgstcapture-1.0" -ALLOW_EMPTY_nvgstplayer = "1" -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} = "nvgstcapture nvgstplayer" -RRECOMMENDS_nvgstcapture = "gstreamer1.0-plugins-nvarguscamerasrc gstreamer1.0-plugins-nvv4l2camerasrc gstreamer1.0-plugins-good-video4linux2 gstreamer1.0-plugins-tegra" -RRECOMMENDS_nvgstplayer = "gstreamer1.0-plugins-nveglgles gstreamer1.0-plugins-nvvideo4linux2 gstreamer1.0-plugins-nvvideosinks gstreamer1.0-plugins-nvjpeg gstreamer1.0-plugins-tegra" +FILES:nvgstplayer = "${bindir}/nvgstplayer-1.0" +FILES:nvgstcapture = "${bindir}/nvgstcapture-1.0" +ALLOW_EMPTY:nvgstplayer = "1" +ALLOW_EMPTY:${PN} = "1" +RDEPENDS:${PN} = "nvgstcapture nvgstplayer" +RRECOMMENDS:nvgstcapture = "gstreamer1.0-plugins-nvarguscamerasrc gstreamer1.0-plugins-nvv4l2camerasrc gstreamer1.0-plugins-good-video4linux2 gstreamer1.0-plugins-tegra" +RRECOMMENDS:nvgstplayer = "gstreamer1.0-plugins-nveglgles gstreamer1.0-plugins-nvvideo4linux2 gstreamer1.0-plugins-nvvideosinks gstreamer1.0-plugins-nvjpeg gstreamer1.0-plugins-tegra" diff --git a/recipes-multimedia/libv4l2/libv4l2-minimal_1.18.0.bb b/recipes-multimedia/libv4l2/libv4l2-minimal_1.18.0.bb index 5ed0469a..d1a55c8e 100644 --- a/recipes-multimedia/libv4l2/libv4l2-minimal_1.18.0.bb +++ b/recipes-multimedia/libv4l2/libv4l2-minimal_1.18.0.bb @@ -24,14 +24,14 @@ CONTAINER_CSV_BASENAME = "libv4l" CONTAINER_CSV_FILES = "${libdir}/*.so* ${libdir}/libv4l/ov* ${libdir}/libv4l/*.so ${libdir}/libv4l/plugins/*.so" PACKAGES =+ "libv4l libv4l-dev" -RPROVIDES_${PN}-dbg += "libv4l-dbg" -FILES_libv4l += "${libdir}/libv4l*${SOLIBS} ${libdir}/libv4l/*.so ${libdir}/libv4l/plugins/*.so \ +RPROVIDES:${PN}-dbg += "libv4l-dbg" +FILES:libv4l += "${libdir}/libv4l*${SOLIBS} ${libdir}/libv4l/*.so ${libdir}/libv4l/plugins/*.so \ ${libdir}/libv4l/*-decomp" -FILES_libv4l-dev += "${includedir} ${libdir}/pkgconfig \ +FILES:libv4l-dev += "${includedir} ${libdir}/pkgconfig \ ${libdir}/libv4l*${SOLIBSDEV} ${libdir}/*.la \ ${libdir}/v4l*${SOLIBSDEV} ${libdir}/libv4l/*.la ${libdir}/libv4l/plugins/*.la" -RDEPENDS_libv4l = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${CONTAINER_CSV_PKGNAME}', '', d)}" -RDEPENDS_${PN}_remove = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${CONTAINER_CSV_PKGNAME}', '', d)}" -RRECOMMENDS_libv4l = "tegra-libraries-libv4l-plugins" +RDEPENDS:libv4l = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${CONTAINER_CSV_PKGNAME}', '', d)}" +RDEPENDS:${PN}:remove = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${CONTAINER_CSV_PKGNAME}', '', d)}" +RRECOMMENDS:libv4l = "tegra-libraries-libv4l-plugins" PACKAGE_ARCH = "${TEGRA_PKGARCH}" diff --git a/recipes-multimedia/nvbufsurface/nvbufsurface-headers_5.1.0-1.bb b/recipes-multimedia/nvbufsurface/nvbufsurface-headers_5.1.0-1.bb index 5b39e75c..bcca04f5 100644 --- a/recipes-multimedia/nvbufsurface/nvbufsurface-headers_5.1.0-1.bb +++ b/recipes-multimedia/nvbufsurface/nvbufsurface-headers_5.1.0-1.bb @@ -28,4 +28,4 @@ do_install() { install -m 0644 ${S}/includes/nvbufsurface.h ${S}/includes/nvbufsurftransform.h ${D}${includedir}/ } -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1"