From nobody Mon Aug 19 14:37:37 2024 X-Original-To: dev-commits-src-main@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 4WnZv63yMyz5T8Lv; Mon, 19 Aug 2024 14:37:38 +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 4WnZv60CT9z4v4t; Mon, 19 Aug 2024 14:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724078258; 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=i0pBNnJsd5OHy0W4/d5dJp10eeP4/6c1k57Grxo61FQ=; b=wXYMM+IBeQ1Rb0d6U5Q/0Hs2nqe4Aw8pKXRXv1mEf8RunI37ged0Z9hq/NRqjjN4czC+kf MTO3PJLxFs+uDHo0twbQy0sdI8Sf+TJ7hUDarofmEpxTgbKflft01aNey8lpC3HriRpSpl jAs88Ep/tyubpBhDSAl9gPKW8/Av6IZZbE8ozHpPNMC/ZmidOfrzLGSsVPjbxk2uvr7vF2 Qd9032ZTiozAUQ4qZXDOYzEWxiFPmGvnSD4PkWjg4k0JteAw04EXqT2G0R0ds92oZFW/CF ir0PnLF5Ce3sG+DL9x7OmlsFRNDIefAC5zuhzvf/jsRE5h5EArjOGNskgY9+vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724078258; a=rsa-sha256; cv=none; b=NQaJLMOkYclVrceXyySKOf1udf6QEPOSVz1vKo7wqR0sNyrQMJYHxSvBb4x9J1r+gp83q7 HsMc/4y8jLHm2PbhYlkF2yzDK9Per/e+9HPppy+Qxsk1pmMgsV90/rM2wOgnx90+Tx2StF WKO13gpu8HTRb83omTqSA/qGboMF79IAGTHOR/FP77RSSJ5CF2OjcMlg57bOn6Q6vK5Ljh T02lJu/7EmHxDvvEsnKsutrS9T0eodb2u7wR8HTbLXn3XUTQJkfXZ2SYZVgec/joZnZ/jn NqXAse3DkAH0E2S5GBZq3YLq6POX35tocr5qiGoYcjN//oxkOw1dqphwCkgBhA== 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=1724078258; 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=i0pBNnJsd5OHy0W4/d5dJp10eeP4/6c1k57Grxo61FQ=; b=RQrN2ttv8V4nmEzj3HguaXgXyCO5gZfiGUiQbus60Fwc2V669L2lzDi83u+DNdkvHk+81p 92llCiKtKk85PzBqqMkEZ3ehjUjwJKpfXMHEowDUHMSDOL9JDaVRX9xdYvIs6E5vIg0pEH qCQC2uw6M4fi88iaF5ln6aIWPCli1tBy0EdjgDhpbRwcKuiWlBRNddViPpaRxhfoOptFER QSEQXZgKHGKH0smpzTc5uXPUTZ8GddA5yLgpPtG/XoqNcGoGlQ0gKJN7WYH91Ff9o2lCfw BdZFw2REGu9va2Ek4EOj9zl8F/7ju7mPzDJvjsnKXwWlkrQKY962xp6v+izeIg== 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 4WnZv56Y0gzLRT; Mon, 19 Aug 2024 14:37:37 +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 47JEbbip094012; Mon, 19 Aug 2024 14:37:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47JEbbT8094009; Mon, 19 Aug 2024 14:37:37 GMT (envelope-from git) Date: Mon, 19 Aug 2024 14:37:37 GMT Message-Id: <202408191437.47JEbbT8094009@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: d7d5c9efef03 - main - pkgbase: Let source packages be built in parallel List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: d7d5c9efef031aa11a841d1836f7c937dcbe4ec8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d7d5c9efef031aa11a841d1836f7c937dcbe4ec8 commit d7d5c9efef031aa11a841d1836f7c937dcbe4ec8 Author: Mark Johnston AuthorDate: 2024-08-19 14:08:05 +0000 Commit: Mark Johnston CommitDate: 2024-08-19 14:37:27 +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 --- Makefile.inc1 | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 62296134f7d8..4df7f1900cf4 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2119,17 +2119,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" \ @@ -2141,6 +2137,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" \ @@ -2152,13 +2164,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} \ @@ -2168,6 +2173,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} ; \