[PATCH] kernel-tools.spec: Adding libbpf package

[Jiri Olsa]

hi,
please consider attached change that adds libbpf sub
package to be generated within kernel-tools spec.

We need libbpf in a separate package, starting with basic
files, some more might come later if there's a need.

thanks,
jirka


---
Packaging libbpf library, resulting in 3 packages:
  libbpf
  libbpf-devel
  libbpf-debuginfo

$ rpm -qpl libbpf-5.1.0-0.rc3.git0.1.fc31.x86_64.rpm
/usr/lib/.build-id
/usr/lib/.build-id/da
/usr/lib/.build-id/da/34eb899cd9b325e75073da52cb12682a405910
/usr/lib64/libbpf.so.0
/usr/lib64/libbpf.so.0.0.2
/usr/share/licenses/libbpf
/usr/share/licenses/libbpf/COPYING

$ rpm -qpl libbpf-devel-5.1.0-0.rc3.git0.1.fc31.x86_64.rpm
/usr/include/bpf/bpf.h
/usr/include/bpf/btf.h
/usr/include/bpf/libbpf.h
/usr/lib64/libbpf.a
/usr/lib64/libbpf.so
/usr/share/licenses/libbpf-devel
/usr/share/licenses/libbpf-devel/COPYING

$ rpm -qpl libbpf-debuginfo-5.1.0-0.rc3.git0.1.fc31.x86_64.rpm
/usr/lib/debug
/usr/lib/debug/.build-id
/usr/lib/debug/.build-id/da
/usr/lib/debug/.build-id/da/34eb899cd9b325e75073da52cb12682a405910
/usr/lib/debug/.build-id/da/34eb899cd9b325e75073da52cb12682a405910.debug
/usr/lib/debug/usr
/usr/lib/debug/usr/lib64
/usr/lib/debug/usr/lib64/libbpf.so.0.0.2-5.1.0-0.rc3.git0.1.fc31.x86_64.debug
---
 kernel-tools.spec | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/kernel-tools.spec b/kernel-tools.spec
index 0b1fd4438155..68b4f93ebc68 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -176,6 +176,19 @@ License: GPLv2
 This package contains the bpftool, which allows inspection and simple
 manipulation of eBPF programs and maps.
 
+%package -n libbpf
+Summary: The bpf library from kernel source
+License: GPLv2
+%description -n libbpf
+This package contains the kernel source bpf library.
+
+%package -n libbpf-devel
+Summary: Developement files for the bpf library from kernel source
+License: GPLv2
+%description -n libbpf-devel
+This package includes libraries and header files needed for development
+of applications which use bpf library from kernel source.
+
 %prep
 %setup -q -n kernel-%{kversion}%{?dist} -c
 
@@ -253,6 +266,9 @@ popd
 pushd tools/bpf/bpftool
 make
 popd
+pushd tools/lib/bpf
+make V=1
+popd
 
 # Build the docs
 pushd tools/kvm/kvm_stat/
@@ -340,6 +356,9 @@ make DESTDIR=%{buildroot} prefix=%{_prefix}
bash_compdir=%{_sysconfdir}/bash_com
 # man-pages packages this (rhbz #1686954)
 rm %{buildroot}%{_mandir}/man7/bpf-helpers.7
 popd
+pushd tools/lib/bpf
+make DESTDIR=%{buildroot} prefix=%{_prefix} libdir=%{_libdir} V=1 install
install_headers
+popd
 
 ###
 ### scripts
@@ -420,7 +439,23 @@ popd
 %{_mandir}/man8/bpftool.8.gz
 %license linux-%{kversion}/COPYING
 
+%files -n libbpf
+%{_libdir}/libbpf.so.0
+%{_libdir}/libbpf.so.0.0.2
+%license linux-%{kversion}/COPYING
+
+%files -n libbpf-devel
+%{_libdir}/libbpf.a
+%{_libdir}/libbpf.so
+%{_includedir}/bpf/bpf.h
+%{_includedir}/bpf/btf.h
+%{_includedir}/bpf/libbpf.h
+%license linux-%{kversion}/COPYING
+
 %changelog
+* Tue Apr 02 2019 Jiri Olsa <jolsa(a)redhat.com&gt; - 5.1.0-1.rc3.git0.1
+- Add libbpf, libbpf-devel and libbpf-debuginfo packages
+
 * Mon Apr 01 2019 Jeremy Cline <jeremy(a)jcline.org&gt; - 5.1.0-0.rc3.git0.1
 - Linux v5.1-rc3
 
-- 
2.17.2

[Jeremy Cline]

Hi Jiri,

