From nobody Mon May 12 00:40:27 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 4ZwgkN0gGvz5wf1Y; Mon, 12 May 2025 00:40:28 +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 4ZwgkM6RVHz3wvq; Mon, 12 May 2025 00:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747010427; 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=7l3fwI4J4bL6+74gX9zJk7j3B5HRpC7VSrz3A6zlouk=; b=BhMwceAz6xN2WkhvlxZoNi+WQuOy5UL4asoKzIQasn1OpMqH1YqKCxFLAMjtN7+i+H9i7s T9rThQq4OiF2pG7MscWLGE8x2o1WGWHzxiHumr1hTHm1d8uOe+GD8jh61Oe08gNR9HfANF HMHUw8Q7ShCRvhJbOX2gh3MFLXUtFyXa6IOiW4VtUmGt50sv+VKlhQR1bTxo+w/d1LsGSx BvZOWjLZyK4peCGv4clQkuMSaR9Bl91GGV7bGPuwPhEG0iRipwv/C4L/s52dGfS7gDLScT eakBLIorxlmrw/0zBGwiq+bxHoI579cRkcAXo9Ub5/Nhi32jkKGJ+svN0gAa+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747010427; 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=7l3fwI4J4bL6+74gX9zJk7j3B5HRpC7VSrz3A6zlouk=; b=k9P+OaLH5yazX5TGBksjo3HyjVlVMQkspcM2RybgEYh1OgI/gCYfB2eF4HwrVtjUQMij7Q GghWbJ6Mz0OlmjEwQPGXFNR5PX+/dn6dSQOQJUjO70MypceALedj56YujdlcYRWT/KYhzj RWHP7FyX6bmWTkBCppKgM+4zjN5TFrB1OhzSdKcddTGLuwKiER6vuDkiPqhsTKLuE5tFXR caSNYG/mvYzd9QvVHesrgpGuN5e2WDNCblYcE5O0xoZCu88z+UXm3KNrK4QcswvQA0hDa3 PlJVjs7Vgu48wknElT0iVaUf06RFd6j54cSrSPs/1xNkvrSI8D/+dysce1rUmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747010427; a=rsa-sha256; cv=none; b=mVRP+8cj9T8RXnCe9nUWkZAFF1Ca7jCv++2pJVD6g4jL0B+KOADk/wWC80GVwAdBmKmlH2 RWgIFF/6s9+cbA40sTwv3FpkCTVQSmdGthu5KvcscUqSvi2mTM5BB1C/mcabwHNgTtvdy2 tUKx8faZm9z3qpFqQRKbraNS8gCsUyIURPvwLDRGVYwSmjm/MeeglkRmMxJrnAhGgVHj4s ADMqYiKjWcy4954ssZHyFC0zlXYme3NmgSenw4VInzp8AMaRSDWe8j2aOVrp8jMZGWiR2U A5yCXDiwlB9/egnJ2XKShOpT1VPqKKV4I0bk6gCM5drUo/uGZnLfeTNV5wahgw== 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 4ZwgkM5WVRzvKV; Mon, 12 May 2025 00:40:27 +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 54C0eREH017586; Mon, 12 May 2025 00:40:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54C0eR0r017583; Mon, 12 May 2025 00:40:27 GMT (envelope-from git) Date: Mon, 12 May 2025 00:40:27 GMT Message-Id: <202505120040.54C0eR0r017583@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: 79e70e12f5c9 - main - release: Pass -N to pkg-stage if NO_ROOT set 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: 79e70e12f5c9679139427b3c366e592b585b0ee2 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=79e70e12f5c9679139427b3c366e592b585b0ee2 commit 79e70e12f5c9679139427b3c366e592b585b0ee2 Author: Ed Maste AuthorDate: 2025-05-06 17:59:06 +0000 Commit: Ed Maste CommitDate: 2025-05-12 00:40:08 +0000 release: Pass -N to pkg-stage if NO_ROOT set PR: 283387 Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50268 --- release/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/release/Makefile b/release/Makefile index 1489ec8dc881..913fc8f2b876 100644 --- a/release/Makefile +++ b/release/Makefile @@ -321,13 +321,9 @@ packagesystem: ${DISTRIBUTIONS} touch ${.TARGET} pkg-stage: dvd -# TODO: Support for -DNO_ROOT .if !defined(NOPKG) || empty(NOPKG) -.if defined(NO_ROOT) -.warning pkg-stage does not yet support NO_ROOT. -.endif env PORTSDIR=${PORTSDIR} REPOS_DIR=${.CURDIR}/pkg_repos/ \ - sh ${.CURDIR}/scripts/pkg-stage.sh + sh ${.CURDIR}/scripts/pkg-stage.sh ${NO_ROOT:D-N} mkdir -p ${.OBJDIR}/dvd/packages/repos/ cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \ ${.OBJDIR}/dvd/packages/repos/