From nobody Mon Aug 19 15:59:32 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 4Wncjc68kfz5TGcJ; Mon, 19 Aug 2024 15:59:32 +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 4Wncjc5W2kz47CV; Mon, 19 Aug 2024 15:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724083172; 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=U2xmjNopwj+V6UyMwY71zSJF4D7mx7jcINOcM4rk/IE=; b=gGxaiWBVT+yLggvlM1BeId026KE+Fid0Uqiii9byRA3x6gRtqHWiD4RZEXWg0HO1kCSM6J Y2uKcIeNe480ScDne+5gc002OTj5YqmNu9PBNr9J6u5fSUZ06e+QcJh18KjWJwbbcS4L6y epIZBy0cSTmln10m2MLGDwKV1ekdf5zvt2Yqvl6gO2k6v2gXYKf0Dejf4JJs9EnjQ0QdTf Gwgeabity8ReKMFtuHxRP0Wg8mJl79vHFyOHa0/n5GjyyYKzcO3QMblXLho+ba0bAQIHTC IPDEaNvlM1paM7rkL1flFFKpWkJEAdiQKA7ovrGhtrdeerYC4zorkIKvi2ZKtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724083172; a=rsa-sha256; cv=none; b=Ula/Ao4sFrQiHns5hIF49oRW7f0f4IjgQb0QYaoGYCqa5dew+pSdzN4erEBSWmhd3aIvPH GcMOlWU5Zr3ssw4WSfug6Ir+icDYhFRzzIZedJmQQuQPMG674yoTwi2FZiLkUy0x69dnyz KcFKx/1XT869VYQzXkTovM5xrvwSnddI7PvHp/UKe0S5/1hdgmDMWlL4c99NqUuqfgEVFr 3v4qXEVl78pVpQ9jx2NjE1m9tQnofOjclcKE/sZlR8rVb1dvRV58KT8UYaZ0HbhxTWK2u3 y7WZuJ1Ff9JwaSlJCsatSkpNjmXZ14TkQcfiNkDH0VtuMmr2TB3tzQMRlPwbKg== 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=1724083172; 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=U2xmjNopwj+V6UyMwY71zSJF4D7mx7jcINOcM4rk/IE=; b=RvkcEmRUa8meo4MffyP16DqcFuhDdXIK311wJm6cWnHeMc5Vli0yyRBV2EhoebQups98tT BHvKB4nOh17qzAujPTVUUi3uv/hpzmiG1WJbOkJ7fBbaPYf3LpRsYR5+HH9Ii9UNcXn88Q m3b8qaEJDhmDkp3hX0Ebr5q57bDvjw00BzQloImtQTbgW4H+M6QwJH7Qf1wbt2Kb/YHK7D xob65eISl9Covk8aBwvOqNeO9tJeYj48UQ0ho9msw3qNe2VZcV/kOBptglINxM+/x8tbRT IO1fm5zs6lFeEEAbWaBP/LKTzAfD7v+BcJN4UUCL5sp3/O7ThHWCBHBLdHdcgw== 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 4Wncjc42ddzN5T; Mon, 19 Aug 2024 15:59:32 +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 47JFxWHm030605; Mon, 19 Aug 2024 15:59:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47JFxW2Y030602; Mon, 19 Aug 2024 15:59:32 GMT (envelope-from git) Date: Mon, 19 Aug 2024 15:59:32 GMT Message-Id: <202408191559.47JFxW2Y030602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d02dcf21eea3 - main - 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/main X-Git-Reftype: branch X-Git-Commit: d02dcf21eea3973a714294b011537c2af6c747fa Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d02dcf21eea3973a714294b011537c2af6c747fa commit d02dcf21eea3973a714294b011537c2af6c747fa Author: Mark Johnston AuthorDate: 2024-08-19 15:22:03 +0000 Commit: Mark Johnston CommitDate: 2024-08-19 15:48:12 +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 --- Makefile.inc1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 4df7f1900cf4..5400cb5e734a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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" ; \