From nobody Fri Apr 21 05:14:19 2023 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 4Q2jPV2pcxz4771G for ; Fri, 21 Apr 2023 05:14:22 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q2jPV19Nhz3pjZ for ; Fri, 21 Apr 2023 05:14:22 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-3f193ca059bso679715e9.3 for ; Thu, 20 Apr 2023 22:14:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682054060; x=1684646060; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2zhPtCjxNX8cbyYreW86PRgFlX+CNQj6DU7h3IMkpaY=; b=jtFAqrv0zFQ06Dc4VYA2MHS/kva4dBC4gVoGeJ60WDNFESVuDk4iNxGILB6PBQidMO xyOML1dAj3/vbWQLhqUA9CChNg7x2/HKt3HEmmBMmi+1Dbvdo4o+kz+EDiE3fgIlvZ6L 46gNoklw52LrepWqCZjJ/J0Qao4H20y9kn5z8MCvlmObkF2Gt1RXLs04QRgK0UurIJoJ fBtqIJXV+dP/R5CkzX2sMsSjGtmH7e+LKsJ+cnXnA8SZrs2IN/ctIIE4fx0oQeVrk/Ka fOezAhG22qRP4DYl2tK7Ufn7Fkq4q1jEhxZUgjZOX/7hthcWECRR0U06WJxWMm7OCGPn YuSQ== X-Gm-Message-State: AAQBX9elohNDwd4YXnkiuk7aqlfdijuwsKPdZXPez8+auCmmYd7XLSU2 gWrBDn+vVkfb5n2pBR0djNj41uvAWQ4VPMY/6d+YOw== X-Google-Smtp-Source: AKy350aI4lgZDDpkA7mjfmlfZN/3CSm55ZzuFMVRTXQW0eYJOp5xjtrHp7gCDj2WB8e0j9o/uoqM1A== X-Received: by 2002:a1c:7c03:0:b0:3f1:72ec:4020 with SMTP id x3-20020a1c7c03000000b003f172ec4020mr803768wmc.1.1682054060555; Thu, 20 Apr 2023 22:14:20 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id g9-20020a05600c000900b003f0aa490336sm7076890wmc.26.2023.04.20.22.14.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Apr 2023 22:14:20 -0700 (PDT) Content-Type: text/plain; charset=utf-8 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Subject: Re: git: 0c3627f44d49 - main - bsdinstall avoid subdir depending on parent From: Jessica Clarke In-Reply-To: <202304210501.33L51PBT011707@gitrepo.freebsd.org> Date: Fri, 21 Apr 2023 06:14:19 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <09DDC25F-63F8-440A-A674-31F190C087B4@freebsd.org> References: <202304210501.33L51PBT011707@gitrepo.freebsd.org> To: "Simon J. Gerraty" X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Rspamd-Queue-Id: 4Q2jPV19Nhz3pjZ X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 21 Apr 2023, at 06:01, Simon J. Gerraty wrote: >=20 > The branch main has been updated by sjg: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D0c3627f44d49b460d5b9156145dec9d4= a91beb2c >=20 > commit 0c3627f44d49b460d5b9156145dec9d4a91beb2c > Author: Simon J. Gerraty > AuthorDate: 2023-04-21 05:00:40 +0000 > Commit: Simon J. Gerraty > CommitDate: 2023-04-21 05:00:40 +0000 >=20 > bsdinstall avoid subdir depending on parent >=20 > When not doing tree walks, it is bad for sub-dirs to depend on > parents. Move the generation of opt_osname.h to distextract > and have others that need that depend on it. >=20 > In usr.sbin/bsdinstall use SUBDIR_DEPEND_ so tree walking still = works. >=20 > Reviewed by: obrien > Differential Revision: https://reviews.freebsd.org/D39742 > --- > usr.sbin/bsdinstall/Makefile | 9 ++------- > usr.sbin/bsdinstall/distextract/Makefile | 11 ++++++++++- > usr.sbin/bsdinstall/distfetch/Makefile | 2 +- > usr.sbin/bsdinstall/partedit/Makefile | 2 +- > 4 files changed, 14 insertions(+), 10 deletions(-) >=20 > diff --git a/usr.sbin/bsdinstall/Makefile = b/usr.sbin/bsdinstall/Makefile > index e71cae726536..aaa006694222 100644 > --- a/usr.sbin/bsdinstall/Makefile > +++ b/usr.sbin/bsdinstall/Makefile > @@ -3,19 +3,14 @@ > OSNAME?=3D FreeBSD > SUBDIR=3D distextract distfetch partedit runconsoles scripts > SUBDIR_PARALLEL=3D > +SUBDIR_DEPEND_distfetch =3D distextract > +SUBDIR_DEPEND_partedit =3D distextract > SCRIPTS=3D bsdinstall > MAN=3D bsdinstall.8 > PACKAGE=3D bsdinstall > -GENHDRS=3D opt_osname.h > -SRCS+=3D ${GENHDRS} > -CLEANFILES+=3D ${GENHDRS} >=20 > SCRIPTS+=3D startbsdinstall > SCRIPTSDIR_startbsdinstall=3D ${LIBEXECDIR}/bsdinstall >=20 > -opt_osname.h: .PHONY > - if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then = \ > - echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ > - fi >=20 > .include > diff --git a/usr.sbin/bsdinstall/distextract/Makefile = b/usr.sbin/bsdinstall/distextract/Makefile > index 6ae9bb65e8fb..0292c01e78f4 100644 > --- a/usr.sbin/bsdinstall/distextract/Makefile > +++ b/usr.sbin/bsdinstall/distextract/Makefile > @@ -2,9 +2,18 @@ >=20 > BINDIR=3D ${LIBEXECDIR}/bsdinstall > PROG=3D distextract > -CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/.. > +CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I. > LIBADD=3D archive bsddialog m > +SRCS=3D distextract.c >=20 > MAN=3D > +GENHDRS=3D opt_osname.h > +SRCS+=3D ${GENHDRS} > +CLEANFILES+=3D ${GENHDRS} > + > +opt_osname.h: .PHONY > + if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then = \ > + echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ > + fi >=20 > .include > diff --git a/usr.sbin/bsdinstall/distfetch/Makefile = b/usr.sbin/bsdinstall/distfetch/Makefile > index 0104df0e3aec..1555719dd15d 100644 > --- a/usr.sbin/bsdinstall/distfetch/Makefile > +++ b/usr.sbin/bsdinstall/distfetch/Makefile > @@ -2,7 +2,7 @@ >=20 > BINDIR=3D ${LIBEXECDIR}/bsdinstall > PROG=3D distfetch > -CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/.. > +CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib = -I${.OBJDIR}/../distextract > LIBADD=3D fetch bsddialog >=20 > MAN=3D > diff --git a/usr.sbin/bsdinstall/partedit/Makefile = b/usr.sbin/bsdinstall/partedit/Makefile > index 96c4ddb53961..df17028eab2a 100644 > --- a/usr.sbin/bsdinstall/partedit/Makefile > +++ b/usr.sbin/bsdinstall/partedit/Makefile > @@ -5,7 +5,7 @@ PROG=3D partedit > LINKS=3D ${BINDIR}/partedit ${BINDIR}/autopart \ > ${BINDIR}/partedit ${BINDIR}/scriptedpart > SYMLINKS=3D ../libexec/bsdinstall/partedit /usr/sbin/sade > -CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/.. > +CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib = -I${.OBJDIR}/../distextract Surely this is a sign that this is a worse solution? The header isn=E2=80=99= t a part of distextract any more than partedit, so this is entirely arbitrary. It also blocks the ability to do the subdirectories in parallel with each other. I would much rather this reverted; this feels like a regression to me, with the only justification being that it =E2=80=9Cis bad=E2=80=9D, = according to your commit message, but so is this, and I would argue it=E2=80=99s worse. Or go put it in its own common directory. Jess > LIBADD+=3D geom util bsddialog >=20 > PARTEDIT_ARCH=3D ${MACHINE}