diff options
6 files changed, 14 insertions, 8 deletions
diff --git a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc index e33cd1829..2a736de7b 100644 --- a/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc +++ b/dynamic-layers/arm-toolchain/recipes-bsp/imx-system-manager/imx-system-manager.inc | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | # Set generic compiler for system manager core | 1 | # Set generic compiler for system manager core |
| 2 | INHIBIT_DEFAULT_DEPS = "1" | 2 | INHIBIT_DEFAULT_DEPS = "1" |
| 3 | DEPENDS = "${SM_COMPILER}" | 3 | DEPENDS += "${SM_COMPILER}" |
| 4 | DEPENDS:append:mx943-nxp-bsp = " srecord-native" | 4 | DEPENDS:append:mx943-nxp-bsp = " srecord-native" |
| 5 | SM_COMPILER ?= "gcc-arm-none-eabi-native" | 5 | SM_COMPILER ?= "gcc-arm-none-eabi-native" |
| 6 | PROVIDES += "virtual/imx-system-manager" | 6 | PROVIDES += "virtual/imx-system-manager" |
diff --git a/recipes-graphics/wayland/weston_10.0.5.imx.bb b/recipes-graphics/wayland/weston_10.0.5.imx.bb index e4c7bc4f2..d11401b68 100644 --- a/recipes-graphics/wayland/weston_10.0.5.imx.bb +++ b/recipes-graphics/wayland/weston_10.0.5.imx.bb | |||
| @@ -38,8 +38,11 @@ inherit meson pkgconfig useradd | |||
| 38 | # | 38 | # |
| 39 | require ${THISDIR}/required-distro-features.inc | 39 | require ${THISDIR}/required-distro-features.inc |
| 40 | 40 | ||
| 41 | # Ordering comes from the upstream recipe at the header's Upstream hash. | 41 | # Ordering and placement both come from the upstream recipe at the header's |
| 42 | # nooelint: oelint.var.order.DEPENDS | 42 | # Upstream hash. The '=' discards nothing: meson, pkgconfig and useradd add to |
| 43 | # DEPENDS only through :append/:prepend, which BitBake applies after plain | ||
| 44 | # assignments. UPSTREAM-PARITY. | ||
| 45 | # nooelint: oelint.var.order.DEPENDS,oelint.vars.dependsappend | ||
| 43 | DEPENDS = "cairo gdk-pixbuf glib-2.0 libinput libxkbcommon pango pixman \ | 46 | DEPENDS = "cairo gdk-pixbuf glib-2.0 libinput libxkbcommon pango pixman \ |
| 44 | virtual/egl wayland wayland-native wayland-protocols" | 47 | virtual/egl wayland wayland-native wayland-protocols" |
| 45 | 48 | ||
diff --git a/recipes-graphics/wayland/weston_14.0.2.imx.bb b/recipes-graphics/wayland/weston_14.0.2.imx.bb index 3a3eac700..d4fe5e319 100644 --- a/recipes-graphics/wayland/weston_14.0.2.imx.bb +++ b/recipes-graphics/wayland/weston_14.0.2.imx.bb | |||
| @@ -39,8 +39,11 @@ inherit meson pkgconfig useradd | |||
| 39 | # | 39 | # |
| 40 | require ${THISDIR}/required-distro-features.inc | 40 | require ${THISDIR}/required-distro-features.inc |
| 41 | 41 | ||
| 42 | # Ordering comes from the upstream recipe at the header's Upstream hash. | 42 | # Ordering and placement both come from the upstream recipe at the header's |
| 43 | # nooelint: oelint.var.order.DEPENDS | 43 | # Upstream hash. The '=' discards nothing: meson, pkgconfig and useradd add to |
| 44 | # DEPENDS only through :append/:prepend, which BitBake applies after plain | ||
| 45 | # assignments. UPSTREAM-PARITY. | ||
| 46 | # nooelint: oelint.var.order.DEPENDS,oelint.vars.dependsappend | ||
| 44 | DEPENDS = "cairo gdk-pixbuf glib-2.0 libdisplay-info libinput libxkbcommon \ | 47 | DEPENDS = "cairo gdk-pixbuf glib-2.0 libdisplay-info libinput libxkbcommon \ |
| 45 | pango pixman virtual/egl wayland wayland-native wayland-protocols" | 48 | pango pixman virtual/egl wayland wayland-native wayland-protocols" |
| 46 | 49 | ||
diff --git a/recipes-security/optee-imx/optee-test-fslc.inc b/recipes-security/optee-imx/optee-test-fslc.inc index 1c8030fa0..b907039b8 100644 --- a/recipes-security/optee-imx/optee-test-fslc.inc +++ b/recipes-security/optee-imx/optee-test-fslc.inc | |||
| @@ -12,7 +12,7 @@ inherit python3native ptest | |||
| 12 | inherit deploy | 12 | inherit deploy |
| 13 | require optee-fslc.inc | 13 | require optee-fslc.inc |
| 14 | 14 | ||
| 15 | DEPENDS = "openssl optee-client optee-os-tadevkit python3-cryptography-native" | 15 | DEPENDS += "openssl optee-client optee-os-tadevkit python3-cryptography-native" |
| 16 | DEPENDS:append:toolchain-clang = " lld-native" | 16 | DEPENDS:append:toolchain-clang = " lld-native" |
| 17 | 17 | ||
| 18 | SRC_URI = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https \ | 18 | SRC_URI = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https \ |
diff --git a/recipes-security/optee-qoriq/optee-client.nxp.inc b/recipes-security/optee-qoriq/optee-client.nxp.inc index 7a70d49c2..316e27b3b 100644 --- a/recipes-security/optee-qoriq/optee-client.nxp.inc +++ b/recipes-security/optee-qoriq/optee-client.nxp.inc | |||
| @@ -12,7 +12,7 @@ require recipes-security/optee-imx/optee-client-fslc.inc | |||
| 12 | # nooelint: oelint.vars.outofcontext | 12 | # nooelint: oelint.vars.outofcontext |
| 13 | FILESEXTRAPATHS:prepend := "${THISDIR}/../optee-imx/optee-client:" | 13 | FILESEXTRAPATHS:prepend := "${THISDIR}/../optee-imx/optee-client:" |
| 14 | 14 | ||
| 15 | DEPENDS = "util-linux-libuuid" | 15 | DEPENDS += "util-linux-libuuid" |
| 16 | 16 | ||
| 17 | SRC_URI:remove = "git://github.com/OP-TEE/optee_client.git;branch=master;protocol=https" | 17 | SRC_URI:remove = "git://github.com/OP-TEE/optee_client.git;branch=master;protocol=https" |
| 18 | SRC_URI:prepend = "${OPTEE_CLIENT_SRC};branch=${OPTEE_CLIENT_BRANCH} " | 18 | SRC_URI:prepend = "${OPTEE_CLIENT_SRC};branch=${OPTEE_CLIENT_BRANCH} " |
diff --git a/recipes-security/smw/smw_5.3.bb b/recipes-security/smw/smw_5.3.bb index 1aff9a3cf..583a3ce11 100644 --- a/recipes-security/smw/smw_5.3.bb +++ b/recipes-security/smw/smw_5.3.bb | |||
| @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0 AND BSD-3-Clause AND Zlib" | |||
| 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ff20c8e51b28869d9cdec70a818d163f \ | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ff20c8e51b28869d9cdec70a818d163f \ |
| 10 | file://${PSA_ARCH_TESTS_SRC_PATH}/LICENSE.md;md5=2a944942e1496af1886903d274dedb13" | 10 | file://${PSA_ARCH_TESTS_SRC_PATH}/LICENSE.md;md5=2a944942e1496af1886903d274dedb13" |
| 11 | 11 | ||
| 12 | DEPENDS = "\ | 12 | DEPENDS += "\ |
| 13 | json-c \ | 13 | json-c \ |
| 14 | optee-client \ | 14 | optee-client \ |
| 15 | optee-os-tadevkit \ | 15 | optee-os-tadevkit \ |
