]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
lib/Kconfig.debug: Use CONFIG_PAHOLE_VERSION
authorNathan Chancellor <nathan@kernel.org>
Mon, 7 Feb 2022 15:15:14 +0000 (15:15 +0000)
committerPaolo Pisati <paolo.pisati@canonical.com>
Fri, 11 Feb 2022 10:59:44 +0000 (11:59 +0100)
Now that CONFIG_PAHOLE_VERSION exists, use it in the definition of
CONFIG_PAHOLE_HAS_SPLIT_BTF and CONFIG_PAHOLE_HAS_BTF_TAG to reduce the
amount of duplication across the tree.

Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220201205624.652313-5-nathan@kernel.org
(cherry picked from bpf-next commit 6323c81350b73a4569cf52df85f80273faa64071)
(conflicts did not apply PAHOLE_HAS_BTF_TAG hunk as did not cherry-pick pre-req)
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
lib/Kconfig.debug

index 2a9b6dcdac4ff8909f76724db74b290208488211..53fef9b55136c282474f5da2cc4e22de80f7614f 100644 (file)
@@ -322,7 +322,7 @@ config DEBUG_INFO_BTF
          DWARF type info into equivalent deduplicated BTF type info.
 
 config PAHOLE_HAS_SPLIT_BTF
-       def_bool $(success, test `$(PAHOLE) --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/'` -ge "119")
+       def_bool PAHOLE_VERSION >= 119
 
 config DEBUG_INFO_BTF_MODULES
        def_bool y