diff options
| author | Ming Liu <ming.liu@toradex.com> | 2022-02-24 12:04:07 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2022-04-03 11:51:38 +0200 |
| commit | 370b2ba3fcc3278cbd31b8bc16dfaf25819f72ae (patch) | |
| tree | 1db0da1ea2d3c68fe18b6288a0814f75a73ac6da | |
| parent | c7448ac8bfa5580f4a54f8e73a421dc056ac5d97 (diff) | |
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>
(cherry picked from commit 9400ee43d6b14fbea12a82a047056c8581ec9d70)
| -rw-r--r-- | recipes-core/systemd/systemd-conf_%.bbappend | 2 | ||||
| -rw-r--r-- | recipes-core/systemd/systemd_%.bbappend | 4 | ||||
| -rw-r--r-- | recipes-core/udev/udev-extraconf_%.bbappend | 6 | ||||
| -rw-r--r-- | recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend | 7 | ||||
| -rw-r--r-- | recipes-support/libsoc/libsoc_0.8.2.bbappend | 6 | ||||
| -rw-r--r-- | 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 fccd438..34e18d6 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 2a022be..5bd3016 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 7820aa2..0a380a8 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 17c021d..0169da9 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 08b32bb..3adb7ae 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 32b4d3e..562c022 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" |