From nobody Tue Dec 5 22:39:18 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 4SlFpD4MMBz53YmR
for <dev-commits-src-all@mlmmj.nyi.freebsd.org>; Tue, 5 Dec 2023 22:39:32 +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 4SlFpC6Fnwz4F3j
for <dev-commits-src-all@freebsd.org>; Tue, 5 Dec 2023 22:39:31 +0000 (UTC)
(envelope-from jrtc27@jrtc27.com)
Authentication-Results: mx1.freebsd.org;
dkim=none;
spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com;
dmarc=none
Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-40c18e9d7c0so1073665e9.0
for <dev-commits-src-all@freebsd.org>; Tue, 05 Dec 2023 14:39:31 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1701815970; x=1702420770;
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=pmgGZa3EG2OQWvvVjHMd9yR/8mzuHO/8XLBzbVl6T24=;
b=Sfm1HQmSijPshaiae6J730KeXN8zpWnyEY9a+CfPHvOLgrJ7Gt5BujGLwxlnN46VXe
QhTihs6UDAdTIKnNJyvMAUkDbsVfFupfjAMgcl7/BXO4Bb8r0vfLuofxYH/NG8Izc1wh
b5Hn5AYNjzj9cipLsuauUX1XSmeDC1a7CmUZYv+xAswj3BnWDrxY2UDGGM9LopZ8qjR6
DvjclZUZNs1htD5+JHclgtmjfSdaI+Ay1jIEu/PPRdKZ45DTwnfkJP3odOvUHJoEHlAx
ZyAk40/oGEzX3CY78UY+7srwxARaZFxSmedoopAEkeHxOx5Yl0J0OGryyDlVY/Wuixwq
4DuA==
X-Gm-Message-State: AOJu0YyYg4YVHgSFdHws0xBuD3+8hABnCT3uAChBfAHSQoSj8knhtYo8
6Rf+j4gVwt1VUYKs80q6s49Pkw==
X-Google-Smtp-Source: AGHT+IEH+gNGXKwo+8mia1GwEa4qnfuq1q9eW1DOK+JCSqlAuzUGTPEtlgwdxWQPGN8vduj6R3CHOA==
X-Received: by 2002:a05:600c:2983:b0:40c:c1a:b3cb with SMTP id r3-20020a05600c298300b0040c0c1ab3cbmr25719wmd.73.1701815969744;
Tue, 05 Dec 2023 14:39:29 -0800 (PST)
Received: from smtpclient.apple ([131.111.5.246])
by smtp.gmail.com with ESMTPSA id m40-20020a05600c3b2800b004042dbb8925sm23936409wms.38.2023.12.05.14.39.28
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Tue, 05 Dec 2023 14:39:29 -0800 (PST)
Content-Type: text/plain;
charset=utf-8
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
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 \(3774.200.91.1.1\))
Subject: Re: git: 0c3627f44d49 - main - bsdinstall avoid subdir depending on
parent
From: Jessica Clarke <jrtc27@freebsd.org>
In-Reply-To: <09DDC25F-63F8-440A-A674-31F190C087B4@freebsd.org>
Date: Tue, 5 Dec 2023 22:39:18 +0000
Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>,
"dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>,
"dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org>
Content-Transfer-Encoding: quoted-printable
Message-Id: <107720F5-1196-4E6C-AABE-48285D7B18B2@freebsd.org>
References: <202304210501.33L51PBT011707@gitrepo.freebsd.org>
<09DDC25F-63F8-440A-A674-31F190C087B4@freebsd.org>
To: "Simon J. Gerraty" <sjg@FreeBSD.org>
X-Mailer: Apple Mail (2.3774.200.91.1.1)
X-Spamd-Result: default: False [-2.50 / 15.00];
NEURAL_HAM_LONG(-1.00)[-1.000];
NEURAL_HAM_MEDIUM(-1.00)[-1.000];
NEURAL_HAM_SHORT(-1.00)[-0.999];
MV_CASE(0.50)[];
FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com];
R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17];
MIME_GOOD(-0.10)[text/plain];
TO_DN_EQ_ADDR_SOME(0.00)[];
PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org];
TO_MATCH_ENVRCPT_SOME(0.00)[];
RCPT_COUNT_THREE(0.00)[4];
DMARC_NA(0.00)[freebsd.org];
MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org];
RCVD_IN_DNSWL_NONE(0.00)[209.85.128.44:from];
FROM_HAS_DN(0.00)[];
ARC_NA(0.00)[];
RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.44:from];
RCVD_TLS_LAST(0.00)[];
TO_DN_SOME(0.00)[];
RCVD_VIA_SMTP_AUTH(0.00)[];
FREEFALL_USER(0.00)[jrtc27];
R_DKIM_NA(0.00)[];
MID_RHS_MATCH_FROM(0.00)[];
ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US];
MIME_TRACE(0.00)[0:+];
FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com];
RCVD_COUNT_TWO(0.00)[2]
X-Rspamd-Queue-Id: 4SlFpC6Fnwz4F3j
X-Spamd-Bar: --
On 21 Apr 2023, at 06:14, Jessica Clarke <jrtc27@FreeBSD.org> wrote:
>=20
> On 21 Apr 2023, at 06:01, Simon J. Gerraty <sjg@FreeBSD.org> 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 <sjg@FreeBSD.org>
>> AuthorDate: 2023-04-21 05:00:40 +0000
>> Commit: Simon J. Gerraty <sjg@FreeBSD.org>
>> 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 <bsd.prog.mk>
>> 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 <bsd.prog.mk>
>> 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
> 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.
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=99m =
the
first to notice that the top left of the screen says " Installer"
during 14.0=E2=80=99s distextract.
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.
Jess