mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-15 12:54:27 +00:00
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
This commit is contained in:
parent
1c376684c7
commit
3b1904d9eb
|
@ -2087,10 +2087,12 @@ create-source-packages: _pkgbootstrap .PHONY
|
||||||
.if !empty(GIT_CMD) && exists(${GIT_CMD}) && exists(${SRCDIR}/.git)
|
.if !empty(GIT_CMD) && exists(${GIT_CMD}) && exists(${SRCDIR}/.git)
|
||||||
@cd ${SRCDIR}; \
|
@cd ${SRCDIR}; \
|
||||||
( echo "@override_prefix /usr/src" ; \
|
( 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}; \
|
@cd ${SRCDIR}; \
|
||||||
( echo "@override_prefix /usr/src" ; \
|
( 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}/" \
|
sed -e "s/%VERSION%/${PKG_VERSION}/" \
|
||||||
-e "s/%DESC%/FreeBSD sources/" \
|
-e "s/%DESC%/FreeBSD sources/" \
|
||||||
-e "s/ %VCS_REVISION%/${VCS_REVISION}/" \
|
-e "s/ %VCS_REVISION%/${VCS_REVISION}/" \
|
||||||
|
|
Loading…
Reference in a new issue