pkgbase: Make src package creation recipes more precise
Just remove the plist created by the respective rule. Otherwise the two
receipes can race with each other.
Fixes: d7d5c9efef ("pkgbase: Let source packages be built in parallel")
Reviewed by: bapt, emaste
Reported by: Mark Millard <marklmi@yahoo.com>
Differential Revision: https://reviews.freebsd.org/D46320
This commit is contained in:
+2
-2
@@ -2120,7 +2120,7 @@ create-packages-source: _pkgbootstrap _repodir .PHONY
|
||||
create-packages: .PHONY create-packages-world create-packages-kernel create-packages-source
|
||||
|
||||
create-source-src-package: _pkgbootstrap .PHONY
|
||||
rm -f ${SSTAGEDIR}/*.plist 2>/dev/null || :
|
||||
rm -f ${SSTAGEDIR}/src.plist 2>/dev/null || :
|
||||
.if !empty(GIT_CMD) && exists(${GIT_CMD}) && exists(${SRCDIR}/.git)
|
||||
@cd ${SRCDIR}; \
|
||||
( echo "@override_prefix /usr/src" ; \
|
||||
@@ -2147,7 +2147,7 @@ create-source-src-package: _pkgbootstrap .PHONY
|
||||
.endif
|
||||
|
||||
create-source-src-sys-package: _pkgbootstrap .PHONY
|
||||
rm -f ${SSTAGEDIR}/*.plist 2>/dev/null || :
|
||||
rm -f ${SSTAGEDIR}/src-sys.plist 2>/dev/null || :
|
||||
.if !empty(GIT_CMD) && exists(${GIT_CMD}) && exists(${SRCDIR}/.git)
|
||||
@cd ${SRCDIR}; \
|
||||
( echo "@override_prefix /usr/src" ; \
|
||||
|
||||
Reference in New Issue
Block a user