On 4/2/19 6:35 AM, Jiri Olsa wrote:
>  hi,
>  please consider attached change that adds libbpf sub
>  package to be generated within kernel-tools spec.
>  
>  We need libbpf in a separate package, starting with basic
>  files, some more might come later if there's a need.
>  
>  thanks,
>  jirka
>  
>  
>  --- 
I've applied this and rebuilt kernel-tools for Rawhide as
kernel-tools-5.1.0-0.rc3.git0.2.fc31.

Regards,
Jeremy

[Jiri Olsa]

On Wed, Apr 03, 2019 at 06:38:38PM +0000, Jeremy Cline wrote:
>  Hi Jiri,
>  
>  On 4/2/19 6:35 AM, Jiri Olsa wrote:
>  > hi,
>  > please consider attached change that adds libbpf sub
>  > package to be generated within kernel-tools spec.
>  > 
>  > We need libbpf in a separate package, starting with basic
>  > files, some more might come later if there's a need.
>  > 
>  > thanks,
>  > jirka
>  > 
>  > 
>  > ---
>  
>  I've applied this and rebuilt kernel-tools for Rawhide as
>  kernel-tools-5.1.0-0.rc3.git0.2.fc31. 
great, thanks
jirka

[Jiri Olsa]

On Wed, Apr 03, 2019 at 06:38:38PM +0000, Jeremy Cline wrote:
>  Hi Jiri,
>  
>  On 4/2/19 6:35 AM, Jiri Olsa wrote:
>  > hi,
>  > please consider attached change that adds libbpf sub
>  > package to be generated within kernel-tools spec.
>  > 
>  > We need libbpf in a separate package, starting with basic
>  > files, some more might come later if there's a need.
>  > 
>  > thanks,
>  > jirka
>  > 
>  > 
>  > ---
>  
>  I've applied this and rebuilt kernel-tools for Rawhide as
>  kernel-tools-5.1.0-0.rc3.git0.2.fc31. 
hi,
it'd be great to have libbpf for Fedora 30 as well,
I have scratch build in here:
  https://koji.fedoraproject.org/koji/taskinfo?taskID=34883714

but I had to add 2 patches on top of v5.0

I assume Fedora 30 will stay on v5.0 .. is there some
policy on adding this to Fedora 30?

thanks,
jirka

[Laura Abbott]

On 5/16/19 2:42 PM, Jiri Olsa wrote:
>  On Wed, Apr 03, 2019 at 06:38:38PM +0000, Jeremy Cline wrote:
> > Hi Jiri,
> >
> > On 4/2/19 6:35 AM, Jiri Olsa wrote:
> >> hi,
> >> please consider attached change that adds libbpf sub
> >> package to be generated within kernel-tools spec.
> >>
> >> We need libbpf in a separate package, starting with basic
> >> files, some more might come later if there's a need.
> >>
> >> thanks,
> >> jirka
> >>
> >>
> >> ---
> >
> > I've applied this and rebuilt kernel-tools for Rawhide as
> > kernel-tools-5.1.0-0.rc3.git0.2.fc31.
>  
>  hi,
>  it'd be great to have libbpf for Fedora 30 as well,
>  I have scratch build in here:
>     https://koji.fedoraproject.org/koji/taskinfo?taskID=34883714
>  
>  but I had to add 2 patches on top of v5.0
>  
>  I assume Fedora 30 will stay on v5.0 .. is there some
>  policy on adding this to Fedora 30?
>   
Fedora 30 will get rebased to 5.1 which should be happening sometime
next week. We're pretty flexible with what we let into releases so
I think it's fine to go in, unless Jeremy sees some issue.

Thanks,
Laura

>  thanks,
>  jirka
>

[Jiri Olsa]

On Thu, May 16, 2019 at 04:08:17PM -0700, Laura Abbott wrote:
>  On 5/16/19 2:42 PM, Jiri Olsa wrote:
>  > On Wed, Apr 03, 2019 at 06:38:38PM +0000, Jeremy Cline wrote:
>  > > Hi Jiri,
>  > > 
>  > > On 4/2/19 6:35 AM, Jiri Olsa wrote:
>  > > > hi,
>  > > > please consider attached change that adds libbpf sub
>  > > > package to be generated within kernel-tools spec.
>  > > > 
>  > > > We need libbpf in a separate package, starting with basic
>  > > > files, some more might come later if there's a need.
>  > > > 
>  > > > thanks,
>  > > > jirka
>  > > > 
>  > > > 
>  > > > ---
>  > > 
>  > > I've applied this and rebuilt kernel-tools for Rawhide as
>  > > kernel-tools-5.1.0-0.rc3.git0.2.fc31.
>  > 
>  > hi,
>  > it'd be great to have libbpf for Fedora 30 as well,
>  > I have scratch build in here:
>  >    https://koji.fedoraproject.org/koji/taskinfo?taskID=34883714
>  > 
>  > but I had to add 2 patches on top of v5.0
>  > 
>  > I assume Fedora 30 will stay on v5.0 .. is there some
>  > policy on adding this to Fedora 30?
>  > 
>  
>  Fedora 30 will get rebased to 5.1 which should be happening sometime
>  next week. We're pretty flexible with what we let into releases so
>  I think it's fine to go in, unless Jeremy sees some issue. 
that'd be great, thanks

