diff --git a/.gitignore b/.gitignore index 5a958db..fb62425 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/linux-4.18.0-167.el8.tar.xz +SOURCES/linux-4.18.0-185.el8.tar.xz diff --git a/.libbpf.metadata b/.libbpf.metadata index 4058436..25ab214 100644 --- a/.libbpf.metadata +++ b/.libbpf.metadata @@ -1 +1 @@ -5d85dc56d6a793428d6a453a53793a56eea42498 SOURCES/linux-4.18.0-167.el8.tar.xz +5b45cde6e011e32d6354280995acfa7871ad1bc4 SOURCES/linux-4.18.0-185.el8.tar.xz diff --git a/SOURCES/0001-fix-i686-compilation.patch b/SOURCES/0001-fix-i686-compilation.patch deleted file mode 100644 index baf9299..0000000 --- a/SOURCES/0001-fix-i686-compilation.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 31bf12c3bbe6ef6b32b9553db723bf3156ef1099 Mon Sep 17 00:00:00 2001 -From: Jiri Olsa -Date: Sat, 14 Dec 2019 15:57:41 +0100 -Subject: [PATCH] fix i686 compilation - ---- - tools/lib/bpf/libbpf.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c -index bcd5631a4fed..4bb6ebfecb20 100644 ---- a/tools/lib/bpf/libbpf.c -+++ b/tools/lib/bpf/libbpf.c -@@ -1790,7 +1790,7 @@ static int bpf_program__record_reloc(struct bpf_program *prog, - return -LIBBPF_ERRNO__RELOC; - } - if (sym->st_value % 8) { -- pr_warn("bad call relo offset: %lu\n", sym->st_value); -+ pr_warn("bad call relo offset: %zu\n", (size_t) sym->st_value); - return -LIBBPF_ERRNO__RELOC; - } - reloc_desc->type = RELO_CALL; --- -2.21.1 - diff --git a/SPECS/libbpf.spec b/SPECS/libbpf.spec index 4e9d162..52cdd9a 100644 --- a/SPECS/libbpf.spec +++ b/SPECS/libbpf.spec @@ -4,17 +4,16 @@ # used as kernel tar. # RHEL kernel version-release -%define kver 4.18.0-167 +%define kver 4.18.0-185 %define source linux-%{kver}.el8 Name: libbpf Version: 0.0.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Libbpf library License: LGPLv2 or BSD Source0: %{source}.tar.xz -Patch0: 0001-fix-i686-compilation.patch BuildRequires: gcc elfutils-libelf-devel elfutils-devel python3 %description @@ -44,7 +43,6 @@ developing applications that use %{name} %prep %setup -n %{source} -%patch0 -p1 %build pushd tools/lib/bpf @@ -69,6 +67,9 @@ popd %{_libdir}/libbpf.a %changelog +* Wed Mar 04 2020 Jiri Olsa - 0.0.4-5 +- new kernel version [1809913] + * Thu Jan 09 2020 Jiri Olsa - 0.0.4-4 - missing libbpf.pc file [1759154]