upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-11 09:41:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pkgbase: pass --recurse-submodules to git ls-files

Browse source 
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 3b1904d9eb)
This commit is contained in:
Ed Maste 2023-12-08 19:59:58 -05:00
parent 0ed5a20392
commit c8c5d91f48
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile.inc1
View file

@ -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}/" \