jirka

[Justin Forbes]

The problem is soname bumps.  5.1 is using libbpf.so.0.0.2 and 5.2 is
on libbpf.so.0.0.3 so it is a moving target if you are planing to
package anything against it.

On Fri, May 17, 2019 at 3:17 AM Jiri Olsa <jolsa(a)redhat.com&gt; wrote:
>
> On Thu, May 16, 2019 at 04:08:17PM -0700, Laura Abbott wrote:
> > On 5/16/19 2:42 PM, Jiri Olsa wrote:
> > > On Wed, Apr 03, 2019 at 06:38:38PM +0000, Jeremy Cline wrote:
> > > > Hi Jiri,
> > > >
> > > > On 4/2/19 6:35 AM, Jiri Olsa wrote:
> > > > > hi,
> > > > > please consider attached change that adds libbpf sub
> > > > > package to be generated within kernel-tools spec.
> > > > >
> > > > > We need libbpf in a separate package, starting with basic
> > > > > files, some more might come later if there's a need.
> > > > >
> > > > > thanks,
> > > > > jirka
> > > > >
> > > > >
> > > > > ---
> > > >
> > > > I've applied this and rebuilt kernel-tools for Rawhide as
> > > > kernel-tools-5.1.0-0.rc3.git0.2.fc31.
> > >
> > > hi,
> > > it'd be great to have libbpf for Fedora 30 as well,
> > > I have scratch build in here:
> > >    https://koji.fedoraproject.org/koji/taskinfo?taskID=34883714
> > >
> > > but I had to add 2 patches on top of v5.0
> > >
> > > I assume Fedora 30 will stay on v5.0 .. is there some
> > > policy on adding this to Fedora 30?
> > >
> >
> > Fedora 30 will get rebased to 5.1 which should be happening sometime
> > next week. We're pretty flexible with what we let into releases so
> > I think it's fine to go in, unless Jeremy sees some issue.
>
> that'd be great, thanks
>
> jirka
> _______________________________________________
> kernel mailing list -- kernel(a)lists.fedoraproject.org
> To unsubscribe send an email to kernel-leave(a)lists.fedoraproject.org
> Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> List Archives:
https://lists.fedoraproject.org/archives/list/[e-mail]

[Jiri Olsa]

On Mon, May 20, 2019 at 02:19:12PM -0500, Justin Forbes wrote:
>  The problem is soname bumps.  5.1 is using libbpf.so.0.0.2 and 5.2
> is
>  on libbpf.so.0.0.3 so it is a moving target if you are planing to
>  package anything against it. 
eight, that's fine for my usage

thanks,
jirka

> 
> On Fri, May 17, 2019 at 3:17 AM Jiri Olsa <jolsa(a)redhat.com&gt; wrote:
> >
> > On Thu, May 16, 2019 at 04:08:17PM -0700, Laura Abbott wrote:
> > > On 5/16/19 2:42 PM, Jiri Olsa wrote:
> > > > On Wed, Apr 03, 2019 at 06:38:38PM +0000, Jeremy Cline wrote:
> > > > > Hi Jiri,
> > > > >
> > > > > On 4/2/19 6:35 AM, Jiri Olsa wrote:
> > > > > > hi,
> > > > > > please consider attached change that adds libbpf sub
> > > > > > package to be generated within kernel-tools spec.
> > > > > >
> > > > > > We need libbpf in a separate package, starting with basic
> > > > > > files, some more might come later if there's a need.
> > > > > >
> > > > > > thanks,
> > > > > > jirka
> > > > > >
> > > > > >
> > > > > > ---
> > > > >
> > > > > I've applied this and rebuilt kernel-tools for Rawhide as
> > > > > kernel-tools-5.1.0-0.rc3.git0.2.fc31.
> > > >
> > > > hi,
> > > > it'd be great to have libbpf for Fedora 30 as well,
> > > > I have scratch build in here:
> > > >    https://koji.fedoraproject.org/koji/taskinfo?taskID=34883714
> > > >
> > > > but I had to add 2 patches on top of v5.0
> > > >
> > > > I assume Fedora 30 will stay on v5.0 .. is there some
> > > > policy on adding this to Fedora 30?
> > > >
> > >
> > > Fedora 30 will get rebased to 5.1 which should be happening sometime
> > > next week. We're pretty flexible with what we let into releases so
> > > I think it's fine to go in, unless Jeremy sees some issue.
> >
> > that'd be great, thanks
> >
> > jirka
> > _______________________________________________
> > kernel mailing list -- kernel(a)lists.fedoraproject.org
> > To unsubscribe send an email to kernel-leave(a)lists.fedoraproject.org
> > Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
> > List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> > List Archives:
https://lists.fedoraproject.org/archives/list/[e-mail]

