From nobody Thu Dec 07 01:04:10 2023 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 4Slwyw2bqlz53JRP for ; Thu, 7 Dec 2023 01:04:24 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 4Slwyv268Fz4Slj for ; Thu, 7 Dec 2023 01:04:23 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-3332ad5b3e3so381577f8f.2 for ; Wed, 06 Dec 2023 17:04:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701911062; x=1702515862; 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=c8loRZwMEjJLiPdBj0fp4nf2weHJgOfaIoz27tyZDKg=; b=Ei7p2BoHUeV0CHuNivPLO1C8n3nqqupx6duxErTqafD0aPF+bZlLceM0LSXJf9x3/6 mB2B0dJpRQ8jtNHyhPuQ+uz+PB5/AshX+FR/ZvSlSparDR3/iWxAevjnjmG0mwkDwgC3 q4+4NrZqVi0mPM3Xx9apiIuxj9yxNwsJEucsO2akQn3KrzCe8632pAi7hKR0KFhRH7E+ QYy8xCtTtn9u/aDSXAKQq2AArrTuKl/qJ09lfvYJBVTCVhZmQZHVOY3EfJZtRyXUZr3J 2EmysK6n1w6qNHVz9nsfzMna1fXayapEX5nOqq18t7xqPBR+Jit3iL8htZMfJD8JL/kr sNHg== X-Gm-Message-State: AOJu0Yz9p/z3zp9ndBGJpZd87gEwTdSF3gVCk6O5+XqydYa4ESWKNlf9 nDpDqx/PqGs6FqY33os1YtrLNC/rDCd4RAvMRBw= X-Google-Smtp-Source: AGHT+IE6o1RfG4Bn6aOytM4ejmzlqrEjEp8Y0nxu1QR2GcdUNpHV+l2kONvueJVtbWWQB1XNUHhZng== X-Received: by 2002:a5d:570f:0:b0:333:533d:9ce2 with SMTP id a15-20020a5d570f000000b00333533d9ce2mr1192586wrv.82.1701911061283; Wed, 06 Dec 2023 17:04:21 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id dd15-20020a0560001e8f00b00333590f3bf9sm93191wrb.19.2023.12.06.17.04.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Dec 2023 17:04:20 -0800 (PST) Content-Type: text/plain; charset=utf-8 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 0c3627f44d49 - main - bsdinstall avoid subdir depending on parent From: Jessica Clarke In-Reply-To: <69192.1701910000@kaos.jnpr.net> Date: Thu, 7 Dec 2023 01:04:10 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <86F10ECA-6011-4F3C-A287-3DB076B9C935@freebsd.org> References: <202304210501.33L51PBT011707@gitrepo.freebsd.org> <09DDC25F-63F8-440A-A674-31F190C087B4@freebsd.org> <107720F5-1196-4E6C-AABE-48285D7B18B2@freebsd.org> <69192.1701910000@kaos.jnpr.net> To: "Simon J. Gerraty" X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated 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-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Slwyv268Fz4Slj On 7 Dec 2023, at 00:46, Simon J. Gerraty wrote: >=20 > Jessica Clarke wrote: >> On 21 Apr 2023, at 06:14, Jessica Clarke wrote: >=20 > Sorry, I didn't your mail back in April. >=20 > I can move the generation of the header to its own subdir. > Does usr.sbin/bsdinstall/osname sound reasonable? > other common options would include gen/ include/ inc/ ? include sounds ok to me. osname seems a bit too specific. Thanks, Jess >>> On 21 Apr 2023, at 06:01, Simon J. Gerraty wrote: >>>>=20 >>>> The branch main has been updated by sjg: >>>>=20 >>>> URL: = https://urldefense.com/v3/__https://cgit.FreeBSD.org/src/commit/?id=3D0c36= 27f44d49b460d5b9156145dec9d4a91beb2c__;!!NEt6yMaO-gk!CduM38y2LXW3snhYZYZdt= UNWv4VGMwaMwEOIOUMDYGZMRJwin7i46yHWwp5pG_pq3GGTzT-7Czg7AA$ >>>>=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://urldefense.com/v3/__https://reviews.freebsd.org/D39742__;!!NEt6yMa= O-gk!CduM38y2LXW3snhYZYZdtUNWv4VGMwaMwEOIOUMDYGZMRJwin7i46yHWwp5pG_pq3GGTz= T_oIs2qhw$ >>>> --- >>>> 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 >>>=20 >>> Surely this is a sign that this is a worse solution? The header = isn=E2=80=99t 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. >=20 >>>=20 >>> 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. >>>=20 >>> Or go put it in its own common directory. >>=20 >> This was never addressed. Moreover, the current code is in fact = broken; >> OSNAME is not defined within distextract=E2=80=99s Makefile, only the = parent=E2=80=99s, >> so opt_osname.h ends up with #define OSNAME "" in it. I guess I=E2=80=99= m the >> first to notice that the top left of the screen says " Installer" >> during 14.0=E2=80=99s distextract. >>=20 >> I am therefore once again asking for this commit to be reverted, but >> this time because it doesn=E2=80=99t work, not just because I = disagree with the >> design.