From nobody Fri Apr 1 16:27:06 2022 X-Original-To: dev-commits-src-main@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 D0F3E1A5F286; Fri, 1 Apr 2022 16:27:10 +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 4KVQYR0wPRz3tBV; Fri, 1 Apr 2022 16:27:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648830427; 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=7hDWmmec8FVdn05gh9k3nIleJ9nkTrBipJrUjpldExs=; b=UhuDyZKTSYCRU9yiu2+E4sD/tpNgYiEWWFvrVd63vExvW3epR1kLkTvTYcsqclkpIO2HDQ TjwaZZtSkXzCKzKFfVI8ISQNvXPNz19kWmFygPMo7eRD0M9dv8W6kNq4yD12HQkUpoH+/W qK5f9GtOBh0vTWKGLDbbnS87JTNSofeYLAIFoBFqZNKlw4thphy6c2lYDuzYENoYBhL6hV SsYeSwApRa3TvbXx4FT2pCg3q4AfN6spk8lKF28lFkMAOkge6z180KSp3EC/10Jq+7MyyT PcuLSzcLz2qdOiK+ufN6yjzldN1z0AsMgo3ohVlLV5xVwFXTA8AN6ON2qOFBIQ== 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 7D5CD17C39; Fri, 1 Apr 2022 16:27:06 +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 231GR6rQ071924; Fri, 1 Apr 2022 16:27:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 231GR6jK071923; Fri, 1 Apr 2022 16:27:06 GMT (envelope-from git) Date: Fri, 1 Apr 2022 16:27:06 GMT Message-Id: <202204011627.231GR6jK071923@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b3b462229f97 - main - installworld: handle ldd including preloaded objects List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b3b462229f972e2ed24d450d7d2f8855cdd58a87 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648830427; 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=7hDWmmec8FVdn05gh9k3nIleJ9nkTrBipJrUjpldExs=; b=k4qyJZyg6fE0eVsVs3kyOff/pO70hIyBfNy/M1ujxq5pb5PUFqqF1SnT4HWMC0UxnYe9oS GpNjNlYu946ANFqgVD4l9dRRYKmokhmBPNawJV627QhIb2a/XgGZLDkCj0ENxP2UG3U1Zp wpz7xe+DSFps0FwReDsId1+PqgzLTVK4zKyl5bR4uD2Am8TFB5a0YBpuxWfBIHDefEdavm beeKbgSrCAA3d/q2WN2XgSG45VFOovr8ZrdeBHnSD2WGHNp/l4H1gn/hGz6/iJR7laHyDq tfXktNg4TxBQ0JDPJye/X7Dr8Gx+VtPmoEEUXMTJ1GXFE10TiKbWRFLbz3egcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648830427; a=rsa-sha256; cv=none; b=vTUoNu2f4xYks4V6L1MzfoaAPfQtS+8zsuVOzDSosHfnE6A6NHJ1LR/iT3cx+Wd0D0NSla kP+H45NdIq/mZWClIg3Lc889jAHjq8rGusZQiruOtOFPlUF+7up+XGMAdry/q9W1BaKaOl O97GzynZQLIeLbfPh4PbxrsbA6BWvb/DKSAX2BeuaEf2wYFATPQBTT2MmfHfCCJcG7Ffl8 7pvQwMNa6Pn4mCuwXzezWCPG4ltMGc5DkRBQFHK+BHSuhSe5wdBlucTkHk++GvQlX1DA1G RGFRCgOQyr9JSanhbY2g0a7/sJe7aGU8nrQ6/WqpNCtITWHAQYAMuBjIFWikmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b3b462229f972e2ed24d450d7d2f8855cdd58a87 commit b3b462229f972e2ed24d450d7d2f8855cdd58a87 Author: Ed Maste AuthorDate: 2022-04-01 13:58:47 +0000 Commit: Ed Maste CommitDate: 2022-04-01 16:26:49 +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 --- Makefile.inc1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 04c44d8e297b..f4d5b4cc8050 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1368,6 +1368,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; \