From nobody Wed Mar 29 22:07:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pn0yp6Ttzz41xF8; Wed, 29 Mar 2023 22:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pn0yp5x5xz3xRl; Wed, 29 Mar 2023 22:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680127634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h5mFQxnpBO2wnKyUWsCab4yYVbY1iHq5+Ii/tBTpVyc=; b=sqyHVhY2v7/UF2k5JogFl+MAVMof3md/bUM+H9xoRnf1EfU3582rEY1nOxRJ8Y+v8Eamym AGZeS970sFXGOfUVIMBQ+ocW6W4SXVjn6mGUWg2NGAhpyTzAWc1DezcGJJlaozK0Zvc26h 9I4YTCEPtOf6AVP86jgLkJ1GzB57Q0eHj/RdHu9eqpdwwH4t6u0FhVSrO8ruP4l3snBQz1 66spfiQX2JJQifKyYY4Q/RcOQs9rNWoQrnms8DKATJe+r3TcZK9jzVBfu2PcEpV+lcXqAS EAEt0uGbyusfNYUibFQjvrPmOnt2+WwMIvvFBtJZKb0aVxO4w8aE2cb9iJibPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680127634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h5mFQxnpBO2wnKyUWsCab4yYVbY1iHq5+Ii/tBTpVyc=; b=FP97DcimIrdsxA81yRlV7toyW2rv7pYAUMmrgs/CNFxls0fHtT+K4Wqa/PlzS49NskpK3b iuOd7+NeLcGj7nDBZ8ac7NHGBZKwDWaupq+Udn/pOcSCH8CC+mzx12aI6tKy5BdiDwgBNC Y4C8Gy/Q/ltwhQ3hDTiwWMs8Q5Rx6bUQmA4PZRO9HU/vbSh/Quyi0S5DS2QYxTPx2WyDrz zZE8BBc0Y509mP1keQTsvOef89LBMMBZSSOvWBROZvgrUY8Wi/hgGS6mdwwhlXYjRQzhJh +nSJT4LfsVkf2SjXTxm7p3KgVJCIkgS4rJ+MIaLUAen6Mn6vXMh3ZjaaxCNJzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680127634; a=rsa-sha256; cv=none; b=i2PInXdIoB0qoJ2ReC2yxqMmWrB2vDGqrDbUjpzgnLxp2clS6hALh8Nz0u83OLam9+Jycu LBqt6V3VzJWla1FYu5WCS4X2RjfXxbbuhCV0yXRj8uriI40Ow5X8Bb/cUEgao+h+aOPuB6 5BQic0ro+eeiet8pGpbBSVuW01G7lMbsfzOlgJL7hUK+1mzW5oxyeDieKM3TLOsuYEKbeF d1/RfvOUF072vcleHQotl/L4nbWT+aB/Hodhgs7zrE6wIWmsafSwMe3omQIdKNC30j1i2T ODlZJMYBREOThsp+EWM0uXeu11aabagEcl0lfGNZWsHOiGjd4kLclI7y9kzqiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pn0yp526zzn2Q; Wed, 29 Mar 2023 22:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32TM7EtG050653; Wed, 29 Mar 2023 22:07:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TM7Emk050652; Wed, 29 Mar 2023 22:07:14 GMT (envelope-from git) Date: Wed, 29 Mar 2023 22:07:14 GMT Message-Id: <202303292207.32TM7Emk050652@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 7d8e1e8dd904 - main - libcasper: Move helper libraries from /lib/casper to /lib. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d8e1e8dd9042f802a67adefabd28fcd9b1e4051 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7d8e1e8dd9042f802a67adefabd28fcd9b1e4051 commit 7d8e1e8dd9042f802a67adefabd28fcd9b1e4051 Author: John Baldwin AuthorDate: 2023-03-29 22:04:28 +0000 Commit: John Baldwin 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 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 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 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 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 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 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 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 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