Linux 6.19: handle --werror with CONFIG_OBJTOOL_WERROR=y #18152
+2
−2
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
When building against a 6.19 kernel using the Ubuntu 26.04 development build with
CONFIG_OBJTOOL_WERROR=y, the zfs-linux DKMS package fails to build due to the following errors:This is because the upstream Linux kernel introduced a change in 6.19-rc1 (56754f0f46f6: "objtool: Rename --Werror to --werror"), which doesn't match the changes in scripts/objtool-wrapper.in to ignore the compiler flag.
Description
Simple change to modify scripts/objtool-wrapper.in to look for both "--Werror" and "--werror", rather than just the former.
How Has This Been Tested?
This was tested in a QEMU environment using virtme-ng, after bisecting the Linux kernel changes down to the aforementioned commit. Using the changes in this PR, zfs-linux successfully built.
Tests were repeated on a LXD VM, whereupon some simple regression tests were also executed, notably the tests from here - https://git.launchpad.net/~canonical-kernel-team/+git/autotest-client-tests (see "ubuntu_zfs_*" tests).
Types of changes
Checklist:
Signed-off-by.