From nobody Tue Feb 20 15:16:53 2024 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 4TfNKx3Wcdz5CDV9; Tue, 20 Feb 2024 15:16:53 +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 4TfNKx2v6dz40FJ; Tue, 20 Feb 2024 15:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708442213; 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=mmWJ9kjkQRrZJmBxkncLtwV/FXnf2NDUgdcyTxK8L4k=; b=GIp2ET0JN10Ikh/VQdmSVQGHc3yADObBLej+8AoQKZ+i+0XTuS3ULyXyL1/ETcoQYpK9Y5 jNfeqOfKDbS0YlgApR0WYiBIVVsPeT31wZAR30Bf3nheyYsoW1W7knCeWz80us/v/bvLk9 70kMIXKuMryjEHGbzaia8N9Ck8vd85oHFOxrLkVwwEEzbGbo1zvTbxGT/fxWdlspj39uAG LVYD2E41qUsAQbMYBCj2wPQhazSmWiyLVPSL1rYRrOVIgjhB7JGF4AlXLjD/wJLFpxFQRk Oq+aug2N8NjMohkfRSHpXJilvk3lapM7Jqv5rnVz/vZRjPq1k+LPJWjZc5Cnzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708442213; 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=mmWJ9kjkQRrZJmBxkncLtwV/FXnf2NDUgdcyTxK8L4k=; b=AyrFFRAGKatVc0T+oqTshTGrUqMznfeF5WqL8EX0hlEim/c9gvGOr4LvC0XANrhEn03wgT EM6098CzZzQCoQu14K/ZQHULuhuVsJwgS+Up3II2ra3r0XqTigKKORt2UW0tEGqacn7x74 OG7N9sWF2zMy4CafEm7mI5Ul7HcwXro9sYbECE+i8k7IPcvACwGmeGEvxZl3S06DYqm+62 6vbtiw/NO9s5NSTDuDIoqo4NQueu6V+l0oIMojM2OfjPN0fKg8ZFfoS0kUjsSK9c5PWEvD EbKWZKk8MAj8xk3u2HLVe6keiDXvnQkRsL/zXiBl+rhvfBvASJDv8c7H5FqryQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708442213; a=rsa-sha256; cv=none; b=rFXDMT4vuuwCzxWY1IPRo41XH0H66YUvFNEFAZk9tg8bVdXTGXKRRV8OCuIlLY1NYVbaJU 8ksHPwVtpeyB2q+9bR3c3hS6D+hKC71oGUfYTMVYCd+2LopR5o3nQdJebkpK7UuYKg5VoH mZW/VFFSucvNijQSK7prICxp74L/i7Ff3dmstcfqg+MipHSTeJABeH0iGldSj5UhbNGwwp DXyAMl+rqBI37zsCy1k+ksScaJvQM5RwDOJhlZ9pskpmu+rNiUnZzGmMhWOJ9VdicFNDHS IZ+gFBdvL2WzuAkl6xumbjAtFkf02kPG6HZ6G/pVv4simCTkZrVXMQO9EYZ8cA== 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 4TfNKx1rYxzNhP; Tue, 20 Feb 2024 15:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41KFGrSm071537; Tue, 20 Feb 2024 15:16:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KFGrP4071534; Tue, 20 Feb 2024 15:16:53 GMT (envelope-from git) Date: Tue, 20 Feb 2024 15:16:53 GMT Message-Id: <202402201516.41KFGrP4071534@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: c8c5d91f48c4 - stable/14 - pkgbase: pass --recurse-submodules to `git ls-files` 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/14 X-Git-Reftype: branch X-Git-Commit: c8c5d91f48c4e4496fb2554489198a8817656e1e Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c8c5d91f48c4e4496fb2554489198a8817656e1e commit c8c5d91f48c4e4496fb2554489198a8817656e1e Author: Ed Maste AuthorDate: 2023-12-09 00:59:58 +0000 Commit: Ed Maste CommitDate: 2024-02-20 15:14:29 +0000 pkgbase: pass --recurse-submodules to `git ls-files` When generating source packages. Although submodules are not used by FreeBSD itself they may be used by downstream projects. By default for submodules `git ls-files` just emits the submodule directory name, which resulted in: pkg: pkg_checksum_hash_sha256_file(read failed): Is a directory Passing --recurse-submodules lists all of the files in each submodule (which is desired when submodules are in use), and has no effect when submodules are not present. Reviewed by: bapt, manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42983 (cherry picked from commit 3b1904d9eb0468a49be3cd1d97de6d7ecaa66a43) --- Makefile.inc1 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 3537cf5ac579..2177ffb7cb27 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2092,10 +2092,12 @@ create-source-packages: _pkgbootstrap .PHONY .if !empty(GIT_CMD) && exists(${GIT_CMD}) && exists(${SRCDIR}/.git) @cd ${SRCDIR}; \ ( echo "@override_prefix /usr/src" ; \ - ${GIT_CMD} ls-files ":!:sys/" ) > ${SSTAGEDIR}/src.plist + ${GIT_CMD} ls-files --recurse-submodules ":!:sys/" ) \ + > ${SSTAGEDIR}/src.plist @cd ${SRCDIR}; \ ( echo "@override_prefix /usr/src" ; \ - ${GIT_CMD} ls-files "sys/" ) > ${SSTAGEDIR}/src-sys.plist + ${GIT_CMD} ls-files --recurse-submodules "sys/" ) \ + > ${SSTAGEDIR}/src-sys.plist sed -e "s/%VERSION%/${PKG_VERSION}/" \ -e "s/%DESC%/FreeBSD sources/" \ -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \