diff --git a/Makefile.inc1 b/Makefile.inc1 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1076,8 +1076,7 @@ ${_+_}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 \ @@ -3316,7 +3315,6 @@ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ -V OLD_LIBS -V MOVED_LIBS -V "OLD_LIBS:Mlib/*:S,^lib,usr/lib32," \ -V "OLD_LIBS:Musr/lib/*:S,^usr/lib,usr/lib32," \ - -V "OLD_LIBS:Mlib/casper/*:S,^lib/casper,usr/lib32," | \ sed -E 's/[[:space:]]+/\n/g' | sort delete-old-libs: .PHONY diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,17 @@ # xargs -n1 | sort | uniq -d; # done +# 2023xxxx: 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 + # 20230320: vcount.9 removed OLD_FILES+=usr/share/man/man9/count_dev.9.gz OLD_FILES+=usr/share/man/man9/vcount.9.gz diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist --- 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 --- 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 diff --git a/lib/libcasper/services/cap_fileargs/Makefile b/lib/libcasper/services/cap_fileargs/Makefile --- 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 diff --git a/lib/libcasper/services/cap_grp/Makefile b/lib/libcasper/services/cap_grp/Makefile --- 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 diff --git a/lib/libcasper/services/cap_net/Makefile b/lib/libcasper/services/cap_net/Makefile --- 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 diff --git a/lib/libcasper/services/cap_netdb/Makefile b/lib/libcasper/services/cap_netdb/Makefile --- 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 diff --git a/lib/libcasper/services/cap_pwd/Makefile b/lib/libcasper/services/cap_pwd/Makefile --- 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 diff --git a/lib/libcasper/services/cap_sysctl/Makefile b/lib/libcasper/services/cap_sysctl/Makefile --- 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 diff --git a/lib/libcasper/services/cap_syslog/Makefile b/lib/libcasper/services/cap_syslog/Makefile --- 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 diff --git a/libexec/rtld-elf/rtld_paths.h b/libexec/rtld-elf/rtld_paths.h --- 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 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -354,7 +354,6 @@ # 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 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -855,14 +855,14 @@ .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