From nobody Mon Apr 04 00:40:43 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 9F3B71A4B1F2; Mon, 4 Apr 2022 00:40:43 +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 4KWsQ33wvXz4llM; Mon, 4 Apr 2022 00:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649032843; 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=sC3Cnm37dAymGq74jdHh/x5QhnibLx9bRbzn88xHbRw=; b=cfa4bPO63iXc63df9IrAYc69QgECu6UPtgztqzgVeaKYMgbvTwMeGwg1hT4yqDdDMqrVEI CZ0pEP4iICKWGVK6rFObLCkYiNA7tpVCTs0DjqR6ouZej49+bCTtEN65XPZ0G8y3c3v2CA g0WYIEFT4zxA1WbDLXcIPKrX0uYVCvXu1LS/HfxBn1l/gFoqFfM4yFcXPBWX+WLjLyk5Nj +cSMcOmcZof2WNgxblxqPcNRTXb3Q3hKkJIcCvdX1MkGb6zWYrJ0LNEw8HMPaAy31ubmex 4Nq3MUUrDHFhg2ZII73Xs9Yb3VsSjTlBpq8R8QeuwWm+LO40MOq1iu4zgFi3TA== 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 677FD27956; Mon, 4 Apr 2022 00:40:43 +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 2340ehpi045207; Mon, 4 Apr 2022 00:40:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2340ehIg045206; Mon, 4 Apr 2022 00:40:43 GMT (envelope-from git) Date: Mon, 4 Apr 2022 00:40:43 GMT Message-Id: <202204040040.2340ehIg045206@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: e10026a406b2 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: e10026a406b21b3f1581ee15a88def2b640dffe7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649032843; 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=sC3Cnm37dAymGq74jdHh/x5QhnibLx9bRbzn88xHbRw=; b=wC0wyR+mmZRcMP/VBw7tnSeq4CSu4C3yilA0dvV/938cr3ExIcxBbJxBbDQu746Pbs4K68 5Y8mI1w0TY/acVP5VW9i2sOv3SdAMVstWLFquLH7vXBKL3PYorIa7LLKo0NnMdXZdtTefn 6CLNOgNMpjoTruJfVuJ7Ij37Cj+kqNGqpl0a1XpBaBQzd8OVdj5047gQfTbbHijKCbPYn8 uDQWGge25lF92DUHQHIaDSJoTo8xBIoo9FMQQyW/MKiG/O+rRSe+LVzsZ0aJqx2VeOpF1s tjguJzzRChzrJuYUtVNB4s7dwQ0nxuBGzMItQQ6eE2lSdqJVuUbhRHekxiqKFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649032843; a=rsa-sha256; cv=none; b=YiIxNeFOTW3knSjVrf2F6MtELxTvXRfzlVd+AyrVo8qsgcE4m/MO7Yd8PlmEdBCwlUA0qU MVNwUt3kPG35zTrWjXJXoD2PsFWunKQSuLNG6gTJ7wWz54TEEdVozT2HxSt/BlP/ukeO8q 3+wls8RlcHZ1wHmwO4Eoyff1VNMUIMWBmQTzIXn+l0EEZ7h8aC7q7PPlfuYv6qlH6ZOO+Z X68PSIUGHuMpf+eHq6d/VpcJbMMypKgBRbddfVDnNPyHV5s9bZ2HWgShUz2L10xAgrRjl+ AY4h55NnkuNt2N03xSGDLCPRMXkyuXbNSd//3LxJ3nHJ/CWBhFfIj4cibLG0sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e10026a406b21b3f1581ee15a88def2b640dffe7 commit e10026a406b21b3f1581ee15a88def2b640dffe7 Author: Ed Maste AuthorDate: 2022-04-01 13:58:47 +0000 Commit: Ed Maste CommitDate: 2022-04-04 00:40:31 +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 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; \