base-files: add support for merged /usr and reduce installed dir list for Gluon

1 files changed, 29 insertions, 0 deletions

diff --git a/recipes-core/base-files/base-files_%.bbappend b/recipes-core/base-files/base-files_%.bbappend
new file mode 100644
index 0000000..407658d
--- /dev/null
+++ b/recipes-core/base-files/base-files_%.bbappend
@@ -0,0 +1,29 @@
+dirs755_gluon = "${base_bindir} /boot /dev ${sysconfdir} ${sysconfdir}/default \
+                 ${sysconfdir}/skel ${base_libdir} /mnt /proc ${ROOT_HOME} /run ${base_sbindir} \
+                 ${prefix} ${bindir}  ${docdir} \
+                 ${libdir} ${sbindir} ${datadir} \
+                 ${datadir}/common-licenses \
+                 ${localstatedir} \
+                 ${localstatedir}/backups ${localstatedir}/lib \
+                 /sys ${localstatedir}/lib/misc ${localstatedir}/spool \
+                 ${localstatedir}/volatile \
+                 ${localstatedir}/volatile/log \
+                 /home ${localstatedir}/local"
+
+do_install_append_merged-usr () {
+	if [ "${base_bindir}" != "/bin" ]; then
+		ln -snf "${@d.getVar('base_bindir', True)[1:]}" ${D}/bin
+	fi
+
+	if [ "${base_sbindir}" != "/sbin"  ]; then
+		ln -snf "${@d.getVar('base_sbindir', True)[1:]}" ${D}/sbin
+	fi
+
+	if [ "${base_libdir}" != "/lib" ]; then
+		ln -snf "${@d.getVar('base_libdir', True)[1:]}" ${D}/lib
+	fi
+
+	if [ "${bindir}" = "${exec_prefix}/bin" -a "${sbindir}" = "${exec_prefix}/bin" ]; then
+		ln -snf bin ${D}/usr/sbin
+	fi
+}