From nobody Fri Dec 13 17:09:56 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 4Y8wnK26Ztz5gqWM; Fri, 13 Dec 2024 17:09:57 +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 4Y8wnK15bJz45TY; Fri, 13 Dec 2024 17:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734109797; 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=rdN95eZ1XyJemA2Zi4187PEP1on8yUNutmkiRe2SOa4=; b=eWVn+D9dje+VQW8j5Y8vf6LCjArp51GLEoUuyehqnHZuQpqwaiyIiuXNRajXQ6b3laMU3u dBN8jyt5KclVmk8WLVt4ZO5abwHpVKL/oIZx7WYpnXk4aIJ8u52owhxRc/kNcyIU5rnnJj UiWS/5pz1xsc+de+4DRJ7K3Ci61vEd6wolU9LTl2xTUgAZE8wrEY9aYKSN64HPv4qi5kBz Ajo8HDo2AhjiG7Qgf4rdjUuZCcKZNwK/VtUT4y4sCvKNzuoGR97efdflbDF6Vie06RtskG 44agwMVRoyH8CP6vUt1x+0+Cy0EHYtVayQLk+SLqCIZimqaFwv38tx54HrRAWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734109797; 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=rdN95eZ1XyJemA2Zi4187PEP1on8yUNutmkiRe2SOa4=; b=pFGy97chsUYGbbM/0ROrHFMZ+vXHnLJ5Ha78K6FyO6e+dIvgQs0m7VGKoqYOj5hIGMXnFz 2mnTcjnVWhH5vnlNjtis/cNzhMkAq18DS/gSS+sIa/8z5j4unyY3n1+gjwUjsPA9nGydL6 X7LsV2O4ckrIsMHufDGZp+Su9cIcDlMoKwtSjz99Y886Sz+VgINajRfBu3Oloz+qPPpVQP 93iH2SYwmrA0nTdsXyI6flijFP6xHKiaJ+IkCxCJgFDC8LD+0TrKznZYfiBWk6/yAcEKv7 1XpG4hve6TTH17yIRDBwkajH1cB+0EdKN8N6ywo/kUnbO4HixrAfaRp5eykUaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734109797; a=rsa-sha256; cv=none; b=i9pMcI8+ZxAPXHj1ZkusbVOvf9FXHjTz2k1prj2BhJkqwddF1bwpoPJLwFHri4Uex7Ubik M56SI95sOR2TAyR5SUjKmU5TVm0XGOa05bm3P317vRMrlmgWebS5X9grPdJdvppR3VCC/z ifOjDDi+QepCRIHG9mSkate7Zf3n3D6iMc8BOLoAEmyxunBDqwyUQViU+wqxlO0psRJnmm GGNNPocnZv9xZkRtCMj5AncwBZLwFuC57IcDbhpBSQ3/RDFzKBFSjB2xRyCxnm84eeG3RE edqcfcrSWM6Am5xXnUQQE61QYDos5HNaoE5/EdynkgWI1QvG//oZWghmsNz4oQ== 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 4Y8wnK0ZbZzm9J; Fri, 13 Dec 2024 17:09:57 +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 4BDH9u5E060564; Fri, 13 Dec 2024 17:09:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDH9u1b060561; Fri, 13 Dec 2024 17:09:56 GMT (envelope-from git) Date: Fri, 13 Dec 2024 17:09:56 GMT Message-Id: <202412131709.4BDH9u1b060561@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: 41adc5f29ba6 - main - release: Always use NO_ROOT for distribute* and package* 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41adc5f29ba6955e09f46e4d2c25da6fcd263ba2 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=41adc5f29ba6955e09f46e4d2c25da6fcd263ba2 commit 41adc5f29ba6955e09f46e4d2c25da6fcd263ba2 Author: Ed Maste AuthorDate: 2024-12-12 01:36:15 +0000 Commit: Ed Maste CommitDate: 2024-12-13 17:08:01 +0000 release: Always use NO_ROOT for distribute* and package* We used to have two different code paths for generating release media dist sets, one which expected to run as root, and one which did not. It was possible that the two different paths could generate different results. We can use the path that does not *require* root also when running as root, so use it always. We'll want to do eventually do the same for all release targets, but these ones are an easy place to start. Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48041 --- release/Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/release/Makefile b/release/Makefile index ee2f52ad56af..6b05b986318d 100644 --- a/release/Makefile +++ b/release/Makefile @@ -132,26 +132,24 @@ clean: beforeclean base.txz: mkdir -p ${DISTDIR} - ( cd ${WORLDDIR} && ${IMAKE} distributeworld DISTDIR=${.OBJDIR}/${DISTDIR} ) + ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT distributeworld DISTDIR=${.OBJDIR}/${DISTDIR} ) # Bootstrap etcupdate(8) database. sh ${WORLDDIR}/usr.sbin/etcupdate/etcupdate.sh extract -B \ -m "${MAKE}" -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \ -s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate" \ - -L /dev/null ${NO_ROOT:D-N} -.if defined(NO_ROOT) + -L /dev/null -N echo "./var/db/etcupdate type=dir uname=root gname=wheel mode=0755" >> ${.OBJDIR}/${DISTDIR}/base.meta sed -n 's,^\.,./var/db/etcupdate/current,p' ${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate/current/METALOG \ >> ${.OBJDIR}/${DISTDIR}/base.meta rm ${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate/current/METALOG -.endif # Package all components - ( cd ${WORLDDIR} && ${IMAKE} packageworld DISTDIR=${.OBJDIR}/${DISTDIR} ) + ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT packageworld DISTDIR=${.OBJDIR}/${DISTDIR} ) mv ${DISTDIR}/*.txz . kernel.txz: mkdir -p ${DISTDIR} - ( cd ${WORLDDIR} && ${IMAKE} distributekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) - ( cd ${WORLDDIR} && ${IMAKE} packagekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) + ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT distributekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) + ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT packagekernel DISTDIR=${.OBJDIR}/${DISTDIR} ) mv ${DISTDIR}/kernel*.txz . src.txz: