git: 72bf91e25081 - main - libsoft: Remove support for installing libsoft
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 07 Jan 2022 05:46:51 UTC
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=72bf91e25081a1f53b89e43108fa8301ca3d7b0f
commit 72bf91e25081a1f53b89e43108fa8301ca3d7b0f
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-01-07 05:34:10 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2022-01-07 05:34:10 +0000
libsoft: Remove support for installing libsoft
Remove the infrasturcture needed to create the libsoft directories.
Sponsored by: Netflix
---
etc/Makefile | 4 ----
etc/mtree/BSD.libsoft.dist | 14 --------------
etc/mtree/Makefile | 4 ----
3 files changed, 22 deletions(-)
diff --git a/etc/Makefile b/etc/Makefile
index 104e40b6e345..6a93f1cdbad3 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -107,10 +107,6 @@ MTREES= mtree/BSD.root.dist / \
MTREES+= mtree/BSD.lib32.dist /usr
MTREES+= mtree/BSD.lib32.dist /usr/lib/debug/usr
.endif
-.if ${MK_LIBSOFT} != "no"
-MTREES+= mtree/BSD.libsoft.dist /usr
-MTREES+= mtree/BSD.libsoft.dist /usr/lib/debug/usr
-.endif
.if ${MK_TESTS} != "no"
MTREES+= mtree/BSD.tests.dist ${TESTSBASE}
MTREES+= mtree/BSD.tests.dist /usr/lib/debug/${TESTSBASE}
diff --git a/etc/mtree/BSD.libsoft.dist b/etc/mtree/BSD.libsoft.dist
deleted file mode 100644
index 69026a73f932..000000000000
--- a/etc/mtree/BSD.libsoft.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-#
-# Please see the file src/etc/mtree/README before making changes to this file.
-#
-
-/set type=dir uname=root gname=wheel mode=0755
-.
- libsoft
- dtrace
- ..
- i18n
- ..
- ..
-..
diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile
index 22882b8826d6..5dfefc9d5c21 100644
--- a/etc/mtree/Makefile
+++ b/etc/mtree/Makefile
@@ -10,7 +10,6 @@ FILES= \
BSD.include.dist \
BSD.root.dist \
${_BSD.lib32.dist} \
- ${_BSD.libsoft.dist} \
${_BSD.sendmail.dist} \
${_BSD.tests.dist} \
BSD.usr.dist \
@@ -19,9 +18,6 @@ FILES= \
.if ${MK_LIB32} != "no"
_BSD.lib32.dist= BSD.lib32.dist
.endif
-.if ${MK_LIBSOFT} != "no"
-_BSD.libsoft.dist= BSD.libsoft.dist
-.endif
.if ${MK_SENDMAIL} != "no"
_BSD.sendmail.dist= BSD.sendmail.dist
.endif