Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/baselayout:master commit in: lib.Linux/sysctl.d/, /, etc.Linux/sysctl.d/
Date: Sat, 25 Sep 2021 19:01:43
Message-Id: 1632596382.084c51c67b07562ff0cf0df0774dfaf5978dcffd.williamh@gentoo
1 commit: 084c51c67b07562ff0cf0df0774dfaf5978dcffd
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 25 18:28:36 2021 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 25 18:59:42 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/baselayout.git/commit/?id=084c51c6
7
8 move 00protected-links.conf to /usr/lib/sysctl.d
9
10 Bug: https://bugs.gentoo.org/814664
11 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
12
13 Makefile | 3 ++-
14 {etc.Linux => lib.Linux}/sysctl.d/00protected-links.conf | 0
15 2 files changed, 2 insertions(+), 1 deletion(-)
16
17 diff --git a/Makefile b/Makefile
18 index 8d74853e..5bd10b91 100644
19 --- a/Makefile
20 +++ b/Makefile
21 @@ -64,9 +64,10 @@ install:
22 $(INSTALL_DIR) $(DESTDIR)/etc
23 cp -pPR etc/* etc.$(OS)/* $(DESTDIR)/etc/
24 echo "Gentoo Base System release ${PV}" > ${DESTDIR}/etc/gentoo-release
25 + $(INSTALL_DIR) $(DESTDIR)/usr/lib
26 + cp -pPR lib.$(OS)/* $(DESTDIR)/usr/lib/
27 $(INSTALL_DIR) $(DESTDIR)/usr/share/baselayout
28 cp -pPR share.$(OS)/* $(DESTDIR)/usr/share/baselayout/
29 - $(INSTALL_DIR) $(DESTDIR)/usr/lib
30 ./make_os_release $(OS) $(PV) > $(DESTDIR)/usr/lib/os-release
31 ln -snf ../usr/lib/os-release ${DESTDIR}/etc/os-release
32
33
34 diff --git a/etc.Linux/sysctl.d/00protected-links.conf b/lib.Linux/sysctl.d/00protected-links.conf
35 similarity index 100%
36 rename from etc.Linux/sysctl.d/00protected-links.conf
37 rename to lib.Linux/sysctl.d/00protected-links.conf