diff options
| -rw-r--r-- | qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend | 2 | ||||
| -rw-r--r-- | recipes-bsp/alsa-state/alsa-state.bbappend | 2 | ||||
| -rw-r--r-- | recipes-bsp/imx-atf/imx-atf_%.bbappend | 12 | ||||
| -rw-r--r-- | recipes-graphics/drm/libdrm_2.4.102.imx.bbappend | 2 | ||||
| -rw-r--r-- | recipes-graphics/wayland/weston-init.bbappend | 2 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-imx-headers_5.4%.bbappend | 10 |
6 files changed, 15 insertions, 15 deletions
diff --git a/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend b/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend index 61956c0..1bbe9c5 100644 --- a/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend +++ b/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland x11', 'xcomposite-egl xcomposite-glx', '', d)}"
\ No newline at end of file +PACKAGECONFIG_remove_tdx = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland x11', 'xcomposite-egl xcomposite-glx', '', d)}" diff --git a/recipes-bsp/alsa-state/alsa-state.bbappend b/recipes-bsp/alsa-state/alsa-state.bbappend index 05bfa70..51f5749 100644 --- a/recipes-bsp/alsa-state/alsa-state.bbappend +++ b/recipes-bsp/alsa-state/alsa-state.bbappend @@ -1,4 +1,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/alsa-state/:" #make this machine specific, as we have different codecs with different settings -PACKAGE_ARCH = "${MACHINE_ARCH}" +PACKAGE_ARCH_tdx = "${MACHINE_ARCH}" diff --git a/recipes-bsp/imx-atf/imx-atf_%.bbappend b/recipes-bsp/imx-atf/imx-atf_%.bbappend index b8e6649..9fb70f7 100644 --- a/recipes-bsp/imx-atf/imx-atf_%.bbappend +++ b/recipes-bsp/imx-atf/imx-atf_%.bbappend @@ -1,10 +1,10 @@ -PV = "2.2+git${SRCPV}" -SRCBRANCH = "toradex_imx_5.4.70_2.3.0" -SRCREV = "835a8f67b2ca7aa3f2d05d6e6a1a51f7e1147266" -SRCREV_use-head-next = "${AUTOREV}" -SRC_URI = "git://git.toradex.com/imx-atf.git;protocol=https;branch=${SRCBRANCH}" +PV_tdx = "2.2+git${SRCPV}" +SRCBRANCH_tdx = "toradex_imx_5.4.70_2.3.0" +SRCREV_tdx = "835a8f67b2ca7aa3f2d05d6e6a1a51f7e1147266" +SRCREV_use-head-next_tdx = "${AUTOREV}" +SRC_URI_tdx = "git://git.toradex.com/imx-atf.git;protocol=https;branch=${SRCBRANCH}" -EXTRA_OEMAKE_append = " \ +EXTRA_OEMAKE_append_tdx = " \ BUILD_STRING="${SRCBRANCH}-g${@'${SRCPV}'.replace('AUTOINC+', '')}" \ " EXTRA_OEMAKE_append_verdin-imx8mm = " \ diff --git a/recipes-graphics/drm/libdrm_2.4.102.imx.bbappend b/recipes-graphics/drm/libdrm_2.4.102.imx.bbappend index 0589710..688a02f 100644 --- a/recipes-graphics/drm/libdrm_2.4.102.imx.bbappend +++ b/recipes-graphics/drm/libdrm_2.4.102.imx.bbappend @@ -1 +1 @@ -RDEPENDS_${PN}_append_imxgpu = " ${PN}-etnaviv ${PN}-vivante" +RDEPENDS_${PN}_append_imxgpu_tdx = " ${PN}-etnaviv ${PN}-vivante" diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend index d5f911a..5de9d50 100644 --- a/recipes-graphics/wayland/weston-init.bbappend +++ b/recipes-graphics/wayland/weston-init.bbappend @@ -51,7 +51,7 @@ do_install_append_upstream_colibri-imx7-emmc() { # openembedded-core commit 4efdcc1090 ("weston: Use systemd notify,") # forces systemd-notify which in our setup does not work. Uncomment the # relevant lines for now. -do_install_append() { +do_install_append_tdx() { sed -i 's/\(Type=notify\)/# \1/' ${D}${systemd_system_unitdir}/weston@.service sed -i 's/\(NotifyAccess=all\)/# \1/' ${D}${systemd_system_unitdir}/weston@.service } diff --git a/recipes-kernel/linux/linux-imx-headers_5.4%.bbappend b/recipes-kernel/linux/linux-imx-headers_5.4%.bbappend index 8cda03c..6f85f34 100644 --- a/recipes-kernel/linux/linux-imx-headers_5.4%.bbappend +++ b/recipes-kernel/linux/linux-imx-headers_5.4%.bbappend @@ -1,6 +1,6 @@ -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -SRCBRANCH = "toradex_5.4-2.1.x-imx" -LOCALVERSION = "-2.3.2" -SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=https;branch=${SRCBRANCH}" +LIC_FILES_CHKSUM_tdx = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +SRCBRANCH_tdx = "toradex_5.4-2.1.x-imx" +LOCALVERSION_tdx = "-2.3.2" +SRC_URI_tdx = "git://git.toradex.com/linux-toradex.git;protocol=https;branch=${SRCBRANCH}" # Keep that one stable, i.e. use the exact git hash from the NXP BSP. -SRCREV = "dea2fede7e024ee7029b13e8d82a00ec14427777" +SRCREV_tdx = "dea2fede7e024ee7029b13e8d82a00ec14427777" |