summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Jorns <ejo@pengutronix.de>2020-07-08 07:58:05 +0200
committerEnrico Jorns <ejo@pengutronix.de>2020-07-08 09:25:22 +0200
commit70042229467a71cc07fb39c7ed14c63045066391 (patch)
tree57f25c62888c9e52055e78ae94c12494b7ec92bf
parent41f58aad39cce0691063770a2ad1540b789552f9 (diff)
downloadmeta-ptx-70042229467a71cc07fb39c7ed14c63045066391.tar.gz
meta-ptx-70042229467a71cc07fb39c7ed14c63045066391.tar.xz
distro/ptx.conf: add 'usrmerge' to default distro features
Use the usrmerge DISTRO feature to get rid of historical separations of /bin and /usr/bin (/lib and /usr/lib, etc.). Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
-rw-r--r--conf/distro/ptx.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/distro/ptx.conf b/conf/distro/ptx.conf
index 906ec04..4629f8e 100644
--- a/conf/distro/ptx.conf
+++ b/conf/distro/ptx.conf
@@ -12,7 +12,7 @@ LOCALCONF_VERSION = "1"
DISTRO_VERSION[vardepsexclude] = "DATE"
SDK_VERSION[vardepsexclude] = "DATE"
# Override these in ptx based distros
-PTX_DEFAULT_DISTRO_FEATURES = "argp ext2 largefile usbgadget usbhost wifi xattr nfs zeroconf multiarch systemd"
+PTX_DEFAULT_DISTRO_FEATURES = "argp ext2 largefile usbgadget usbhost wifi xattr nfs zeroconf multiarch systemd usrmerge"
PTX_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot ptx-profile"
PTX_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"