git: 7d8e1e8dd904 - main - libcasper: Move helper libraries from /lib/casper to /lib.

Reply: Yuri : "Re: git: 7d8e1e8dd904 - main - libcasper: Move helper libraries from /lib/casper to /lib."
Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: John Baldwin <jhb_at_FreeBSD.org>
Date: Wed, 29 Mar 2023 22:07:14 UTC
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=7d8e1e8dd9042f802a67adefabd28fcd9b1e4051

commit 7d8e1e8dd9042f802a67adefabd28fcd9b1e4051
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-03-29 22:04:28 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-03-29 22:04:28 +0000

    libcasper: Move helper libraries from /lib/casper to /lib.
    
    These libraries are linked to directly by applications rather than
    opened at runtime via dlopen().
    
    Discussed with: oshogbo
    Reviewed by:    markj, emaste
    Differential Revision:  https://reviews.freebsd.org/D39245
---
 Makefile.inc1                                |  3 +--
 ObsoleteFiles.inc                            | 11 +++++++++++
 etc/mtree/BSD.root.dist                      |  2 --
 lib/libcasper/services/cap_dns/Makefile      |  2 +-
 lib/libcasper/services/cap_fileargs/Makefile |  2 +-
 lib/libcasper/services/cap_grp/Makefile      |  2 +-
 lib/libcasper/services/cap_net/Makefile      |  2 +-
 lib/libcasper/services/cap_netdb/Makefile    |  2 +-
 lib/libcasper/services/cap_pwd/Makefile      |  2 +-
 lib/libcasper/services/cap_sysctl/Makefile   |  2 +-
 lib/libcasper/services/cap_syslog/Makefile   |  2 +-
 libexec/rtld-elf/rtld_paths.h                |  2 +-
 tools/build/Makefile                         |  1 -
 tools/build/mk/OptionalObsoleteFiles.inc     | 16 ++++++++--------
 14 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 63c3ce80f54d..471267b3435f 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1076,8 +1076,7 @@ _bootstrap-tools:
 	${_+_}cd ${.CURDIR}; ${BMAKE} _NO_INCLUDE_COMPILERMK=t _cleanobj_fast_depend_hack
 .endif
 	${_+_}cd ${.CURDIR}; ${BMAKE} bootstrap-tools
