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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 850B815800F for ; Sat, 28 Jan 2023 02:08:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C29D4E08ED; Sat, 28 Jan 2023 02:08:13 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 84C2CE08ED for ; Sat, 28 Jan 2023 02:08:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48C0434111B for ; Sat, 28 Jan 2023 02:08:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E7F585B for ; Sat, 28 Jan 2023 02:08:10 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1674871506.bc22069d1a41eeec6e22ba9bf391412a0244f5a7.floppym@gentoo> Subject: [gentoo-commits] proj/baselayout:master commit in: / X-VCS-Repository: proj/baselayout X-VCS-Files: Makefile X-VCS-Directories: / X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: bc22069d1a41eeec6e22ba9bf391412a0244f5a7 X-VCS-Branch: master Date: Sat, 28 Jan 2023 02:08:10 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1c9f352a-038b-44b5-8b05-5997c88e6541 X-Archives-Hash: 1e5da2b51c1833ef68cbb8cafc03ee6a commit: bc22069d1a41eeec6e22ba9bf391412a0244f5a7 Author: Mike Gilbert gentoo org> AuthorDate: Sat Jan 28 01:59:03 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Jan 28 02:05:06 2023 +0000 URL: https://gitweb.gentoo.org/proj/baselayout.git/commit/?id=bc22069d Move /var/run and /var/lock back to the layout target We need to ensure packages do not install things here and come up with a better migration plan. Bug: https://bugs.gentoo.org/648880 Bug: https://bugs.gentoo.org/892267 Signed-off-by: Mike Gilbert gentoo.org> Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index fb79cae9..3c8071c3 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ # It also has the added bonus of being easier to install on systems # without an ebuild style package manager. -PV = 2.11 +PV = 2.13 PKG = baselayout-$(PV) DISTFILE = $(PKG).tar.bz2 @@ -60,17 +60,15 @@ install: ./make_os_release ${PV} > $(DESTDIR)/usr/lib/os-release $(INSTALL_DIR) $(DESTDIR)/usr/share/baselayout cp -pPR share/* $(DESTDIR)/usr/share/baselayout/ - # FHS compatibility symlinks ln -snf ../proc/self/mounts $(DESTDIR)/etc/mtab - $(INSTALL_DIR) $(DESTDIR)/var - ln -snf ../run $(DESTDIR)/var/run - ln -snf ../run/lock $(DESTDIR)/var/lock layout: # Create base filesytem layout for x in $(KEEP_DIRS) ; do \ $(INSTALL_DIR) $(DESTDIR)$$x ; \ done + ln -snf ../run $(DESTDIR)/var/run + ln -snf ../run/lock $(DESTDIR)/var/lock # Special dirs chmod 0700 $(DESTDIR)/root chmod 1777 $(DESTDIR)/var/tmp