From nobody Fri Sep 20 11:40:01 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 4X99RP4nyYz5Wf41; Fri, 20 Sep 2024 11:40:01 +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 4X99RP1KqSz4lkK; Fri, 20 Sep 2024 11:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726832401; 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=fMYY3zpSC2WEZsEvEjTRjWRlxmVNtxM/Xyn1JhRUYek=; b=Apo9Ybxf19oNeN1iWeVs6nh6JiQR3qURFFQcfjUMJk2CsumQEvtctX6ChNvlrPEMFrLEvD OJW83iqFwfAt8z9mHUyHLbTinUW0611GWLxIbdYbyCyl+wVidGZXpd84m/iFT5XDN7tSBx Oj08nWvXtJ4gRkfcNbbIAmbgVMyi+RsBoMuctMtrjatO2+xRlQJveqDG41SiL4AhF8FCp6 NwNWkVeZf1ds1Bd0CYRgEegDfsnnIQ23EXJTloSsftZEqgxV9p9a54uyuk2pqMwpVceX1R 6n+18kwLePNflwm1TfrR7cjSrlg5lSDqC+ZYqiAwrkUPSjZylWgkWeIdqP34xQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726832401; a=rsa-sha256; cv=none; b=C2D1OSJCdweDuLtywV75TIe449KMGq1c7xO8TLzHsiYZ1OygT8NUWBV+uUoqgc+yx+t8hE lnd7pZyKODE9+gJyy3y8cJG3FMTxKCnllgplQpwI7bc9r+SaBAL4wLopbp0HGfD+zN6L78 2rjXmeTHccMYNKPQIp0iA4iLxGvFFhhLtH89pkNb8TK8/6d0LQhTbhzjrPk2ITZiSdkKZC d5agz1YhZQ7/Dapa/wTly09IVF1WbTQbincyjRa1dr3rUzBdZcrZ5iF5Iw2mHIwKApTwUw 8+K1yE78uhXtCXrwzzlznko94o1Z6w9+oTrgXrBy94aHdL/gvqja6y8yNS/O8Q== 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=1726832401; 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=fMYY3zpSC2WEZsEvEjTRjWRlxmVNtxM/Xyn1JhRUYek=; b=HfvFW+OydH4+25lTVbc7+3HrnNXN2Jcvhhf1zgtRIAHYxKFxP2JzQrySLA2RftQs6mvScA qAvjN/BKlxjZwCngDejJXZcEx2+ZYZPGMOy2qadCrTTGxuCAqmMnMuv4KBi7L4uP0Qmnsb 3UOV/paxIpqVsOr2mtsHEEp3XJXMXleZEpQyfTXMW7RZpH4dRjk1M4m3cYKzyMsfyzBqgg OtpocZYPd9OyNdI6+aF0+Zl8S6NPPI4T6haq62zL0bdyTLXOynATXiH9LMEmqzkoHQWgEX nwC8xT57qq9dePDE4YoIUGzz+HWi9n2YioFk25BBRsLJ2zHYijpg2xesTdtWzw== 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 4X99RP0w6tznmS; Fri, 20 Sep 2024 11:40:01 +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 48KBe1TO006216; Fri, 20 Sep 2024 11:40:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48KBe1lN006192; Fri, 20 Sep 2024 11:40:01 GMT (envelope-from git) Date: Fri, 20 Sep 2024 11:40:01 GMT Message-Id: <202409201140.48KBe1lN006192@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: c06e1fdc7948 - stable/14 - pkgbase: Let source packages be built in parallel 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: c06e1fdc794879cce97b2d2e155e638a49558c58 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c06e1fdc794879cce97b2d2e155e638a49558c58 commit c06e1fdc794879cce97b2d2e155e638a49558c58 Author: Mark Johnston AuthorDate: 2024-08-19 14:08:05 +0000 Commit: Mark Johnston CommitDate: 2024-09-20 11:39:16 +0000 pkgbase: Let source packages be built in parallel To build the packages target, we build src and src-sys packages containing the source code from which the repo was built. These packages take significantly longer than the others, presumably because they contain many more files. Because both source packages are built to satisfy the same target, they end up being built serially. Split them into separate subtargets so that they can run in parallel. This saves a couple of minutes on my build machine. Reviewed by: manu, emaste MFC after: 1 month Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D46288 (cherry picked from commit d7d5c9efef031aa11a841d1836f7c937dcbe4ec8) --- Makefile.inc1 | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index fd35c724b965..28d1a9d76056 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2095,17 +2095,13 @@ create-packages-source: _pkgbootstrap _repodir .PHONY create-packages: .PHONY create-packages-world create-packages-kernel create-packages-source -create-source-packages: _pkgbootstrap .PHONY +create-source-src-package: _pkgbootstrap .PHONY rm -f ${SSTAGEDIR}/*.plist 2>/dev/null || : .if !empty(GIT_CMD) && exists(${GIT_CMD}) && exists(${SRCDIR}/.git) @cd ${SRCDIR}; \ ( echo "@override_prefix /usr/src" ; \ ${GIT_CMD} ls-files --recurse-submodules ":!:sys/" ) \ > ${SSTAGEDIR}/src.plist - @cd ${SRCDIR}; \ - ( echo "@override_prefix /usr/src" ; \ - ${GIT_CMD} ls-files --recurse-submodules "sys/" ) \ - > ${SSTAGEDIR}/src-sys.plist ${SRCDIR}/release/packages/generate-ucl.lua \ PKGNAME "src" \ PKGGENNAME "src" \ @@ -2117,6 +2113,22 @@ create-source-packages: _pkgbootstrap .PHONY PKG_WWW "${PKG_WWW}" \ ${SRCDIR}/release/packages/template.ucl \ ${SSTAGEDIR}/src.ucl + ${PKG_CMD} -o ABI=${PKG_ABI} \ + -o OSVERSION="${SRCRELDATE}" \ + create -f ${PKG_FORMAT} \ + -M ${SSTAGEDIR}/src.ucl \ + -p ${SSTAGEDIR}/src.plist \ + -r ${SRCDIR} \ + -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} +.endif + +create-source-src-sys-package: _pkgbootstrap .PHONY + rm -f ${SSTAGEDIR}/*.plist 2>/dev/null || : +.if !empty(GIT_CMD) && exists(${GIT_CMD}) && exists(${SRCDIR}/.git) + @cd ${SRCDIR}; \ + ( echo "@override_prefix /usr/src" ; \ + ${GIT_CMD} ls-files --recurse-submodules "sys/" ) \ + > ${SSTAGEDIR}/src-sys.plist ${SRCDIR}/release/packages/generate-ucl.lua \ PKGNAME "src-sys" \ PKGGENNAME "src" \ @@ -2128,13 +2140,6 @@ create-source-packages: _pkgbootstrap .PHONY PKG_WWW "${PKG_WWW}" \ ${SRCDIR}/release/packages/template.ucl \ ${SSTAGEDIR}/src-sys.ucl - ${PKG_CMD} -o ABI=${PKG_ABI} \ - -o OSVERSION="${SRCRELDATE}" \ - create -f ${PKG_FORMAT} \ - -M ${SSTAGEDIR}/src.ucl \ - -p ${SSTAGEDIR}/src.plist \ - -r ${SRCDIR} \ - -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} ${PKG_CMD} -o ABI=${PKG_ABI} \ -o OSVERSION="${SRCRELDATE}" \ create -f ${PKG_FORMAT} \ @@ -2144,6 +2149,8 @@ create-source-packages: _pkgbootstrap .PHONY -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} .endif +create-source-packages: .PHONY _pkgbootstrap create-source-src-package create-source-src-sys-package + create-world-packages: _pkgbootstrap .PHONY @rm -f ${WSTAGEDIR}/*.plist 2>/dev/null || : @cd ${WSTAGEDIR} ; \