mirror of
https://github.com/netdata/libbpf.git
synced 2026-03-21 00:39:07 +08:00
7c15babf40
Merges are common. `git cherry-pick` can't cherry-pick merge commit and requires specifying which of the parents should be cherry-picked, so it's a pain. But merges are also commonly empty, so it's safe to skip them. This change goes through all merges touching libbpf files, checks that they don't have any conflict resolution diffs. If there are any, abort, if not, proceed as usual, ignoring merges. Signed-off-by: Andrii Nakryiko <andriin@fb.com>
This is a mirror of bpf-next linux tree (https://kernel.googlesource.com/pub/scm/linux/kernel/git/bpf/bpf-next) bpf-next/tools/lib/bpf directory plus its supporting header files. The following files will by sync'ed with bpf-next repo: src/ <-> bpf-next/tools/lib/bpf/ include/uapi/linux/bpf_common.h <-> bpf-next/tools/include/uapi/linux/bpf_common.h include/uapi/linux/bpf.h <-> bpf-next/tools/include/uapi/linux/bpf.h include/uapi/linux/btf.h <-> bpf-next/tools/include/uapi/linux/btf.h include/uapi/linux/if_link.h <-> bpf-next/tools/include/uapi/linux/if_link.h include/uapi/linux/if_xdp.h <-> bpf-next/tools/include/uapi/linux/if_xdp.h include/uapi/linux/netlink.h <-> bpf-next/tools/include/uapi/linux/netlink.h include/tools/libc_compat.h <-> bpf-next/tools/include/tools/libc_compat.h Other header files at this repo (include/linux/*.h) are reduced versions of their counterpart files at bpf-next/tools/include/linux/*.h to make compilation successful. Build ===== To build static library libbpf.a: cd src make To build both static libbpf.a and shared libbpf.so libraries in directory build/ and install them together with libbpf headers in a staging directory root/: cd src mkdir build root BUILD_SHARED=y OBJDIR=build DESTDIR=root make install