From nobody Fri Jul 14 11:39:32 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 4R2TzC5y4tz2tql2; Fri, 14 Jul 2023 11:39:35 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2TzC5RPCz3jpF; Fri, 14 Jul 2023 11:39:35 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689334775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QWV9xDK772EN9RPDNtQgVB6DYPhoz6aE1YdSFH0hMIU=; b=QOaUgEGhfrUDgMkZ1soC17J0XOf7uT7EtWjpcyu6/BvthR0eVX3ffoAYkfTpVI9CuONOxr r+Brdgk98Fib3wt8KSqqfVxBOChk5zXGVRs7bVOzfBu7aTqCdBvGHgm+Po6moDre06EBGx vU4Oaha8boltOG4XaKH1GPV99V9DAaI/aoA5iC8N+B20z1zDNoeUuSWZ+u2dJPb05Z6zvL lMl34sHZN962rxAoJ/FKDYZ9sY16SuWVNUdGSkWgD6EaPymHX8s6cxOYNN5R67J/ul752n Oo7+v1RXwdydbcZPR5bIlwYZtNe7lg8SD+aptOGampmeBIJDM+ZFGI2CWdRSgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689334775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QWV9xDK772EN9RPDNtQgVB6DYPhoz6aE1YdSFH0hMIU=; b=HDNz8B2oGveKhT+n+PeIqLCWmwj+6VvqG8AszP8tOESuNe+Nxph7oWpPLLLNZ4nPl8haRw KqrbWJSw3FklxRdlS47jWOWYNCMGY34GAfyqaBbTy2Nm2SZ5YsFGLbj9jE6COwv3h+82jc JlYl9SC4/DgLc7cHUHEMuF2eRHSE5Jha+UaPc6iZ4bevKNYGKLJspOn3o4oFOSFrjvFJgv B1setnFVMTJguKELEgzhQ8BYE1lM9v2r0XeWUuB+qNinpyUgXKfEhIHMGRGhrucHt8cw4h k966ije+PJmvYnQaQnH7GrBuiAyNTz0tw3+gTwdPJEKBImLZpe1DZa5OjNecxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689334775; a=rsa-sha256; cv=none; b=j5ifddO5qNaHdLuHLZbdhXmPlkon3r1OSnikuHT9Aw9PSewKhyti7HnxKtBYNEUnjZsuuV Q8gCj+SZPyPIlj7su7pXfG3e5/gjk8jQFspAS2RJHlRyRbonP65KVkI/a+t7jGjMzNO7vj Pc5A6vlXUbN+D7tT2qv7MW6lMFpgvZrVyZsiA5aoHQgyEu2SftHn9KlkXj668Xq9QUpsC/ t/N4jc/21UTngV2y3OlPAXI41LeOGNA0EnCm9wtEgF0DTtsAd0Gyu2J8/pbWr1AI49hKyN c1PjDlLkq8s5yT8TWM8bDRj3rHCa/Zyb66dVZGX10RfmgIEV4i6bWJ+P2XPhkA== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (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 (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4R2TzC3Blkzn6N; Fri, 14 Jul 2023 11:39:35 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 0E3E28E33; Fri, 14 Jul 2023 13:39:32 +0200 (CEST) From: Kristof Provost To: tuexen@freebsd.org Cc: Konstantin Belousov , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: be78a31188c5 - main - tcp: fix build issue for some cc modules Date: Fri, 14 Jul 2023 13:39:32 +0200 X-Mailer: MailMate (1.14r5937) Message-ID: <00949E97-1098-4FC4-B5FB-9F639E93C81D@FreeBSD.org> In-Reply-To: <0C3C0CAD-523A-4A77-8942-4316DB49EF57@freebsd.org> References: <202307132031.36DKVYIK019476@gitrepo.freebsd.org> <0C3C0CAD-523A-4A77-8942-4316DB49EF57@freebsd.org> 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 Content-Type: multipart/alternative; boundary="=_MailMate_10D9FA97-377D-4FCC-A767-2224FD2A307B_=" X-ThisMailContainsUnwantedMimeParts: N --=_MailMate_10D9FA97-377D-4FCC-A767-2224FD2A307B_= Content-Type: text/plain; format=flowed Content-Transfer-Encoding: quoted-printable On 14 Jul 2023, at 13:28, tuexen@freebsd.org wrote: >> On 14. Jul 2023, at 13:23, Konstantin Belousov = >> wrote: >> >> On Thu, Jul 13, 2023 at 08:31:34PM +0000, Michael Tuexen wrote: >>> The branch main has been updated by tuexen: >>> >>> URL: = >>> https://cgit.FreeBSD.org/src/commit/?id=3Dbe78a31188c530c93700396ecfd= b5604a8f22fff >>> >>> commit be78a31188c530c93700396ecfdb5604a8f22fff >>> Author: Michael Tuexen >>> AuthorDate: 2023-07-13 16:56:25 +0000 >>> Commit: Michael Tuexen >>> CommitDate: 2023-07-13 16:56:25 +0000 >>> >>> tcp: fix build issue for some cc modules >>> >>> The TCP_HHOOK option was moved from opt_inet.h to opt_global.h in >>> https://cgit.FreeBSD.org/src/commit/?id=3De68b3792440cac248347afe08b= a5881a00ba6523 >>> The corresponding changes in two Makefiles were missed, which = >>> resulted >>> in not building cc_cdg, cc_chd, cc_hd, and cc_vegas anymore. >>> >>> Reported by: void@f-m.fm >>> Reviewed by: rrs, rscheff >>> Sponsored by: Netflix, Inc. >>> Differential Revision: https://reviews.freebsd.org/D41010 >>> --- >>> sys/modules/cc/Makefile | 6 +++--- >>> sys/modules/khelp/Makefile | 6 +++--- >>> 2 files changed, 6 insertions(+), 6 deletions(-) >>> >>> diff --git a/sys/modules/cc/Makefile b/sys/modules/cc/Makefile >>> index 3f7110024722..b595cc204481 100644 >>> --- a/sys/modules/cc/Makefile >>> +++ b/sys/modules/cc/Makefile >>> @@ -8,9 +8,9 @@ SUBDIR=3D cc_newreno \ >>> >>> # Do we have the TCP_HHOOK symbol defined? If not, there is no point = >>> in >>> # building these modules by default. >>> -# We will default to building these modules unless $OPT_INET is = >>> defined >>> -# and does not contain the TCP_HHOOK option. >>> -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} !=3D "= " >>> +# We will default to building these modules if $OPT_GLOBAL does = >>> contain >>> +# the TCP_HHOOK option. >>> +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} !=3D= = >>> "" >>> SUBDIR+=3D \ >>> cc_cdg \ >>> cc_chd \ >>> diff --git a/sys/modules/khelp/Makefile b/sys/modules/khelp/Makefile >>> index 256d8838c573..c01d61541062 100644 >>> --- a/sys/modules/khelp/Makefile >>> +++ b/sys/modules/khelp/Makefile >>> @@ -4,9 +4,9 @@ SUBDIR=3D >>> >>> # Do we have the TCP_HHOOK symbol defined? If not, there is no point = >>> in >>> # building this modules by default. >>> -# We will default to building this module unless $OPT_INET is = >>> defined >>> -# and does not contain the TCP_HHOOK option. >>> -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} !=3D "= " >>> +# We will default to building this module if $OPT_GLOBAL does = >>> contain >>> +# the TCP_HHOOK option. >>> +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} !=3D= = >>> "" >>> SUBDIR+=3D h_ertt >>> .endif >>> >> It seems modules are actually broken for some configurations. > Some problems are known and being worked on. > > Could you share your kernel conf file and tell us, in which directory > you are running the make command? > `make buildkernel KERNCONF=3DMINIMAL` will fail (on amd64). Best regards, Kristof --=_MailMate_10D9FA97-377D-4FCC-A767-2224FD2A307B_= Content-Type: text/html Content-Transfer-Encoding: quoted-printable

On 14 Jul 2023, at 13:28, tuexen@freebsd.org wrote:

On 14. Jul 2023, at 13:23, Konstantin Belousov = <kostikbel@gmail.com> wrote:

On Thu, Jul 13, 2023 at 08:31:34PM +0000, Michael Tuexen = wrote:

The branch main has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/co= mmit/?id=3Dbe78a31188c530c93700396ecfdb5604a8f22fff

commit be78a31188c530c93700396ecfdb5604a8f22fff
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2023-07-13 16:56:25 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-07-13 16:56:25 +0000

tcp: fix build issue for some cc modules

The TCP_HHOOK option was moved from opt_inet.h to opt_g= lobal.h in
https://cgit.FreeBSD.org/src/commit/?id=3De68b3792= 440cac248347afe08ba5881a00ba6523
The corresponding changes in two Makefiles were missed, which resulted
in not building cc_cdg, cc_chd, cc_hd, and cc_vegas anymore.

Reported by: void@f-m.fm
Reviewed by: rrs, rscheff
Sponsored by: Netflix, Inc.
Differential Revision: = https://reviews.freebsd.org/D41010
---
sys/modules/cc/Makefile | 6 +++---
sys/modules/khelp/Makefile | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/modules/cc/Makefile b/sys/modules/cc/Mak= efile
index 3f7110024722..b595cc204481 100644
--- a/sys/modules/cc/Makefile
+++ b/sys/modules/cc/Makefile
@@ -8,9 +8,9 @@ SUBDIR=3D cc_newreno \

# Do we have the TCP_HHOOK symbol defined? If not, there = is no point in
# building these modules by default.
-# We will default to building these modules unless $OPT_INET is defined
-# and does not contain the TCP_HHOOK option.
-.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} !=3D ""
+# We will default to building these modules if $OPT_GLOBAL does contain
+# the TCP_HHOOK option.
+.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} !=3D ""
SUBDIR+=3D \
cc_cdg \
cc_chd \
diff --git a/sys/modules/khelp/Makefile b/sys/modules/khelp/Makefile
index 256d8838c573..c01d61541062 100644
--- a/sys/modules/khelp/Makefile
+++ b/sys/modules/khelp/Makefile
@@ -4,9 +4,9 @@ SUBDIR=3D

# Do we have the TCP_HHOOK symbol defined? If not, there = is no point in
# building this modules by default.
-# We will default to building this module unless $OPT_INET is defined
-# and does not contain the TCP_HHOOK option.
-.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} !=3D ""
+# We will default to building this module if $OPT_GLOBAL does contain
+# the TCP_HHOOK option.
+.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} !=3D ""
SUBDIR+=3D h_ertt
=2Eendif

It seems modules are actually broken for som= e configurations.

Some problems are known and being worked on.=

Could you share your kernel conf file and tell us, in whi= ch directory
you are running the make command?


make buildkernel KERNCONF=3DMINIMAL will fail (on amd64).

=

Best regards,
Kristof

--=_MailMate_10D9FA97-377D-4FCC-A767-2224FD2A307B_=--