From 9400ee43d6b14fbea12a82a047056c8581ec9d70 Mon Sep 17 00:00:00 2001
From: Ming Liu <ming.liu@toradex.com>
Date: Thu, 24 Feb 2022 12:04:07 +0100
Subject: meta: use tdx overrides for Toradex specific changes

Toradex NXP layer could be used by other external projects, so we
should make sure Toradex specific changes dont impact them.

Use 'tdx' overrides to ensure Toradex specific changes only valid for
Toradex distros.

Related-to: ELB-3046

Signed-off-by: Ming Liu <ming.liu@toradex.com>
---
 recipes-core/systemd/systemd-conf_%.bbappend    | 2 +-
 recipes-core/systemd/systemd_%.bbappend         | 4 ++--
 recipes-core/udev/udev-extraconf_%.bbappend     | 6 +++---
 recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend | 7 ++++---
 recipes-support/libsoc/libsoc_0.8.2.bbappend    | 6 +++---
 recipes-support/rng-tools/rng-tools_%.bbappend  | 2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/recipes-core/systemd/systemd-conf_%.bbappend b/recipes-core/systemd/systemd-conf_%.bbappend
index 77ab59d..0c4792c 100644
--- a/recipes-core/systemd/systemd-conf_%.bbappend
+++ b/recipes-core/systemd/systemd-conf_%.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/systemd-conf:"
+FILESEXTRAPATHS_prepend_tdx := "${THISDIR}/systemd-conf:"
diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend
index ea40849..ec30022 100644
--- a/recipes-core/systemd/systemd_%.bbappend
+++ b/recipes-core/systemd/systemd_%.bbappend
@@ -1,4 +1,4 @@
 # This allows for udevd automounting with mounts accessible to all.
-do_configure_prepend () {
+do_configure_prepend_tdx () {
     sed -i '/PrivateMounts=yes/d' ${S}/units/systemd-udevd.service.in
-}
\ No newline at end of file
+}
diff --git a/recipes-core/udev/udev-extraconf_%.bbappend b/recipes-core/udev/udev-extraconf_%.bbappend
index 7b03d77..49a930b 100644
--- a/recipes-core/udev/udev-extraconf_%.bbappend
+++ b/recipes-core/udev/udev-extraconf_%.bbappend
@@ -1,10 +1,10 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files/:"
 
-SRC_URI_append = " file://hotplug.rules \
-                   file://hotplug.sh \
+SRC_URI_append_tdx = " file://hotplug.rules \
+                       file://hotplug.sh \
 "
 
-do_install_append() {
+do_install_append_tdx () {
     install -d ${D}${sysconfdir}/udev/rules.d
     install -m 0644 ${WORKDIR}/hotplug.rules    ${D}${sysconfdir}/udev/rules.d/hotplug.rules
 
diff --git a/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend b/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend
index f40a663..1281843 100644
--- a/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend
+++ b/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend
@@ -1,9 +1,10 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/e2fsprogs:"
-SRC_URI += "file://e2fsck.conf"
 
-do_install_append() {
+SRC_URI_append_tdx = " file://e2fsck.conf"
+
+do_install_append_tdx () {
     install -d ${D}${sysconfdir}
     install -m 0644 ${WORKDIR}/e2fsck.conf ${D}${sysconfdir}/e2fsck.conf
 }
 
-FILES_e2fsprogs-e2fsck += "${sysconfdir}/e2fsck.conf"
+FILES_e2fsprogs-e2fsck_append_tdx = " ${sysconfdir}/e2fsck.conf"
diff --git a/recipes-support/libsoc/libsoc_0.8.2.bbappend b/recipes-support/libsoc/libsoc_0.8.2.bbappend
index 29e684c..248c7fc 100644
--- a/recipes-support/libsoc/libsoc_0.8.2.bbappend
+++ b/recipes-support/libsoc/libsoc_0.8.2.bbappend
@@ -1,10 +1,10 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/libsoc:"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tdx = "${MACHINE_ARCH}"
 
-SRCREV = "9a97d260379856940a5de9862ef06803de82cca8"
+SRCREV_tdx = "9a97d260379856940a5de9862ef06803de82cca8"
 
-SRC_URI += " \
+SRC_URI_append_tdx = " \
         file://0001-libsoc-use-sane-board-naming.patch \
 "
 
diff --git a/recipes-support/rng-tools/rng-tools_%.bbappend b/recipes-support/rng-tools/rng-tools_%.bbappend
index 9f0b791..3d2eb05 100644
--- a/recipes-support/rng-tools/rng-tools_%.bbappend
+++ b/recipes-support/rng-tools/rng-tools_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_remove = "libjitterentropy"
+PACKAGECONFIG_remove_tdx = "libjitterentropy"
-- 
cgit v1.2.3