git: c8856795d378 - stable/14 - pkgbase: Make src package creation recipes more precise

[Mark Johnston]

The branch stable/14 has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=c8856795d378ccb839c9f201aeeffb8586c59e96

commit c8856795d378ccb839c9f201aeeffb8586c59e96
Author:     Mark Johnston <ma...@freebsd.org>
AuthorDate: 2024-08-19 15:22:03 +0000
Commit:     Mark Johnston <ma...@freebsd.org>
CommitDate: 2024-09-20 11:39:16 +0000

    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:  d7d5c9efef03 ("pkgbase: Let source packages be built in parallel")
    Reviewed by:    bapt, emaste
    Reported by:    Mark Millard <mark...@yahoo.com>
    Differential Revision:  https://reviews.freebsd.org/D46320
    
    (cherry picked from commit d02dcf21eea3973a714294b011537c2af6c747fa)
---
 Makefile.inc1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 28d1a9d76056..605b8098b742 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2096,7 +2096,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" ;  \
@@ -2123,7 +2123,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" ; \