summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2018-02-22 11:46:27 -0600
committerWilliam Hubbs <williamh@gentoo.org>2018-02-22 11:52:13 -0600
commitbc596e56ff93ca121317a12d7033c5a5f5440046 (patch)
tree720d6ecac6ea506bf17482308b1d919f15dec1f9
parentMakefile: layout-usrmerge should do nothing on non-Linux systems (diff)
downloadbaselayout-bc596e56ff93ca121317a12d7033c5a5f5440046.tar.gz
baselayout-bc596e56ff93ca121317a12d7033c5a5f5440046.tar.bz2
baselayout-bc596e56ff93ca121317a12d7033c5a5f5440046.zip
Fix installation of .keep files
This partially reverts commit c4887e88316e2176dc99c173ccc6af825c10f745. We need these .keep files.
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index f1b0344d..e1eec2b1 100644
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,7 @@ layout-dirs:
# Create base filesytem layout
for x in $(KEEP_DIRS) ; do \
$(INSTALL_DIR) $(DESTDIR)$$x || exit $$? ; \
+ touch $(DESTDIR)$$x/.keep || exit $$? ; \
done
layout-BSD: layout-dirs
@@ -80,8 +81,11 @@ layout-Linux: layout-dirs
layout: layout-dirs layout-$(OS)
# Special dirs
install -m 0700 -d $(DESTDIR)/root
+ touch $(DESTDIR)/root/.keep
install -m 1777 -d $(DESTDIR)/var/tmp
+ touch $(DESTDIR)/var/tmp/.keep
install -m 1777 -d $(DESTDIR)/tmp
+ touch $(DESTDIR)/tmp/.keep
# FHS compatibility symlinks stuff
ln -snf /var/tmp $(DESTDIR)/usr/tmp