Subject: libbpf-devel rpm uapi headers

From: Jiri Olsa <[email-masked]>
Date: Wed, 2 Oct 2019 19:43:31 +0200

hi,
we'd like to have bcc linked with libbpf instead of the
github submodule, initial change is discussed in here:
  https://github.com/iovisor/bcc/pull/2535

In order to do that, we need to have access to uapi headers
compatible with libbpf rpm, bcc is attaching and using them
during compilation.

I added them in the fedora spec below (not submitted yet),
so libbpf would carry those headers.

Thoughts? thanks,
jirka

---
Subject: [PATCH] Package uapi headers under /usr/include/bpf/uapi/linux

The full list of files for libbpf-devel is now:

  /usr/include/bpf
  /usr/include/bpf/bpf.h
  /usr/include/bpf/btf.h
  /usr/include/bpf/libbpf.h
  /usr/include/bpf/libbpf_util.h
  /usr/include/bpf/uapi
  /usr/include/bpf/uapi/linux
  /usr/include/bpf/uapi/linux/compiler.h
  /usr/include/bpf/uapi/linux/err.h
  /usr/include/bpf/uapi/linux/filter.h
  /usr/include/bpf/uapi/linux/kernel.h
  /usr/include/bpf/uapi/linux/list.h
  /usr/include/bpf/uapi/linux/overflow.h
  /usr/include/bpf/uapi/linux/ring_buffer.h
  /usr/include/bpf/uapi/linux/types.h
  /usr/include/bpf/xsk.h
  /usr/lib64/libbpf.so
  /usr/lib64/pkgconfig/libbpf.pc
---
 libbpf.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libbpf.spec b/libbpf.spec
index 5d0f29718cac..681800c7f93e 100644
--- a/libbpf.spec
+++ b/libbpf.spec
@@ -4,7 +4,7 @@
 
 Name:           %{githubname}
 Version:        %{githubver}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Libbpf library
 
 License:        LGPLv2 or BSD
@@ -48,6 +48,8 @@ developing applications that use %{name}
 
 %install
 %make_install -C ./src %{make_flags}
+install -d -m 755  %{buildroot}/usr/include/bpf/uapi/linux
+cp include/linux/* %{buildroot}/usr/include/bpf/uapi/linux
 
 %files
 %{_libdir}/libbpf.so.%{version}
@@ -62,6 +64,9 @@ developing applications that use %{name}
 %{_libdir}/libbpf.a
 
 %changelog
+* Wed Oct 02 2019 Jiri Olsa <[email-masked]> - 0.0.3-3
+- Add uapi headers
+
 * Wed Sep 25 2019 Jiri Olsa <[email-masked]> - 0.0.3-2
 - Fix libelf linking (BZ#1755317)
 
-- 
2.21.0