From nobody Fri Sep 20 11:40:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X99RQ6NfSz5Wf44; Fri, 20 Sep 2024 11:40:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X99RQ1xCBz4lYD; Fri, 20 Sep 2024 11:40:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726832402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dYTI+NAa3/wRcN/y1tF8+3+vLqQYm1xH/9kbXn2D30Q=; b=Lo9z9/xT2Gz24UNeU4alYA/0luXEJ+W/w0eEfBI//J0ZAeu2L7w3NKR8hENwyzLE2zClGR Fdcg9T9XIZiLEFfm/D/XVfBp+HnIqd23+tK212lE633edxxKC0rUgev+jVq0ijBERwd+f0 aMZTCnPZyzlUe0y5Apa7pz54PLlyn4RICpPANw9KD4wLn0iXJWrbyOqfcrECZKHTwA/9hz h+ddrTuiDfazUO8DloEkLJM3XXtBTedrcyS1PwXAtYgwgdaxPcCOxxVZeJ/Pcz9svrdS6E KcgeLDo8C1jnvE8x7tiqUqP0WTz6KDaow509gMf5Iv87CMHrBrUA4fzYCpfYpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726832402; a=rsa-sha256; cv=none; b=StWu8358X2bzDpJDCePFROMJjrlOltVjXduNA1ow0qSWZWgC/sKYf9HBOg1Hp2Z7NeBJ+v 2AsV9q56lkqRs+9O003J0zn9YkvHWVsS/zO9XRK/VOazTZ7YpzQ2E/TFR1mrTSP0VZaN8p QL1h9CBQieCzK+AKMREa/kD6BNJ/HrdGSQN5E41oD3LblRDLFWtFgQvfWBLAEQ5uDfM8ox xdMA3m0QuUE5TEPSo12RjB1ApUsRTrd+WGe5yRhbD0x6Nr+WXXc06MfVqLi3uXH5LkW7WS WwGhxDSeRbysDbSrw9n2+D4NjVLazkwBegDx6qGFIvuYwCC8YUHnEV3UN4IxJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726832402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dYTI+NAa3/wRcN/y1tF8+3+vLqQYm1xH/9kbXn2D30Q=; b=QrBKCMt7+mY2MYktZcy1orAu+2y/Lbci9arFryKHUxxpcpBSdqnlxGXhMhrJYCL5TcWit2 U/Z+6RVKHzNIc66UIOFBE/aquDZyiPWm76yV2eeWBY8at2ybUBD+eyKaDsoHEVsT0eZ/Wy s2cSz6CZn1/AZ+dorYkJy841ueWnjSS9ZW7WPk+mAshrnzrBQzcJlLsCE6E/Uxfmk9FxcI q1fiBXw4VzJhapN9f/+wr5LhWD4LWLy5z8IcjO5ObZ9+RUi/eKmElcCMGEcfpyGZBz2Z+V 3ln5v5D5qiTHGFIm/l6Cd1ELW7zO7sWpJLdP9OiWy/GQz2x71VcHBds7pSDSVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X99RQ1X1cznpr; Fri, 20 Sep 2024 11:40:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48KBe2oR006626; Fri, 20 Sep 2024 11:40:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48KBe20C006621; Fri, 20 Sep 2024 11:40:02 GMT (envelope-from git) Date: Fri, 20 Sep 2024 11:40:02 GMT Message-Id: <202409201140.48KBe20C006621@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c8856795d378 - stable/14 - pkgbase: Make src package creation recipes more precise List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c8856795d378ccb839c9f201aeeffb8586c59e96 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c8856795d378ccb839c9f201aeeffb8586c59e96 commit c8856795d378ccb839c9f201aeeffb8586c59e96 Author: Mark Johnston AuthorDate: 2024-08-19 15:22:03 +0000 Commit: Mark Johnston 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 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" ; \