From nobody Wed Apr 17 05:44:05 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 4VK8wj2GYXz5HvJL; Wed, 17 Apr 2024 05:44:05 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VK8wj1NTtz4lmZ; Wed, 17 Apr 2024 05:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713332645; 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=UQq0qFHWHk3XA7cpQzH5t2nMk4Q9Dm6wNs1ylpox7bc=; b=YzOia7g6XNqpAXrfuLeNHxH8D7s5riufszF5Ng7yI2kQGuzw1aR+ArVOk2StjUwdeBzie3 KL/iEYjtmJIWU/cRjxhDxyjmvA+eu76Nu35T9FbzOXrVBqDgkUnM4mgbZx8phRHO79T0c2 JuVh/7IuHc39jrFAZk7IT8Y0LCRMsm36yBJGyaEWYwnJPfv2CMSdh+aFnV8F8BNSxwjBaO 3pqCzhgebdH9wGey7wQ6lzwOvPk5+qGertYyeFkucMWahpVtkETe88fChgWQueJgvnb9zN yPrCo3qfqbW/YSCS2IiU1JTFtxVOiyuCOr1xSyPU7ACy5Y85BsPRLnh2g6B+QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713332645; a=rsa-sha256; cv=none; b=CSR3H7/Zzj9jI0Vxngq5c3HSqDSwkiJkRVZB6yphGae9BYZNP1FwJWyFkQ3dkhZBduVozc YkbHaj+4//SH1rm5TCI6+ftDcBTLxP/g0eUrauYfCK8cLPO1pa6nZn49+TrUKJJS5LtJzs HGBoK7Rg+3MohmRqEwRV+zZoQ+BfI9Hm9MTBqBqgy1kJlPZmup1MWqv2w7qfkC30TsLqlb KafxGiVvdMZSWGhEtkBcXcIhrDmRs6pLWBe3QIeW1g93pZUWyoyuDGO19NeGhFjCpZ6vVq vpi3Js4UsLGGw4vlnJqrbaXMDcEhcW5mygcBuX/Dlb9r02CPjuhnLoHW/DTenQ== 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=1713332645; 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=UQq0qFHWHk3XA7cpQzH5t2nMk4Q9Dm6wNs1ylpox7bc=; b=wQPsv5n0xzUfX8b6gvk7LUxklADaLJeYvGXZzcY79eS+JegmIjIhmeQ5pCPeapd5vxZzYT ZQind3AhUhO7KzC75ws47A+QfjVZn1al4LgZ/LXlalfl76qocWseL2jsuqkuglJTfq6VwB 4qQoC+UVi8+4G0cbAm9UGnUVpMK3yb0YOKY6eO279cW0cgYY9UGA3rXyo3MPxB57KTfLyJ 9Le95sD+7m6Q1A2JW/xgYV9ZPnT834yfMEMznIOfksngJrpCSJfk8335Hrvsbc8sQLRRrq VEF9vIwN7m38jSvoSmJXh5h2a1BViGtDazh+LNbv60PKj6XqgaqKnHUhr9imiQ== 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 4VK8wj10tJzDx2; Wed, 17 Apr 2024 05:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43H5i51D007188; Wed, 17 Apr 2024 05:44:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H5i5KD007185; Wed, 17 Apr 2024 05:44:05 GMT (envelope-from git) Date: Wed, 17 Apr 2024 05:44:05 GMT Message-Id: <202404170544.43H5i5KD007185@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: f1c7e9bc7233 - stable/14 - release: Build dvd image before staging pkgs 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f1c7e9bc72336602e4a147757488794f139f8510 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f1c7e9bc72336602e4a147757488794f139f8510 commit f1c7e9bc72336602e4a147757488794f139f8510 Author: Colin Percival AuthorDate: 2024-04-14 22:31:26 +0000 Commit: Colin Percival CommitDate: 2024-04-17 05:43:27 +0000 release: Build dvd image before staging pkgs This missing dependency is only visible with -jN (which was otherwise broken until recently) and only when building DVD images (which aren't included in weekly snapshots and thereby slipped past testing). MFC after: 3 days (cherry picked from commit 567cbd8ff1c4edc1f2015ec4f93608aaf5a3c546) --- release/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index 7b658bb90b29..ba9499ac5a3f 100644 --- a/release/Makefile +++ b/release/Makefile @@ -300,7 +300,7 @@ packagesystem: ${DISTRIBUTIONS} sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST touch ${.TARGET} -pkg-stage: +pkg-stage: dvd # TODO: Support for -DNO_ROOT .if !defined(NOPKG) || empty(NOPKG) env PORTSDIR=${PORTSDIR} REPOS_DIR=${.CURDIR}/pkg_repos/ \