From nobody Wed May 21 12:56:08 2025 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 4b2Wd446vHz5vsXN; Wed, 21 May 2025 12:56:08 +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 4b2Wd43LqGz43Zy; Wed, 21 May 2025 12:56:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747832168; 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=4kU58ZCkVODAYxIvN6u1tqlWGLE3GY79lwGEjvc49HE=; b=BP5XdVEcJE4sPbBAMOpEVSNiVtHCpIwIF7BYa5qs8l5w3oRvDdySKRmte6PC47bSH/08Nd lHIhCxdSIs1WNw3T2kYWtZ89l5QnawRfLAbknhYiL4pgJBfKVO6RpcbKsKMh3s15/0g5Mx mHxy31aFuz6+5hPdUJ+4hsW9PgOvgvD4DP2/YdAV2utnSMEVexs2uop5DOuBX5GDGRMMpC KCgEPIHZzi7RLz2ZusTe0qivqNBxpDkrONsanmPUZXRrGeTkOgeoHS9PD0qvkk+m3z1sxP 1VQdxL4oWs2vdRGJVMyfpsohx3R7VXLWbZwBO5RvcN/DSTDLZnZBMXSCmH14xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747832168; 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=4kU58ZCkVODAYxIvN6u1tqlWGLE3GY79lwGEjvc49HE=; b=YmzJS5UPZ2gVRJMr6XkOmYMo6KpUgY+mJX9lvmT/pMzuYGb+Jj6oi/zVquKpZJK6Z/KWlm 4Kwbdmjfhg7J64yImhmfi3ipn2V61ODFTnoDUtbRqb8G3WULU+N2jvB8VXSUcF2C3f+0Il oWLredJYGtCj/6daNtk/hnHP5Ddcig/HeLwJEw5loypSPXsj41Rs7bHN0SphyO9ZtjTfBP dVrEnEZgMZNYds3W8OZDkkNGCRbSyCBAE8RrRvJ3D9s4NHxQBR2jAqTY1cpI7SB257BAMm w+U00dl24RBX+gxr/202isV6KXqG4P9H7/TgSt3J/5KYWWePDq3rphuDbnz4nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747832168; a=rsa-sha256; cv=none; b=vX5cbvfKrcQEx/jSosqutQQmRkTYX/X7VTD40UQ/qvcQeFIHlyPq9NG9Deuk5zQ33mlzQ/ +oTfuBBpj9n3StQhzycVoDbYakXQLdJN4lTbLIzK1YyQ7IShPuJb6ZpQIPMKpVwZsqIZvx zlxtLmAqo4n8temDG7NbtVZf3vVDz8qXfwpoa3a6aJ0MmuY/n7qpku5P0OCo/SLfMYxQyJ gTSxw9il8Js2PwDqBpWhJkZMADa+si86TYseoM+KwecZ5UIaPbYYdaxpoWIQJMTGdFPvvL rHBzwzUFAxocl10dUsvUnvVo82od5yWDyORLoRYjq3wwIlox7I5TpOXZYWEq8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4b2Wd42wdKzc7f; Wed, 21 May 2025 12:56:08 +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 54LCu8h9028453; Wed, 21 May 2025 12:56:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54LCu80r028450; Wed, 21 May 2025 12:56:08 GMT (envelope-from git) Date: Wed, 21 May 2025 12:56:08 GMT Message-Id: <202505211256.54LCu80r028450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 366a9fb9e731 - main - release: Add ${PKGBASE_REPO} dependency for dvd 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 366a9fb9e7311ca96eab694e5ee0aee4ad465035 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=366a9fb9e7311ca96eab694e5ee0aee4ad465035 commit 366a9fb9e7311ca96eab694e5ee0aee4ad465035 Author: Ed Maste AuthorDate: 2025-05-20 21:39:30 +0000 Commit: Ed Maste CommitDate: 2025-05-21 12:48:50 +0000 release: Add ${PKGBASE_REPO} dependency for dvd A user may build only dvd1.iso, which would fail if the pkgbase-repo did not already exist. Builds using `make release` build disc1 before dvd1 so that case would work, but it must be possible to build only one artifact. Fixes: 62d18f8c4c10 ("release: Add -DPKGBASE option to include pkgbase packages") Sponsored by: The FreeBSD Foundation --- release/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index 578df226ff49..a5f5b65a562e 100644 --- a/release/Makefile +++ b/release/Makefile @@ -279,7 +279,7 @@ bootonly: packagesystem echo "./boot/loader.conf type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG echo "./etc/rc.local type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG -dvd: packagesystem +dvd: packagesystem ${PKGBASE_REPO} # Install system mkdir -p ${.TARGET} ( cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \