summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2023-08-13 21:32:29 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2023-08-13 22:24:29 +0200
commit98c9cb929abf2704b13c889931ca9098f6ebec8f (patch)
tree5b824541b14701933601ab3be7ea2475a0121b1d
parentf0c34f295661a095677af7c10ac8b5dcac6c14ed (diff)
distro: add feature usrmerge
The systemd recipe now requires this. From https://docs.yoctoproject.org/ref-manual/features.html?highlight=usrmerge usrmerge: Merges the /bin, /sbin, /lib, and /lib64 directories into their respective counterparts in the /usr directory to provide better package and application compatibility. Related-to: ELB-5339 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--conf/distro/include/tdx-base.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/distro/include/tdx-base.inc b/conf/distro/include/tdx-base.inc
index f755e44..c652058 100644
--- a/conf/distro/include/tdx-base.inc
+++ b/conf/distro/include/tdx-base.inc
@@ -70,7 +70,7 @@ IMAGE_LINGUAS ?= "en-us"
# | QA Issue: Package version went backwards which would break package feeds
ERROR_QA:remove = "version-going-backwards"
-DISTRO_FEATURES:append = " pam systemd"
+DISTRO_FEATURES:append = " pam systemd usrmerge"
DISTRO_FEATURES:remove = "sysvinit ptest"
VIRTUAL-RUNTIME_init_manager = "systemd"
PACKAGECONFIG:append:pn-qemu-native = " libusb"