diff --git a/kernel-tools.spec b/kernel-tools.spec index 6703b4d..8252e77 100644 --- a/kernel-tools.spec +++ b/kernel-tools.spec @@ -11,13 +11,13 @@ # base_sublevel is the kernel version we're starting with and patching # on top of -- for example, 3.1-rc7-git1 starts with a 3.0 base, # which yields a base_sublevel of 0. -%global base_sublevel 0 +%global base_sublevel 1 ## If this is a released kernel ## %if 0%{?released_kernel} # Do we have a -stable update to apply? -%global stable_update 12 +%global stable_update 4 # Set rpm version accordingly %if 0%{?stable_update} %global stablerev %{stable_update} @@ -31,7 +31,7 @@ %global upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 8 +%global rcrev 0 # Set rpm version accordingly %global rpmversion 5.%{upstream_sublevel}.0 %endif @@ -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 @@ -416,10 +435,28 @@ popd %{_mandir}/man8/bpftool-net.8.gz %{_mandir}/man8/bpftool-prog.8.gz %{_mandir}/man8/bpftool-perf.8.gz +%{_mandir}/man8/bpftool-feature.8.gz %{_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 +%{_includedir}/bpf/xsk.h +%license linux-%{kversion}/COPYING + %changelog +* Mon May 06 2019 Jeremy Cline - 5.1.0-1 +- Linux v5.1.4 + * Sat May 04 2019 Laura Abbott - 5.0.12-300 - Linux v5.0.12 @@ -503,127 +540,3 @@ popd * Mon Nov 05 2018 Justin M. Forbes - 4.20.0-0.rc1.git0.1 - Linux v4.20-rc1 - -* Mon Oct 22 2018 Jeremy Cline - 4.19.0-1 -- Linux v4.19 - -* Mon Oct 15 2018 Jeremy Cline - 4.19.0-0.rc8.git0.1 -- Linux v4.19-rc7 - -* Mon Oct 08 2018 Jeremy Cline - 4.19.0-0.rc7.git0.1 -- Linux v4.19-rc7 - -* Tue Oct 02 2018 Jeremy Cline - 4.19.0-0.rc6.git0.1 -- Linux v4.19-rc6 - -* Mon Sep 24 2018 Jeremy Cline - 4.19.0-0.rc5.git0.1 -- Linux v4.19-rc5 - -* Mon Sep 17 2018 Jeremy Cline - 4.19.0-0.rc4.git0.1 -- Linux v4.19-rc4 - -* Mon Sep 10 2018 Jeremy Cline - 4.19.0-0.rc3.git0.1 -- Linux v4.19-rc3 - -* Mon Sep 03 2018 Jeremy Cline - 4.19.0-0.rc2.git0.1 -- Linux v4.19-rc2 - -* Mon Aug 27 2018 Jeremy Cline - 4.19.0-0.rc1.git0.1 -- Linux v4.19-rc1 - -* Mon Aug 13 2018 Laura Abbott - 4.18.0-1 -- Linux v4.18 - -* Mon Aug 06 2018 Laura Abbott - 4.18.0-0.rc8.git0.1 -- Linux v4.18-rc8 - -* Mon Jul 16 2018 Laura Abbott - 4.18.0-0.rc6.git0.1 -- Linux v4.18-rc6 - -* Mon Jul 16 2018 Laura Abbott - 4.18.0-0.rc5.git0.1 -- Linux v4.18-rc5 - -* Fri Jul 13 2018 Fedora Release Engineering - 4.18.0-0.rc4.git0.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jul 09 2018 Laura Abbott - 4.18.0-0.rc4.git0.1 -- Linux v4.18-rc4 - -* Tue Jul 03 2018 Petr Pisar - 4.18.0-0.rc3.git0.2 -- Perl 5.28 rebuild - -* Mon Jul 02 2018 Laura Abbott - 4.18.0-0.rc3.git0.1 -- Linux v4.18-rc3 - -* Fri Jun 29 2018 Jeremy Cline - 4.18.0-0.rc2.git0.3 -- Fix the build for Python 3.7 (rhbz 1593431) - -* Fri Jun 29 2018 Jitka Plesnikova - 4.18.0-0.rc2.git0.2 -- Perl 5.28 rebuild - -* Mon Jun 25 2018 Laura Abbott - 4.18.0-0.rc2.git0.1 -- Linux v4.18-rc2 - -* Tue Jun 19 2018 Miro Hrončok - 4.18.0-0.rc1.git0.2 -- Rebuilt for Python 3.7 - -* Mon Jun 18 2018 Laura Abbott - 4.18.0-0.rc1.git0.1 -- Linux v4.18-rc1 - -* Mon Jun 04 2018 Justin M. Forbes - 4.17.0-1 -- Linux v4.17 - -* Tue May 29 2018 Justin M. Forbes - 4.17.0-0.rc7.git0.1 -- Linux v4.17-rc7 - -* Tue May 22 2018 Justin M. Forbes - 4.17.0-0.rc6.git0.1 -- Linux v4.17-rc6 - -* Mon May 14 2018 Justin M. Forbes - 4.17.0-0.rc5.git0.1 -- Linux v4.17-rc5 - -* Mon May 07 2018 Justin M. Forbes - 4.17.0-0.rc4.git0.1 -- Linux v4.17-rc4 - -* Mon Apr 23 2018 Justin M. Forbes - 4.17.0-0.rc2.git0.1 -- Linux v4.17-rc2 - -* Mon Apr 16 2018 Justin M. Forbes - 4.17.0-0.rc1.git0.1 -- Linux v4.17-rc1 - -* Mon Apr 02 2018 Jeremy Cline - 4.16.0-1 -- Linux 4.16 -- New bpftool sub-package - -* Mon Mar 26 2018 Jeremy Cline - 4.16.0-0.rc7.git0.1 -- Linux 4.16-rc7 - -* Mon Mar 19 2018 Jeremy Cline - 4.16.0-0.rc6.git0.1 -- Linux 4.16-rc6 - -* Mon Mar 12 2018 Jeremy Cline - 4.16.0-0.rc5.git0.1 -- Linux 4.16-rc5 - -* Tue Mar 06 2018 Jeremy Cline - 4.16.0-0.rc4.git0.1 -- Linux 4.16-rc4 - -* Mon Feb 26 2018 Jeremy Cline - 4.16.0-0.rc3.git0.1 -- Linux 4.16-rc3 - -* Mon Feb 19 2018 Jeremy Cline - 4.16.0-0.rc2.git0.1 -- Linux 4.16-rc2 - -* Mon Jan 29 2018 Laura Abbott - 4.15.0-1 -- Linux v4.15 - -* Tue Jan 23 2018 Laura Abbott - 4.15.0-0.rc9.git0.1 -- Linux 4.15-rc9 - -* Sat Jan 20 2018 Björn Esser - 4.15.0-0.rc8.git0.2 -- Rebuilt for switch to libxcrypt - -* Tue Jan 16 2018 Laura Abbott - 4.15.0-0.rc8.git0.1 -- Linux 4.15-rc8 - -* Fri Jan 05 2018 Laura Abbott - 4.15.0-0.rc7.git0.1 -- Fork from the kernel package diff --git a/sources b/sources index 65fc34e..a476a2c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0 -SHA512 (patch-5.0.12.xz) = fd07efc848d239c1cf73f908d39039ae4332843575ecdaeaa6b55a8ec23ac3ce8849f534648ead6321a9b22695e1d4fbb3cb0fa31cd0e9cfc8c60c1993c8ab90 +SHA512 (linux-5.1.tar.xz) = ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236 +SHA512 (patch-5.1.4.xz) = 0206b5c977147a04331882c53533fb418669afc8c2b2ec0ba298d041e9bfafa8e93c6fff665676c4473dc408fcd8772fb7addd99967e0798496fdb6e019a025c