From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0875A1382C5 for ; Thu, 22 Feb 2018 17:54:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66065E08A2; Thu, 22 Feb 2018 17:54:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44F7AE08A2 for ; Thu, 22 Feb 2018 17:54:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 34F53335C0C for ; Thu, 22 Feb 2018 17:54:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7623C21D for ; Thu, 22 Feb 2018 17:54:01 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1519321933.bc596e56ff93ca121317a12d7033c5a5f5440046.williamh@gentoo> Subject: [gentoo-commits] proj/baselayout:master commit in: / X-VCS-Repository: proj/baselayout X-VCS-Files: Makefile X-VCS-Directories: / X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: bc596e56ff93ca121317a12d7033c5a5f5440046 X-VCS-Branch: master Date: Thu, 22 Feb 2018 17:54:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 63ebb135-737b-4373-bd21-114accd3df92 X-Archives-Hash: 3ee99f31da359fbb53f97f78c2ebe106 commit: bc596e56ff93ca121317a12d7033c5a5f5440046 Author: William Hubbs gentoo org> AuthorDate: Thu Feb 22 17:46:27 2018 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Feb 22 17:52:13 2018 +0000 URL: https://gitweb.gentoo.org/proj/baselayout.git/commit/?id=bc596e56 Fix installation of .keep files This partially reverts commit c4887e88316e2176dc99c173ccc6af825c10f745. We need these .keep files. Makefile | 4 ++++ 1 file changed, 4 insertions(+) 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