From nobody Thu Mar 30 19:02:05 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 4PnXpr1BqCz42Bfc; Thu, 30 Mar 2023 19:02:12 +0000 (UTC) (envelope-from yuri@aetern.org) Received: from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com [64.147.123.25]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4PnXpq6XLyz3KLD; Thu, 30 Mar 2023 19:02:11 +0000 (UTC) (envelope-from yuri@aetern.org) Authentication-Results: mx1.freebsd.org; none Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 1F4203200929; Thu, 30 Mar 2023 15:02:09 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 30 Mar 2023 15:02:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aetern.org; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm2; t= 1680202928; x=1680289328; bh=IO2dRQvLWYWcaeJ1+onw/k2jDb7ae+EHP7E TZl1CdPs=; b=qhiwyZQ67ci9xY2q+ySaaewXQ73Os9lcZlNJYottMbZOTUF+TV5 UuWqukr6UJeHgbFBT2drw2FC2pbs29PL65geGguJUiVzcrKAu4oQwbeI6d2oDX09 XewuGojVxgG8kWwYtRa+LdDjzIOqwMm9Z6PsAsdz8LMfbqMwbkjGy5TUASPLbt3P U+JysjyXXH335xTdiWMf2ebB+JTUNHVnJChYQcIAKEV/LnbKPJH3ftfCzIHu7bqE yKmoWsbr86kirNv8INspkTH/vLjuWYK3cdlADIBvfmClS+BhmfrUtLxvVhff3hVS oDH8pLlKBLPvoiaMF2Qlp4BuTD8hr2MWu8w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1680202928; x= 1680289328; bh=IO2dRQvLWYWcaeJ1+onw/k2jDb7ae+EHP7ETZl1CdPs=; b=l kRUBtsDa7ApvG7E7OAce2S0wA/iOnz0GumBRHDrZ0A+i74JLXAtkVkbgocmMXaQg ybbAqkj79FzSB7mwqvHsRdwTMdJkZ4e0/xt33cq3/E+s4wSD2I8i1aOpli3oc6+z 9cVXH88JZXuzWWDCs2Jr4vv1TBAMe+OIshBa7LB9rvIx1rQ039ggzxq01v2NW5+O +bhi/ck3SYnmBLiKfevUVORcE0YnDOztdCjx442OYzMpcMmezp4kBSCPYjv4R8b0 aOaUkJzWte5EcotYeQ4b2Kf3o0akPiWKX9TMuATiMya3PR43n+eruEFFti6e9w22 ty8CZ/phDtH1YpekAqnrg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdehledggeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefkffggfgfuvfhfhfgjtgfgsehtje ertddtfeejnecuhfhrohhmpegjuhhrihcuoeihuhhrihesrggvthgvrhhnrdhorhhgqeen ucggtffrrghtthgvrhhnpeegvedvhedtfeelteduudejveejgfejffekfffgieekveeitd eulefhfedtueejveenucffohhmrghinhepfhhrvggvsghsugdrohhrghdpohhpthhsrdhm khenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpeihuh hrihesrggvthgvrhhnrdhorhhg X-ME-Proxy: Feedback-ID: i0d79475b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 30 Mar 2023 15:02:07 -0400 (EDT) Message-ID: <0cf3ca23-d192-adb6-ee00-8458bde27233@aetern.org> Date: Thu, 30 Mar 2023 21:02:05 +0200 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 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: git: 7d8e1e8dd904 - main - libcasper: Move helper libraries from /lib/casper to /lib. Content-Language: en-US To: John Baldwin , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202303292207.32TM7Emk050652@gitrepo.freebsd.org> From: Yuri In-Reply-To: <202303292207.32TM7Emk050652@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4PnXpq6XLyz3KLD X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:29838, ipnet:64.147.123.0/24, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N John Baldwin wrote: > 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 Looks like libcap_netdb.so.1 is missing from this list. > +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 Here as well. > +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