From nobody Mon Mar 10 18:15:54 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 4ZBQ7H0crqz5pRt0; Mon, 10 Mar 2025 18:15:55 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZBQ7G4m38z3pSs; Mon, 10 Mar 2025 18:15:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741630554; 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=tNTmDCGdkZ1C91xTaJCTnoiD+tJeVXXqNz2XSjpmLz4=; b=PB9PHzdKIgGAz8d3fHEAhHLE4XNnv6/onreBQT6FKQzRy5ROmn+9JtykLAfxH79po/jQJf Nqm4ljJMBJgiPa4esbiEf6sYUx9wQmA0uw3oNdJlR6P+/D34Ga/lnhuagfnqF59gnvQ7GK BphSVOkAEDdibSmatANgpQn1c8pTLkdLE3uclELVGgjrQcOJk5kFnlpqRfLuCtN7BeU8VE 2H92mXUyfBbqQaxFC8ufxq3O6EUTmtXK4pxM0olTJMLvTtDSL4edKKtT+yBKY74WR29LgR K0pf9GdgN/56nXo9F6Ix+bEO/I22Mnsflb3BCHBjr91kueM8hujg8GV3NAHhUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741630554; a=rsa-sha256; cv=none; b=RqVb8sNrvHdMTbdEBpFgG917NY9+Odmqqz0N4gM9QAdglB5aHQOIWaY6tzrPThl7Jknb+E pOiisaGMR/Xr8CICMAjyBjqIuXzFHJ8Eaq44CAIVDEX9RLAZrPyCHUsTvEp/W8ktcUsF2e inxobcKgxC3QlV6o8RzNHuulOtJgcSIpePpbF11v8mzMDShgSMxBtn0SfArewIFEcRDegI HOxhZF/4omfPTo1iKNI+SVc/XF2gRavFHcwbgqCNeG67AUN60o7bHI8VAqVDvyawxc/fK/ n01NB/KoR1iD0GrLgUBl+4qVxHBPOGp5AQ+GTW+BLek45i6++ipaGxA7tsOhcQ== 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=1741630554; 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=tNTmDCGdkZ1C91xTaJCTnoiD+tJeVXXqNz2XSjpmLz4=; b=G29AjkFizPM0T9xrN4jMmYTuW610cD2X13xfkPKfeDXlKkCOKHx1py1SCnck4l1y1v3zKT iDfMomy8J+KJ2It2hj67H9d23D5znaHClgI63k5GJc3GHp0+5tUMwB6HyX34wYh9SOlHkC w3QFkRG/+eFJxu/c8rvjmV+KEhRl6CB+5idhQNxVL0h609V1moJVhIxsNJRTSvj8R90jgw MlFDmUlR9OshvgYCQ8TC9DpHtOC29CQ5zhIkQDRqFrzlUq5L4siwXCJs8lvWhf0Qd3Ezcr 9SuD7GWz3oc72ahI1SffhDdn07fTw+9f+5vNVjY28xKSBuAV8gQWVk3t/n1l3A== 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 4ZBQ7G4LJGzrJT; Mon, 10 Mar 2025 18:15:54 +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 52AIFsQW002557; Mon, 10 Mar 2025 18:15:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52AIFsT4002554; Mon, 10 Mar 2025 18:15:54 GMT (envelope-from git) Date: Mon, 10 Mar 2025 18:15:54 GMT Message-Id: <202503101815.52AIFsT4002554@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: 2fa091dcfb2b - main - Makefile.inc1: packageworld: remove non-NO_ROOT cases 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: 2fa091dcfb2b973704aeb25fd8b0499f638f8114 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2fa091dcfb2b973704aeb25fd8b0499f638f8114 commit 2fa091dcfb2b973704aeb25fd8b0499f638f8114 Author: Ed Maste AuthorDate: 2025-03-10 18:15:10 +0000 Commit: Ed Maste CommitDate: 2025-03-10 18:15:44 +0000 Makefile.inc1: packageworld: remove non-NO_ROOT cases The packageworld target requires NO_ROOT to be set (and there is a check that this is the case). Remove the now-unused non-NO_ROOT cases. Reviewed by: brooks, bz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48590 --- Makefile.inc1 | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 9cd4d3b63cae..3569d068095c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1568,28 +1568,16 @@ distributeworld installworld stageworld: _installcheck_world .PHONY packageworld: .PHONY .for dist in base ${EXTRA_DISTRIBUTIONS} -.if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ ${TAR_CMD} cvf - --exclude usr/lib/debug \ @${DESTDIR}/${DISTDIR}/${dist}.meta | \ ${XZ_CMD} > ${PACKAGEDIR}/${dist}.txz -.else - ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - ${TAR_CMD} cvf - --exclude usr/lib/debug . | \ - ${XZ_CMD} > ${PACKAGEDIR}/${dist}.txz -.endif .endfor .for dist in ${DEBUG_DISTRIBUTIONS} -. if defined(NO_ROOT) ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ ${TAR_CMD} cvf - @${DESTDIR}/${DISTDIR}/${dist}.debug.meta | \ ${XZ_CMD} > ${PACKAGEDIR}/${dist}-dbg.txz -. else - ${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \ - ${TAR_CMD} cvLf - usr/lib/debug | \ - ${XZ_CMD} > ${PACKAGEDIR}/${dist}-dbg.txz -. endif .endfor makeman: .PHONY