[gentoo-commits] proj/baselayout:master commit in: /

[William Hubbs]

commit:     47686e5e438c57cd7ffc94b2d7f15abc03146442
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue May 11 15:46:33 2021 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue May 11 15:46:33 2021 +0000
URL:        https://gitweb.gentoo.org/proj/baselayout.git/commit/?id=47686e5e

create bin and sbin directories

Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 Makefile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c0d7283e..0913ceb6 100644
--- a/Makefile
+++ b/Makefile
@@ -33,16 +33,20 @@ KEEP_DIRS-Linux += \
        /sys \
        /usr/src
 KEEP_DIRS = $(KEEP_DIRS-$(OS)) \
+       /bin \
        /boot \
        /etc/profile.d \
        /home \
        /media \
        /mnt \
-       /proc \
        /opt \
+       /proc \
        /root \
+       /sbin \
+       /usr/bin \
        /usr/local/bin \
        /usr/local/sbin \
+       /usr/sbin \
        /var/cache \
        /var/empty \
        /var/lib \
@@ -92,6 +96,9 @@ layout: layout-dirs layout-$(OS)
 
 layout-usrmerge: layout
 ifeq ($(OS),Linux)
+       rm -fr ${DESTDIR}/bin
+       rm -fr ${DESTDIR}/sbin
+       rm -fr ${DESTDIR}/usr/sbin
        ln -snf usr/bin ${DESTDIR}/bin
        ln -snf usr/sbin ${DESTDIR}/sbin
        ln -snf bin ${DESTDIR}/usr/sbin