From nobody Mon Apr 11 13:14:14 2022 X-Original-To: dev-commits-src-branches@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 2A08B1AAD8C8; Mon, 11 Apr 2022 13:14:15 +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 4KcTpH0X20z4qkp; Mon, 11 Apr 2022 13:14:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649682855; 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=vtzDBibjcZZOAQpD0zQZ5RIiT8kDW+UrD84yXU2bPNA=; b=iB1EpHoYbdHll3vsz8pE/HAmssnDbmPPC2sMtZP4YM4dAC6y4q6Tp+/1Sou4e2NAvpwka7 iZuPYRrWYr0i8f+FypLLmuy3gUReRvY93qSZILWsbOW8bK5IkJyICHG8fEgvD6kAFmfWeB s3jLLfkj2EKf8qfCuq8mLd3xDqqvRI8ioXZdSREeq9EWOQDt1bzlkluTfEsxUNUIvrtZtZ FJHIA44scHyLAIidNlhfMI84eaXgqXmvHHuvg6qBP5SNN2jSOSEBwKlj1hOk4FQZQOPS+7 BQbSZHe8lx+U8eJof+ndCPRZM6rHFCqlTowBf16MN1K5EYsQFI10JrR8nF1qsQ== 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 E620B2395B; Mon, 11 Apr 2022 13:14: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 23BDEEXn088789; Mon, 11 Apr 2022 13:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23BDEElA088788; Mon, 11 Apr 2022 13:14:14 GMT (envelope-from git) Date: Mon, 11 Apr 2022 13:14:14 GMT Message-Id: <202204111314.23BDEElA088788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 7150099b3c84 - releng/13.1 - installworld: handle ldd including preloaded objects List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 7150099b3c8484096ce891f30f2c6aca29cfdac7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649682855; 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=vtzDBibjcZZOAQpD0zQZ5RIiT8kDW+UrD84yXU2bPNA=; b=VTbEj+p4ZFSOwVO1Fa2jOmSt7fPTQk4ye/0EYBXdmWJPsG9eAEIK/ADjARcR+OifLxiQ8G UABeXIa1Q0efxeXACRjOnpwcZczm5Cv5lWvumXJNiirbv+lVAAMiQtEbCaSixv8AItnd6s cxnstRggrqGzj8TeBXIL0LFu5sDP7oWsHIINPntT1HlOvrDKmhY6iOUB4KPXN3hMYl3fHi +ynEx4ngUem98MeBQ535OOrsWFTEfAKvRwDtdYymkb1BzQBk256bSRlA8HSTJi1wNgP4gG q7FSQJGLvSTi6bL9N4/PSq5FBw+1yQfZI2Az2oVRu1ZlMFcfCs142TPXs4yhTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649682855; a=rsa-sha256; cv=none; b=SmU4E7iD0DslW2jxgr+mC4zd/cobwpMAbPNNdYvRJr2+WXmkjLSLyJXtews3gVUQal53ZH zkqoQgkijUmzAOso0skIRJpfoZC7X35n1CnbV1QSYdTvFyCA0lfyySusyqP/VwxQyBlCoa 8zfIjXe5EqvD1eD5K4WyPfvQe/jgbX7SUVKmrPGZrmmAqi2o3HAFIyIiJZVBFcBTRsbv9T a8iG3IJhHsdCH+w/7UYElxGO8zf+gnnZ7/U71OAGwYi1E7EdkyyuwIEums+1nbddtHEK0y ihRLl9xweb5l0r7hilu7PFKi20gWoq12x5TABduvEmQ7vsl9VB2F+0zsv1xIOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7150099b3c8484096ce891f30f2c6aca29cfdac7 commit 7150099b3c8484096ce891f30f2c6aca29cfdac7 Author: Ed Maste AuthorDate: 2022-04-01 13:58:47 +0000 Commit: Ed Maste CommitDate: 2022-04-11 13:12:53 +0000 installworld: handle ldd including preloaded objects The installworld target makes a temporary copy of binaries to be used during the install. Libraries that they depend on are also included, found by using `ldd`. After commit 0913953c9ed0 ldd started listing preloaded objects, including [vdso], under a [preloaded] header. Skip ldd output that is enclosed in square brackets. Reviewed by: cy, kib [earlier version] MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34734 (cherry picked from commit b3b462229f972e2ed24d450d7d2f8855cdd58a87) (cherry picked from commit e10026a406b21b3f1581ee15a88def2b640dffe7) Approved by: re (gjb) --- Makefile.inc1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 327680cad5ff..b8431b5abe09 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1383,6 +1383,10 @@ distributeworld installworld stageworld: _installcheck_world .PHONY if [ -z "${CROSSBUILD_HOST}" ] ; then \ libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \ while read line; do \ + case $$line in \ + "["*"]") \ + continue;; \ + esac; \ set -- $$line; \ if [ "$$2 $$3" != "not found" ]; then \ echo $$2; \