-	mkdir -p ${WORLDTMP}/usr ${WORLDTMP}/lib/casper ${WORLDTMP}/lib/geom \
-	    ${WORLDTMP}/bin
+	mkdir -p ${WORLDTMP}/usr ${WORLDTMP}/lib/geom ${WORLDTMP}/bin
 	${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${WORLDTMP}/usr >/dev/null
 	${WORLDTMP_MTREE} -f ${.CURDIR}/etc/mtree/BSD.include.dist \
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 72b119c1c85b..f526d0f7458a 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -52,6 +52,17 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20230329: libcasper libraries moved to /lib
+MOVED_LIBS+=lib/casper/libcap_dns.so.2
+MOVED_LIBS+=lib/casper/libcap_fileargs.so.1
+MOVED_LIBS+=lib/casper/libcap_grp.so.1
+MOVED_LIBS+=lib/casper/libcap_net.so.1
+MOVED_LIBS+=lib/casper/libcap_pwd.so.1
+MOVED_LIBS+=lib/casper/libcap_sysctl.so.1
+MOVED_LIBS+=lib/casper/libcap_sysctl.so.2
+MOVED_LIBS+=lib/casper/libcap_syslog.so.1
+OLD_DIRS+=lib/casper
+
 # 20230324: libvmmapi shlib version bumped to 6
 OLD_LIBS+=usr/lib/libvmmapi.so.5
 
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 5ee5da8ee149..3a3a3a78d995 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -104,8 +104,6 @@
         ..
     ..
     lib
-        casper
-        ..
         geom
         ..
         nvmecontrol
diff --git a/lib/libcasper/services/cap_dns/Makefile b/lib/libcasper/services/cap_dns/Makefile
index b59b329d0653..dbeebcd19dfa 100644
--- a/lib/libcasper/services/cap_dns/Makefile
+++ b/lib/libcasper/services/cap_dns/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIBDIR?=	/lib/casper
+SHLIBDIR?=	/lib
 
 .include <src.opts.mk>
 
diff --git a/lib/libcasper/services/cap_fileargs/Makefile b/lib/libcasper/services/cap_fileargs/Makefile
index 22230f82d9f4..2369f58cc2bb 100644
--- a/lib/libcasper/services/cap_fileargs/Makefile
+++ b/lib/libcasper/services/cap_fileargs/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIBDIR?=	/lib/casper
+SHLIBDIR?=	/lib
 
 .include <src.opts.mk>
 
diff --git a/lib/libcasper/services/cap_grp/Makefile b/lib/libcasper/services/cap_grp/Makefile
index 83e24fcc8e76..1250832bcd2d 100644
--- a/lib/libcasper/services/cap_grp/Makefile
+++ b/lib/libcasper/services/cap_grp/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIBDIR?=	/lib/casper
+SHLIBDIR?=	/lib
 
 .include <src.opts.mk>
 
diff --git a/lib/libcasper/services/cap_net/Makefile b/lib/libcasper/services/cap_net/Makefile
index 70acac1cc9ad..a1528b40c2a6 100644
--- a/lib/libcasper/services/cap_net/Makefile
+++ b/lib/libcasper/services/cap_net/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIBDIR?=	/lib/casper
+SHLIBDIR?=	/lib
 
 .include <src.opts.mk>
 
diff --git a/lib/libcasper/services/cap_netdb/Makefile b/lib/libcasper/services/cap_netdb/Makefile
index 5070976d2e25..fdec72ec4ada 100644
--- a/lib/libcasper/services/cap_netdb/Makefile
+++ b/lib/libcasper/services/cap_netdb/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIBDIR?=	/lib/casper
+SHLIBDIR?=	/lib
 
 .include <src.opts.mk>
 
diff --git a/lib/libcasper/services/cap_pwd/Makefile b/lib/libcasper/services/cap_pwd/Makefile
index d5e6e9576854..203ea806a215 100644
--- a/lib/libcasper/services/cap_pwd/Makefile
+++ b/lib/libcasper/services/cap_pwd/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIBDIR?=	/lib/casper
+SHLIBDIR?=	/lib
 
 .include <src.opts.mk>
 
diff --git a/lib/libcasper/services/cap_sysctl/Makefile b/lib/libcasper/services/cap_sysctl/Makefile
index afb7b4374370..30bec927f29b 100644
--- a/lib/libcasper/services/cap_sysctl/Makefile
+++ b/lib/libcasper/services/cap_sysctl/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIBDIR?=	/lib/casper
+SHLIBDIR?=	/lib
 
 .include <src.opts.mk>
 
diff --git a/lib/libcasper/services/cap_syslog/Makefile b/lib/libcasper/services/cap_syslog/Makefile
index a6b4af5640d6..a3e4603e8ace 100644
--- a/lib/libcasper/services/cap_syslog/Makefile
+++ b/lib/libcasper/services/cap_syslog/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIBDIR?=	/lib/casper
+SHLIBDIR?=	/lib
 
 .include <src.opts.mk>
 
diff --git a/libexec/rtld-elf/rtld_paths.h b/libexec/rtld-elf/rtld_paths.h
index c051db7b580f..759a610e6469 100644
--- a/libexec/rtld-elf/rtld_paths.h
+++ b/libexec/rtld-elf/rtld_paths.h
@@ -69,7 +69,7 @@
 #endif
 
 #ifndef STANDARD_LIBRARY_PATH
-#define	STANDARD_LIBRARY_PATH	"/lib/casper:/lib:/usr/lib"
+#define	STANDARD_LIBRARY_PATH	"/lib:/usr/lib"
 #endif
 
 #ifndef LD_
diff --git a/tools/build/Makefile b/tools/build/Makefile
index 71a38534f7ac..97e0bfe8f4f7 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -354,7 +354,6 @@ host-symlinks:
 # yet (this happens if we are crossbuilding from Linux/Mac).
 INSTALLDIR_LIST= \
 	bin \
-	lib/casper \
 	lib/geom \
 	usr/include/casper \
 	usr/include/private/ucl \
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index f3bb91ae6ff9..ac7109609dd4 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -855,14 +855,14 @@ OLD_DIRS+=usr/tests/usr.bin/calendar
 
 .if ${MK_CASPER} == no
 OLD_LIBS+=lib/libcasper.so.1
-OLD_LIBS+=lib/casper/libcap_dns.so.2
-OLD_LIBS+=lib/casper/libcap_fileargs.so.1
-OLD_LIBS+=lib/casper/libcap_grp.so.1
-OLD_LIBS+=lib/casper/libcap_net.so.1
-OLD_LIBS+=lib/casper/libcap_pwd.so.1
-OLD_LIBS+=lib/casper/libcap_sysctl.so.1
-OLD_LIBS+=lib/casper/libcap_sysctl.so.2
-OLD_LIBS+=lib/casper/libcap_syslog.so.1
+OLD_LIBS+=lib/libcap_dns.so.2
+OLD_LIBS+=lib/libcap_fileargs.so.1
+OLD_LIBS+=lib/libcap_grp.so.1
+OLD_LIBS+=lib/libcap_net.so.1
+OLD_LIBS+=lib/libcap_pwd.so.1
+OLD_LIBS+=lib/libcap_sysctl.so.1
+OLD_LIBS+=lib/libcap_sysctl.so.2
+OLD_LIBS+=lib/libcap_syslog.so.1
 .endif
 
 .if ${MK_CCD} == no