From nobody Sat Dec 09 16:10:37 2023 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 4SnXzd4tz6z54Ccq; Sat, 9 Dec 2023 16:10:37 +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 4SnXzd4RBcz3fvm; Sat, 9 Dec 2023 16:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702138237; 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=XThfI6lEpOVMrho+HG1FfH1uptRQBpj1v0JRtnz6578=; b=QH7WumVoNOhel8xAmhUKoBzD6Op+FpNhG7F1SblLSLsutRam7un+luvvoI95qxIVJJYow8 b/TYaN76IDy3twVv5u1t+1CII0eDSUWR/J6VQs4ViKApBpVqeDYTN3Ld7aRT3bMMHWPQ8W IYtEYJKZO98Dc8qoC5G4DOeKp/n2frCV+q0qcMB6jzvmWTfuUHhCK9NQAY3wbL8sFy6sVb cqAz0WrmqiFDFzFqY7RMmWC1K/5PoNlESdaQenYoZxPZ+wFfE2hPJQMTASHgh4UDGbzvYc QD2xEkpIIrYllwGsXllA6qhRr7WuhcOCczuaItuxghGG7CR3F/vXWrHJt8JfZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702138237; a=rsa-sha256; cv=none; b=hxDuO173Z1mqe7RPNEdkrGHR2GJRaVXvU3cFdVwga7Biino4vUDBwBFIcPxV+/iGUkZ102 FZpq4JUcH7WOueOJFKyEchGBHvSXpoFJ2J7XJW2Mpzi1HnX15CIYjva38J57T5kqGHdoyo wkMxIm3/n99LtgBS6NgeLfs/AuXaKp/NJVwgFLyEZgIOgfeot8KHq1vUzmimGHF8YmEAbD s/IUCZkQwnuH7tOOmvQhNzIFKA76NEnRN1GlJlur1zBUzbjhyKOiMVauPvVmI4IMg6Hzwr KEVlhln59bFL6B++iF6sbCq/12umGfrms6IH8Gry5dBtGLELBq98scbsw8fOlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702138237; 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=XThfI6lEpOVMrho+HG1FfH1uptRQBpj1v0JRtnz6578=; b=GFyfTs9C8Hf2Y7fPUeUWohPuDBR5MoGUV6kG7n1a2QZBySZYoDcMs4OljO92uQ/ULwJHxK ceFFUZ1DEhIZsfabWkYf/aUVKNUAx7wizT/mDC86pAsUpMfZsYct9uJY2YdTsX0a33qSMz whuAaFpwgL2tSRzFQrYA8SpgrX6UzuXFD/a0Td33gvxS6eFMXIKAfqj9LllhWNKSyG/Aav Fx28SsUd0OGhN0xCd5ncUzZjuCij1woLibJqqZ7iOIyNqL2gFIVSl0BpleQprAwT8NLCyE bpCuipy0dgs11+nB2ZZC5zy4K8FU7UekWP48VYRu/rrBMAXv4z6fB8yW1VRiaA== 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 4SnXzd3Tpsz19dV; Sat, 9 Dec 2023 16:10:37 +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 3B9GAbxg041530; Sat, 9 Dec 2023 16:10:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B9GAb5E041527; Sat, 9 Dec 2023 16:10:37 GMT (envelope-from git) Date: Sat, 9 Dec 2023 16:10:37 GMT Message-Id: <202312091610.3B9GAb5E041527@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: 3b1904d9eb04 - main - pkgbase: pass --recurse-submodules to `git ls-files` 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: 3b1904d9eb0468a49be3cd1d97de6d7ecaa66a43 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3b1904d9eb0468a49be3cd1d97de6d7ecaa66a43 commit 3b1904d9eb0468a49be3cd1d97de6d7ecaa66a43 Author: Ed Maste AuthorDate: 2023-12-09 00:59:58 +0000 Commit: Ed Maste CommitDate: 2023-12-09 16:10:01 +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 --- Makefile.inc1 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 45d5c5d3876b..b509b603821b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2087,10 +2087,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}/" \