From nobody Fri Jun 02 06:45:31 2023 X-Original-To: dev-commits-ports-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 4QXYRH2thdz4YcWV; Fri, 2 Jun 2023 06:45:31 +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 4QXYRH2KGYz4F8g; Fri, 2 Jun 2023 06:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685688331; 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=VMlxKE+x6rnQ1gHOWEEYParLsP8/ksirWpKf63Dd0Xo=; b=GdeVFejcFT5m0GYS8Fw00NjfSK005gMTamJg949xSpLd7fts9irELOPcl3bDHLZhk4px3z lrTnRRtMRamPvMJLHK9oSP48HsJhXBaZK6iAYQ+qEh0QulbtELpOqVP85SlinvklEmscTF lvXMaqIG9Av1oQRdq+ZInbDPjmEqP4EVQ8OoC9KtaGZexRYHAH0LkjxNGEhZKQ8zAJ0u5f 3dD6EnvcclxlCnvjQTYnVGgD8Oh9qqHhnIDOM9mcnzT/gmid36SNk+qprPZuxa5THn0VAd fewdI0rmTygZwAK88lgo8gUuTESMu3eB6uv+z1CovqUMIgAQ4IHmBiOv/j/KBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685688331; 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=VMlxKE+x6rnQ1gHOWEEYParLsP8/ksirWpKf63Dd0Xo=; b=gHKE/2jkJ0lBFErMdAKmBz9w+i/sg6lbfKhWrCrElfd+udrrQl/ubo03/RFHT18jT5T5cI zgePEQV3p+siQg2Ai36XhZVOzfbzKOpznZ7hFT87RcfdP/n4Qy2LtPy4BhUddagtEshgSb K1JUd9TGw1oLzxngnrAGTMxiZ7vS6NbPukxVkZl2bxxPu8zfsFskjNlJr0sMVbWxOSbcJW 5Mq63dR8kN8aO07MWrq4QRebJ6g8WCmY8o4vM5fqSNvoNLRAw1DANfl10fh9oJlwK9hL4b UeMQma1lL7v42qD7nCg+d9vdSX27MQEXz5/p8BFACU5WhEyQSJrvuHp2PSEKsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685688331; a=rsa-sha256; cv=none; b=KJ4OfUKc0jnMT/TSoKaSdUkfujLzos/RR9vOU3gA9RIH1rjNuHyKL9w/FB+eObWi5xPZzF OCEBp4zuFXo0+uzrFmJxqamOKEK39mTOi8pKy029rwedH8JE9i/wAyjMKKuAw8gdnBpohK 45CTkooaKVkvZsQqYgzYi4v7UlDsB8pidynLdylR6vC1X6HYEjlgyy/Y36KZ2d/r+yrk72 77DYq6RFUX+u0w9e+UTagvRk7XdfNZ9pe13RiFUM+wmgL3L6LeiypmZGapXiKdJ5Tm+iK3 YaZapRZHBfS6f7mXndbcDRvVEX1qGPfCszvOW6S28W9Qj1xB7O/ToUf+jHcOzA== 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 4QXYRH1Nh0zpHv; Fri, 2 Jun 2023 06:45:31 +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 3526jVdi019663; Fri, 2 Jun 2023 06:45:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3526jV0Y019662; Fri, 2 Jun 2023 06:45:31 GMT (envelope-from git) Date: Fri, 2 Jun 2023 06:45:31 GMT Message-Id: <202306020645.3526jV0Y019662@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 67ce8cec004c - main - Mk/Scripts: Fix the 'stripped' check from 'make check-plist' to report all unstripped files List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67ce8cec004c85caeee5a6e965bd10f872e1b895 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=67ce8cec004c85caeee5a6e965bd10f872e1b895 commit 67ce8cec004c85caeee5a6e965bd10f872e1b895 Author: Yuri Victorovich AuthorDate: 2023-06-02 06:40:46 +0000 Commit: Yuri Victorovich CommitDate: 2023-06-02 06:45:29 +0000 Mk/Scripts: Fix the 'stripped' check from 'make check-plist' to report all unstripped files Prior to this patch, the 'stripped' check always skipped the first unstripped file. It uses the "find [...] -exec sh -c 'readelf -S -- /dev/null $0 "$@" || :' -- {} +" command. When arguments are passed to shell like this: "sh -c 'script' arg1 arg2 arg3" - $@ within the script is assigned to 'arg2 arg3', and $0 is assigned to arg1. This is a quirk in how shells handle arguments in case when the script is passed using -c. This patch adds $0 to account for the first passed file. PR: 270398 Approved by: portmgr-lurkers (garga) --- Mk/Scripts/qa.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh index dd0f3440c299..a65d9475840e 100644 --- a/Mk/Scripts/qa.sh +++ b/Mk/Scripts/qa.sh @@ -211,7 +211,7 @@ stripped() { # files with spaces are kept intact. # Using readelf -h ... /ELF Header:/ will match on all ELF files. find ${STAGEDIR} -type f ! -name '*.a' ! -name '*.o' \ - -exec sh -c 'readelf -S -- /dev/null "$@" || :' -- {} + 2>/dev/null | awk ' + -exec sh -c 'readelf -S -- /dev/null $0 "$@" || :' -- {} + 2>/dev/null | awk ' /File:/ {sub(/File: /, "", $0); file=$0} /[[:space:]]\.debug_info[[:space:]]*PROGBITS/ {print file}' | while read -r f; do