commit: bc22069d1a41eeec6e22ba9bf391412a0244f5a7 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Jan 28 01:59:03 2023 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> 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 <floppym <AT> 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
