aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2022-12-30 07:09:43 +0000
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-01-03 15:38:21 +0000
commita8195508925381103f15a37c0b48cbe60e35755e (patch)
treec61cf76b91fc1b967fcb2a9e4659098d534d538b
parent520c668384a407150b14aad19a82f9a9ffb044c2 (diff)
Revert "toradex: fix broken recipes"
This reverts commit 980617cac660b055d8a7278d1817dbb20a6d9753. All recipes have been fixed in upstream layer. Change-Id: I42447aa8a7fc348343e966b8dd3b459308c79604 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 039be2cddaf83baece0dd00888a83fa81ea6797b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--meta-boot2qt-distro/conf/distro/include/toradex.inc6
-rw-r--r--meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-core/util-linux/util-linux_%.bbappend1
-rw-r--r--meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-devtools/mtd/mtd-utils_%.bbappend1
3 files changed, 0 insertions, 8 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc
index ed284025..c6d0d282 100644
--- a/meta-boot2qt-distro/conf/distro/include/toradex.inc
+++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc
@@ -68,9 +68,3 @@ DRI_DEVICE:verdin-imx8mp = "card0"
# remove support for 256MB version colibri-imx6ull in tezi image, since image will be too large for it.
TORADEX_PRODUCT_IDS:remove:colibri-imx6ull = "0036"
-
-# fix u-boot build
-UBOOT_SUFFIX:colibri-imx6ull = "img"
-
-# fix tezi build
-TAR_IMAGE_ROOTFS:task-image-bootfs = "${WORKDIR}/bootfs"
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-core/util-linux/util-linux_%.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-core/util-linux/util-linux_%.bbappend
deleted file mode 100644
index 3ce340eb..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-core/util-linux/util-linux_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-SRC_URI:append = " file://fstrim.service file://fstrim.timer"
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-devtools/mtd/mtd-utils_%.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-devtools/mtd/mtd-utils_%.bbappend
deleted file mode 100644
index 811b7700..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-devtools/mtd/mtd-utils_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-SRC_URI:append = " file://ubihealthd.service"