From nobody Mon Apr 04 00:46:41 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 ED3DE1A4CD6D; Mon, 4 Apr 2022 00:46:41 +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 4KWsXx6DfDz4nG7; Mon, 4 Apr 2022 00:46:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649033201; 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=F8sEoqMbkF9KZ4bWZcPJ7jsFxuL6zJ5I4OgZsE3dLnI=; b=M9806WJMYITSWs5m8SXmBrcGQXgKgkEJ4Z4G9N31I9MOHu/niCqgjlmjhZF9OpbY4ePvCl XwEDaY6sPScb/veHOLZTgSmVjFj6NtXkkIKg6R5wK5KX6XjbPoRLoczcDU2c7a+uPBvIyu efHuqcMgst2rx4jHqoBxANqXY+ihGPUvSMQFIIUVL8rvToq/NaOBJacKCl0SaKEYhEd+eF dgEfV24tVH2ZaEL/cXaWU6LwdXcV+pn29ZIf7aQQl8C3+TvdjjtC8pOP8XVkuLQPeTG+pk 4CefurmlJCCsrrXfmV3/BlWP8FklRdhryhF9c3jrN4BIvgLut1/0hW5XLM8fhA== 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 B71BF27D17; Mon, 4 Apr 2022 00:46:41 +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 2340kfD7050095; Mon, 4 Apr 2022 00:46:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2340kf37050094; Mon, 4 Apr 2022 00:46:41 GMT (envelope-from git) Date: Mon, 4 Apr 2022 00:46:41 GMT Message-Id: <202204040046.2340kf37050094@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: 645427e7951f - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 645427e7951f831bfdb0ac9cda74dc77da20eb21 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649033201; 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=F8sEoqMbkF9KZ4bWZcPJ7jsFxuL6zJ5I4OgZsE3dLnI=; b=TSi+/7sV8k11UTLz9bCM0t4i35Um62ACtvTOxa2WQJIwSnsBrOXMtKAozkBfFgEMXG1wOS WmTnfznvvpj15vIBvsvqqFiReMpVxr3mYLlzeN5AWXNw286gVFAU+6cKcRORhcmtNuP017 GbF/Ou/bJELD0r/i0kD3eYKGVry3gsPTKqlg8qZ3DKFPv8fCnFysYJY3Zir+aVaa/z90je Bzzf6GJQMNvUOF/1XY8FDPeTVKyR2HWjqDGTSlk9Xvq+Kc62x4RPCV0em8PrNxh5kLwTXp P3fKzKXomeXS7O+vtPOx4Mn/WbLsKTSqTIv4fv32jidC3b5mbxaewCj3W6CXBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649033201; a=rsa-sha256; cv=none; b=PQT7STigylqIW9CuMkeO2LmPqaywiW4tnfuccCNq2eS0IUqey5+vUL5rwkLGif9G5CugaJ e3h95aLlmU891vmqIvrp6+/Yzf9kmPQgTQwDrdlFBm8cX//t3Mki0bOJJZDAao02dUMSWr xOdjyfkJ1o/Lwu4UH6eOw7HnNs0bDLovKqXiXA/I4tjrRi5P1vokE4GCgjQHDxFLvHLWud Do9q/4bcKr7EaAv7mvBgeMVVNxWJTUwIcB6NyIdbV/FtFcHhS06bFe6JU/E8mOV6qETaPB LXHlNiydKaRhCaVI7p1V4jl3nDVMNZrjKD2bbjchXW+nbeapSJTIGm6Bk4zPzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=645427e7951f831bfdb0ac9cda74dc77da20eb21 commit 645427e7951f831bfdb0ac9cda74dc77da20eb21 Author: Ed Maste AuthorDate: 2022-04-01 13:58:47 +0000 Commit: Ed Maste CommitDate: 2022-04-04 00:46:34 +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) --- Makefile.inc1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index c9777d1d45d3..a714302a5744 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1376,6 +1376,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; \