Summary: | sys/modules: Fix processing of WITHOUT_MODULES | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | Base System | Reporter: | Joshua Kinard <freebsd> | ||||||||||
Component: | kern | Assignee: | freebsd-bugs (Nobody) <bugs> | ||||||||||
Status: | New --- | ||||||||||||
Severity: | Affects Some People | ||||||||||||
Priority: | --- | ||||||||||||
Version: | CURRENT | ||||||||||||
Hardware: | Any | ||||||||||||
OS: | Any | ||||||||||||
Attachments: |
|
Description
Joshua Kinard
2023-12-13 09:25:25 UTC
Created attachment 247024 [details]
Fix processing of WITHOUT_MODULES
Created attachment 247035 [details]
Fix processing of WITHOUT_MODULES v2
This version of the patch fixes an accidental bug in the kmod.without.mk for loop where I was trying to be too clever and compare `basename CURDIR` against `dirname kmod` to try and limit accidental matches from being removed from SUBDIR. A.k.a., being overly-cautious and while that check works for a single subdirectory level (foo/bar), it fails if the kmod name in WITHOUT_MODULES has several subdirectory levels (foo/bar/baz). After adding better debugging and looking through the build log, the conditional simply isn't needed, so it is removed in this version.
Also updated the date in the make.conf.5 man page.
Created attachment 250958 [details]
Fix processing of WITHOUT_MODULES v3
Updating the proposed patch to recent -CURRENT. Other fixes:
- Fixed a spot where I was applying the include for the new 'kmod.without.mk' logic on sys/modules/otus/Makefile, which doesn't have a SUBDIR variable defined; this needed to actually be applied to sys/modules/otusfw/Makefile.
- Added the include to sys/modules/cxgbe/Makefile, which was missed in the last version of the patch.
- Added the include to sys/modules/nvmf/Makefile (which looks like a recently-added module)
- Added the include to sys/modules/pms/Makefile, which has a SUBDIR variable in it, but it is currently commented out, so this is for the future should that variable ever be uncommented.
Created attachment 255296 [details]
Fix processing of WITHOUT_MODULES v4
Updating the proposed patch to recent -CURRENT.
|