Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/baselayout:master commit in: /
Date: Tue, 06 Feb 2018 22:54:45
Message-Id: 1517957595.c4887e88316e2176dc99c173ccc6af825c10f745.williamh@gentoo
1 commit: c4887e88316e2176dc99c173ccc6af825c10f745
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 6 22:53:15 2018 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 6 22:53:15 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/baselayout.git/commit/?id=c4887e88
7
8 Do not install .keep files
9
10 Makefile | 5 -----
11 1 file changed, 5 deletions(-)
12
13 diff --git a/Makefile b/Makefile
14 index 966e71ac..35bdb627 100644
15 --- a/Makefile
16 +++ b/Makefile
17 @@ -65,9 +65,7 @@ install:
18 layout-dirs:
19 # Create base filesytem layout
20 for x in $(KEEP_DIRS) ; do \
21 - test -e $(DESTDIR)$$x/.keep && continue ; \
22 $(INSTALL_DIR) $(DESTDIR)$$x || exit $$? ; \
23 - touch $(DESTDIR)$$x/.keep || echo "ignoring touch failure; mounted fs?" ; \
24 done
25
26 layout-BSD: layout-dirs
27 @@ -82,11 +80,8 @@ layout-Linux: layout-dirs
28 layout: layout-dirs layout-$(OS)
29 # Special dirs
30 install -m 0700 -d $(DESTDIR)/root
31 - touch $(DESTDIR)/root/.keep
32 install -m 1777 -d $(DESTDIR)/var/tmp
33 - touch $(DESTDIR)/var/tmp/.keep
34 install -m 1777 -d $(DESTDIR)/tmp
35 - touch $(DESTDIR)/tmp/.keep
36 # FHS compatibility symlinks stuff
37 ln -snf /var/tmp $(DESTDIR)/usr/tmp