Makefile: require user to provide extract-vmlinux #1088
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gentoo-root
reviewed
Jul 4, 2023
Makefile
Outdated
| @@ -107,7 +107,7 @@ generate-btf: KERNEL_VERSION?=5.19 | |||
| generate-btf: | |||
| $(eval TMP := $(shell mktemp -d)) | |||
| curl -fL "$(CI_KERNEL_URL)/linux-$(KERNEL_VERSION).bz" -o "$(TMP)/bzImage" | |||
| ./testdata/extract-vmlinux "$(TMP)/bzImage" > "$(TMP)/vmlinux" | |||
| /usr/src/kernels/$(uname -r)/scripts/extract-vmlinux "$(TMP)/bzImage" > "$(TMP)/vmlinux" | |||
There was a problem hiding this comment.
The path is currently hardcoded to where the binary is located on my Fedora install. We can change this so something more portable once someone runs into a problem.
As far as I know, /lib/modules/$(uname -r)/build/scripts/extract-vmlinux should be more portable. /lib/modules/.../build should point to the distribution-specific location of the kernel sources. For example, on Ubuntu it's a symlink to /usr/src/linux-headers-$(uname -r), on Arch it's a plain directory, etc. Does it also work for you on Fedora?
There was a problem hiding this comment.
$ ls -l /lib/modules/$(uname -r)/build/scripts/extract-vmlinux
-rwxr-xr-x. 3 root root 1699 May 30 01:00 /lib/modules/6.3.5-200.fc38.x86_64/build/scripts/extract-vmlinux
Very nice, thanks for the suggestion!
extract-vmlinux is GPL licensed code which makes it harder for cilium to graduate in the CNCF. Remove the vendored copy and require the user to provide the binary instead. Use the full path in /lib/modules which seems to be fairly portable across Ubuntu, Arch and Fedora. Signed-off-by: Lorenz Bauer <lmb@isovalent.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
extract-vmlinux is GPL licensed code which makes it harder for cilium to graduate in the CNCF. Remove the vendored copy and require the user to provide the binary instead.
The path is currently hardcoded to where the binary is located on my Fedora install. We can change this so something more portable once someone runs into a problem. The target is executed only very seldomly as it is.