[Jeremy Cline]

Hi,

On 5/17/19 4:16 AM, Jiri Olsa wrote:
>  On Thu, May 16, 2019 at 04:08:17PM -0700, Laura Abbott wrote:
> > On 5/16/19 2:42 PM, Jiri Olsa wrote:
> >> On Wed, Apr 03, 2019 at 06:38:38PM +0000, Jeremy Cline wrote:
> >>> Hi Jiri,
> >>>
> >>> On 4/2/19 6:35 AM, Jiri Olsa wrote:
> >>>> hi,
> >>>> please consider attached change that adds libbpf sub
> >>>> package to be generated within kernel-tools spec.
> >>>>
> >>>> We need libbpf in a separate package, starting with basic
> >>>> files, some more might come later if there's a need.
> >>>>
> >>>> thanks,
> >>>> jirka
> >>>>
> >>>>
> >>>> ---
> >>>
> >>> I've applied this and rebuilt kernel-tools for Rawhide as
> >>> kernel-tools-5.1.0-0.rc3.git0.2.fc31.
> >>
> >> hi,
> >> it'd be great to have libbpf for Fedora 30 as well,
> >> I have scratch build in here:
> >>     https://koji.fedoraproject.org/koji/taskinfo?taskID=34883714
> >>
> >> but I had to add 2 patches on top of v5.0
> >>
> >> I assume Fedora 30 will stay on v5.0 .. is there some
> >> policy on adding this to Fedora 30?
> >>
> >
> > Fedora 30 will get rebased to 5.1 which should be happening sometime
> > next week. We're pretty flexible with what we let into releases so
> > I think it's fine to go in, unless Jeremy sees some issue.
>  
>  that'd be great, thanks
>   
Just a heads-up, I've filed the rebase to v5.1.4 for Fedora[0] which
contains the libbpf sub-package in kernel-tools.

[0] https://bodhi.fedoraproject.org/updates/FEDORA-2019-e96e0ce38b


- Jeremy

[Jiri Olsa]

On Thu, May 23, 2019 at 01:49:51PM +0000, Jeremy Cline wrote:
>  Hi,
>  
>  On 5/17/19 4:16 AM, Jiri Olsa wrote:
>  > On Thu, May 16, 2019 at 04:08:17PM -0700, Laura Abbott wrote:
>  > > On 5/16/19 2:42 PM, Jiri Olsa wrote:
>  > > > On Wed, Apr 03, 2019 at 06:38:38PM +0000, Jeremy Cline wrote:
>  > > > > Hi Jiri,
>  > > > > 
>  > > > > On 4/2/19 6:35 AM, Jiri Olsa wrote:
>  > > > > > hi,
>  > > > > > please consider attached change that adds libbpf sub
>  > > > > > package to be generated within kernel-tools spec.
>  > > > > > 
>  > > > > > We need libbpf in a separate package, starting with basic
>  > > > > > files, some more might come later if there's a need.
>  > > > > > 
>  > > > > > thanks,
>  > > > > > jirka
>  > > > > > 
>  > > > > > 
>  > > > > > ---
>  > > > > 
>  > > > > I've applied this and rebuilt kernel-tools for Rawhide as
>  > > > > kernel-tools-5.1.0-0.rc3.git0.2.fc31.
>  > > > 
>  > > > hi,
>  > > > it'd be great to have libbpf for Fedora 30 as well,
>  > > > I have scratch build in here:
>  > > >     https://koji.fedoraproject.org/koji/taskinfo?taskID=34883714
>  > > > 
>  > > > but I had to add 2 patches on top of v5.0
>  > > > 
>  > > > I assume Fedora 30 will stay on v5.0 .. is there some
>  > > > policy on adding this to Fedora 30?
>  > > > 
>  > > 
>  > > Fedora 30 will get rebased to 5.1 which should be happening sometime
>  > > next week. We're pretty flexible with what we let into releases so
>  > > I think it's fine to go in, unless Jeremy sees some issue.
>  > 
>  > that'd be great, thanks
>  > 
>  
>  Just a heads-up, I've filed the rebase to v5.1.4 for Fedora[0] which
>  contains the libbpf sub-package in kernel-tools.
>  
>  [0] https://bodhi.fedoraproject.org/updates/FEDORA-2019-e96e0ce38b 
I can see it in the testing repo, works nicely

thanks,
jirka