From nobody Mon Apr 04 14:59:08 2022 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 1F71C1A877B1; Mon, 4 Apr 2022 14:59:09 +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 4KXDSY0Lf1z4nVy; Mon, 4 Apr 2022 14:59:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649084349; 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=/QxEVaPnX1yrfNCEy6wquvezjTkSsnUe+741+L7+TBk=; b=cuW6HXGFVjRdIDn3VW1Jl1JZp42CBh60nmtaT+Jce+bPqGukXDBYMnMF0UjPc+yCIAL3ry f/7XLZkTnTHORPGJvMp38/jBu82/DBoc5boNtI1dSX1eQuKUexeoc1AMdd3vL18MrylJQI Ebtf7b3ujwXcAPsVfGshgwbpYFWEKZjme76atElteDc8mMTu3tWrSvP+2cFuQMpGv7BbQP gwxnHVRYEPUxvgnyrineJOgnOmVqoEQusu2kPOvfnSAD4M7GiIKwW2cXYtqNcL8ZjynMzx eFYaqkMXUivYVmBuYNS6KRx2D/OxwYzF9Hm6Kq1gUMF0FrTJkqKj8W4kwoqxXQ== 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 DFA5E13FF3; Mon, 4 Apr 2022 14:59:08 +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 234Ex8lW099494; Mon, 4 Apr 2022 14:59:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 234Ex88a099493; Mon, 4 Apr 2022 14:59:08 GMT (envelope-from git) Date: Mon, 4 Apr 2022 14:59:08 GMT Message-Id: <202204041459.234Ex88a099493@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: 2a2ea0075dda - stable/11 - installworld: handle ldd including preloaded objects 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/11 X-Git-Reftype: branch X-Git-Commit: 2a2ea0075dda175deef7ca02d5a5ac3838921482 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649084349; 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=/QxEVaPnX1yrfNCEy6wquvezjTkSsnUe+741+L7+TBk=; b=nLETqya7fDSj7SW7DmJ+IdIRaRRfHXfOJUv72FgFyNsWZZ/ge6Y32VX9h2DfRdWhz8VJkB Kmn79itaf3bXVwQxxx+xKeK4YL8WzcGmdoTv9A6yq4+waUvNEs5gAkTlPLZvhp7ZNt+GZ6 i4P4T0R+NL/ZlesAHZvUOUporznZCldX1ui8SK1bdhJ/I3MGeVfuYpo1gQHVE/m6sTafaL QkDXB9d+O+wBW2QNECelSIkLZiV+y8CdTvFCCjays0ZMUleIeJl18yGHcwcn8yrLv+4qDh gHvjgkfcocz+tT9fdIPLBxDhQ/HR1naisnvkVkWHNmp6CKYoRKOPvCRPoC8k/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649084349; a=rsa-sha256; cv=none; b=mVUsaeIGDBRvbP3QsOyT8TlyPK6I2rFmrKOKgAJCsVjKkHqCcSKkOmkM02j/k7xMrmITAD SM4w0G+KYYI1b2WZjqS1BALrNiqnCy//22y8pvkOa6u4PtBI3lW8c/mCLxsLhujYkD7+2l VoW4s/hNRsvdEFXw8DE5jIfUavzcSxwRWXlHJnUzPhidlbDypTeeX1LCeAsrdoMclpYjHV dzH27xQ+pYRr3C21qw8j/zVih9xA1Qb/k/W6XMJXymdsUEcnjboDc7Up1TKe6MCpjaW3va RkbN0dozEFcXEmWb533xDxX7pjK/Od3AYeu+FxSktL3wCNT1PyQVjZp0FRdwEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/11 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2a2ea0075dda175deef7ca02d5a5ac3838921482 commit 2a2ea0075dda175deef7ca02d5a5ac3838921482 Author: Ed Maste AuthorDate: 2022-04-01 13:58:47 +0000 Commit: Ed Maste CommitDate: 2022-04-04 14:57:48 +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 6550cae9b83aa12c2300727d9d4ec6cc816d664b) --- Makefile.inc1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 0f937ee11a30..54f037282d0e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1020,6 +1020,10 @@ distributeworld installworld stageworld: _installcheck_world .PHONY done); \ 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; \