From nobody Tue Aug 9 21:59:06 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 4M2RmV67Qyz4YHMp; Tue, 9 Aug 2022 21:59:06 +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 4M2RmV5jNqz42Xh; Tue, 9 Aug 2022 21:59:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660082346; 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=roMRLL35o0LULB2FGR/fffjTJhFj7LdEm4o3ELszBF0=; b=jmLUgTj9s9PwtEJbEgh/7pNtieuSLXnPXB4aWX22SJzrtG8zv53ga4GpIHNuDHX4iV2dGz BDsde28gmQg3776w/ekklpF1r56C8D/6FSHuUfsinkbLAA/BQkTS+nEP+mdF7JRyI/qaij 23vptvmx0zt5uhycwSDuFJnktIpCqYHuN8aRNy2GEcauc101H3zhRaPQVhaWrTNb0/lAYp mcEcebGvRWPupFse1QoDCIEyZ/E9PnXYIXjAS7ov0hHlTOy33+pLUhCf+nNh+EK/VEE/6b T7b7PWFJUIxMqYbzejxuWfMvvFmlc+kL2YNICotxNysujAcGwCd/IIX+r9Iqww== 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 4M2RmV4hlrznLL; Tue, 9 Aug 2022 21:59: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 279Lx6vm086498; Tue, 9 Aug 2022 21:59:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 279Lx6x1086497; Tue, 9 Aug 2022 21:59:06 GMT (envelope-from git) Date: Tue, 9 Aug 2022 21:59:06 GMT Message-Id: <202208092159.279Lx6x1086497@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: c5e30fbdb7e0 - main - etcupdate: Prefer POSIX -depth to BSD -d 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5e30fbdb7e066a6207084f7a8f2327aafe9104e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660082346; 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=roMRLL35o0LULB2FGR/fffjTJhFj7LdEm4o3ELszBF0=; b=FDY9qQPxqKORca2t+39WJbuT43iRtbqV8ak1YxKsyS3ws2+nfLr0Mj8oWIyg2/fC3RVwDF cAYQcXMq3rLA71Q7VOIZ1N6+gLejMs3pfvOLto0sSxjqP5iESUKFkpJ+037qMriJeHLqw3 Z+I+UAEHf5TcDLK25LZ8xWs4aHT3/LkRGv0AZCCwBOBiaoKwj7sp4vT+yMj0gYKJd4MEvl iOnod8YALmdrg1TB+zkAmWtTj6V3U4OmWxOuj+zxzY/W6gZmfUtDPH0ySMY0JEL+TF+Abd IriDCu+JbIZFhO0FJ0fUIcyYSsqtdvKlKv9cPBIzWEnyk5cPA1rrW4GxoTkLQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660082346; a=rsa-sha256; cv=none; b=jrPToL7ujQHuHq8CkUiedG0U26K+g8GyMQXOC29FoBXJdvPbFm8NJMjIYbdcD7Nwv5BV+s GJhtEktMgxyZZd/IJFtgbHDhlraOr/a5F78berE9khcAIu6rx/9+M4pz56tpn9ISllTELJ cPg9w3NKy+6NRCNEd/22ybuLVBv/3qlVe7r2mZpZEr0JAs/tloLtVlDHZ6s3JBNioxmBLa +goTKKn/7a885jhPhI9fibGU8JNNQ7S2pmpEKKt/i6b0rUF3SzwOPRx5QM3rdT7ze8F5/B i/2oAVJehP8EJ4sLTjRmkvyisvhN78HgURmAPMlGTRy3OngaqPXlaCJmfyZbSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=c5e30fbdb7e066a6207084f7a8f2327aafe9104e commit c5e30fbdb7e066a6207084f7a8f2327aafe9104e Author: Jessica Clarke AuthorDate: 2022-08-09 21:57:22 +0000 Commit: Jessica Clarke CommitDate: 2022-08-09 21:57:22 +0000 etcupdate: Prefer POSIX -depth to BSD -d This is in preparation for building an etcupdate tree on non-FreeBSD when building release images. The -d option is documented as a BSD-specific equivalent to the POSIX -depth primary. Whilst GNU find sort of accepts it in an attempt to be compatible, it still doesn't permit it coming before the paths, unlike BSD find, and prints a deprecation warning either way. Thus, use the equivalent POSIX -depth to ensure it works correctly and without warning everywhere. Reviewed by: jhb Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D35856 --- usr.sbin/etcupdate/etcupdate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh index 91417801063d..d9993fb2e58a 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -225,7 +225,7 @@ build_tree() find $1 -type f -size 0 -delete || return 1 # Trim empty directories. - find -d $1 -type d -empty -delete || return 1 + find $1 -depth -type d -empty -delete || return 1 return 0 )