From c5fd89adcde0b6e954000328471336ec8e7a0c69 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sun, 23 May 2021 13:04:53 +0100 Subject: core: make libbpf a dlopen() dependency --- tools/build-bpf-skel.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/build-bpf-skel.py b/tools/build-bpf-skel.py index 5506fdd875..b28766fa64 100755 --- a/tools/build-bpf-skel.py +++ b/tools/build-bpf-skel.py @@ -4,6 +4,7 @@ import argparse import logging import pathlib +import re import subprocess import sys @@ -59,7 +60,11 @@ def gen_bpf_skeleton(bpftool_exec, in_file, out_fd): logging.debug('Generating BPF skeleton:') logging.debug('{}'.format(' '.join(bpftool_args))) - subprocess.check_call(bpftool_args, stdout=out_fd) + skel = subprocess.check_output(bpftool_args, universal_newlines=True) + # libbpf is used via dlopen(), so rename symbols as defined + # in src/shared/bpf-dlopen.h + skel = re.sub(r'(bpf_object__\w+_skeleton)', r'sym_\1', skel) + out_fd.write(skel) def bpf_build(args): -- cgit v1.2.1