From 3b1904d9eb0468a49be3cd1d97de6d7ecaa66a43 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Fri, 8 Dec 2023 19:59:58 -0500
Subject: 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(-)

(limited to 'Makefile.inc1')

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}/" \
-- 
cgit v1.2.3