On Fri, Jul 14, 2023 at 01:28:54PM +0200, [email protected] wrote: > > On 14. Jul 2023, at 13:23, Konstantin Belousov <[email protected]> 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=be78a31188c530c93700396ecfdb5604a8f22fff > >> > >> commit be78a31188c530c93700396ecfdb5604a8f22fff > >> Author: Michael Tuexen <[email protected]> > >> AuthorDate: 2023-07-13 16:56:25 +0000 > >> Commit: Michael Tuexen <[email protected]> > >> 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=e68b3792440cac248347afe08ba5881a00ba6523 > >> 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: [email protected] > >> 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= 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} != "" > >> +# 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} != "" > >> SUBDIR+= \ > >> 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= > >> > >> # 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} != "" > >> +# 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} != "" > >> SUBDIR+= 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?
My config is attached. I do 'make -C sys/amd64/compile/X' for this specific run.
cpu HAMMER options PREEMPTION options SMP options HWPMC_HOOKS device acpi #options IOMMU options PCI_IOV options EARLY_AP_STARTUP options INVARIANTS options INVARIANT_SUPPORT options WITNESS options WITNESS_SKIPSPIN options DEBUG_LOCKS options DEBUG_VFS_LOCKS options DIAGNOSTIC #options DEBUG_MEMGUARD options BUS_DEBUG ident X nooptions INCLUDE_CONFIG_FILE makeoptions DEBUG=-gdwarf-2 options STACK options KDB options KDB_TRACE options DDB options DDB_NUMSYM options GDB options KTR options KTR_ENTRIES=131072 options BREAK_TO_DEBUGGER options ALT_BREAK_TO_DEBUGGER options VIMAGE options INET options INET6 options SCTP_SUPPORT options IPSEC_SUPPORT options SCHED_ULE options SOFTUPDATES options QUOTA options UFS_DIRHASH options UFS_ACL options UFS_EXTATTR options UFS_EXTATTR_AUTOSTART options SUIDDIR options NFS_ROOT options COMPAT_FREEBSD32 options SCSI_DELAY=15000 options KTRACE options _KPOSIX_PRIORITY_SCHEDULING options KBD_INSTALL_CDEV options CAPABILITY_MODE options CAPABILITIES options MAC options PRINTF_BUFR_SIZE=128 options COMPAT_43TTY options COMPAT_43 options COMPAT_FREEBSD4 options COMPAT_FREEBSD5 options COMPAT_FREEBSD6 options COMPAT_FREEBSD7 options COMPAT_FREEBSD9 options COMPAT_FREEBSD10 options COMPAT_FREEBSD11 options COMPAT_FREEBSD12 options COMPAT_FREEBSD13 device isa device pci device loop # Network loopback device ether # Ethernet support device mem device io device bpf device uart device crypto
