开源软件构建与测试

_service:extract_file:libbpf.spec Deleted

@@ -1,81 +0,0 @@
-%global githubname   libbpf
-%global githubver    0.3
-%global githubfull   %{githubname}-%{githubver}
-
-Name:           %{githubname}
-Version:        %{githubver}
-Release:        1.h0
-Summary:        Libbpf library
-
-License:        LGPLv2 or BSD
-URL:            https://github.com/%{githubname}/%{githubname}
-Source:         https://github.com/%{githubname}/%{githubname}/archive/%{githubname}-%{githubver}.tar.gz
-BuildRequires:  gcc elfutils-libelf-devel elfutils-devel
-
-#patches
-
-# This package supersedes libbpf from kernel-tools,
-# which has default Epoch: 0. By having Epoch: 1
-# this libbpf will take over smoothly
-Epoch:          2
-
-%description
-A mirror of bpf-next linux tree bpf-next/tools/lib/bpf directory plus its
-supporting header files. The version of the package reflects the version of
-ABI.
-
-%package devel
-Summary:        Development files for %{name}
-Requires:       %{name} = 2:%{version}-%{release}
-Requires:       kernel-headers >= 5.4.0-1
-
-%description devel
-The %{name}-devel package contains libraries header files for
-developing applications that use %{name}
-
-%package static
-Summary: Static library for libbpf development
-Requires: %{name}-devel = 2:%{version}-%{release}
-
-%description static
-The %{name}-static package contains static library for
-developing applications that use %{name}
-
-%global make_flags DESTDIR=%{buildroot} OBJDIR=%{_builddir} CFLAGS="%{build_cflags} -fPIC" LDFLAGS="%{build_ldflags} -Wl,--no-as-needed" LIBDIR=/%{_libdir} NO_PKG_CONFIG=1
-
-%prep
-%autosetup -n %{githubfull} -p1
-
-%build
-%make_build -C ./src %{make_flags}
-
-%install
-%make_install -C ./src %{make_flags}
-
-%files
-%{_libdir}/libbpf.so.0.3.0
-%{_libdir}/libbpf.so.0
-
-%files devel
-%{_libdir}/libbpf.so
-%{_includedir}/bpf/
-%{_libdir}/pkgconfig/libbpf.pc
-
-%files static
-%{_libdir}/libbpf.a
-
-%changelog
-* Mon Dec 27 2021 sunsuwan<sunsuwan2@huawei.com> - 0.6.1-1.h0
-- update libbpf from v0.1.1 to v0.3
-
-* Sun Sep 26 2021 zhudi<zhudi2@huawei.com> - 0.1.1-1.h1
-- Type:bugfix
-- CVE:
-- SUG:restart
-- DESC: add Use SOCK_CLOEXEC when opening the netlink socket
-
-* Wed Oct 28 2020 hubble_zhu <hubble_zhu@qq.com> - 0.1.1-1
-- update libbpf from v0.0.6 to v0.1.1
-
-* Sun Apr 26 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.0.6-1
-- Package init

_service:tar_scm:libbpf.spec Added

@@ -0,0 +1,94 @@
+%global githubname   libbpf
+%global githubver    0.8.1
+%global githubfull   %{githubname}-%{githubver}
+
+Name:           %{githubname}
+Version:        %{githubver}
+Release:        2
+Summary:        Libbpf library
+
+License:        LGPLv2 or BSD
+URL:            https://github.com/%{githubname}/%{githubname}
+Source:         https://github.com/%{githubname}/%{githubname}/archive/refs/tags/v%{githubver}.tar.gz
+BuildRequires:  gcc elfutils-libelf-devel elfutils-devel
+
+Patch0000:	backport-libbpf-Fix-determine_ptr_size-guessing.patch
+
+# This package supersedes libbpf from kernel-tools,
+# which has default Epoch: 0. By having Epoch: 1
+# this libbpf will take over smoothly
+Epoch:          2
+
+%description
+A mirror of bpf-next linux tree bpf-next/tools/lib/bpf directory plus its
+supporting header files. The version of the package reflects the version of
+ABI.
+
+%package devel
+Summary:        Development files for %{name}
+Requires:       %{name} = 2:%{version}-%{release}
+Requires:       kernel-headers >= 5.10.0
+
+%description devel
+The %{name}-devel package contains libraries header files for
+developing applications that use %{name}
+
+%package static
+Summary: Static library for libbpf development
+Requires: %{name}-devel = 2:%{version}-%{release}
+
+%description static
+The %{name}-static package contains static library for
+developing applications that use %{name}
+
+%global make_flags DESTDIR=%{buildroot} OBJDIR=%{_builddir} CFLAGS="%{build_cflags} -fPIC" LDFLAGS="%{build_ldflags} -Wl,--no-as-needed" LIBDIR=/%{_libdir} NO_PKG_CONFIG=1
+
+%prep
+%autosetup -n %{githubfull} -p1
+
+%build
+%make_build -C ./src %{make_flags}
+
+%install
+%make_install -C ./src %{make_flags}
+
+%files
+%{_libdir}/libbpf.so.%{githubver}
+%{_libdir}/libbpf.so.0
+
+%files devel
+%{_libdir}/libbpf.so
+%{_includedir}/bpf/
+%{_libdir}/pkgconfig/libbpf.pc
+
+%files static
+%{_libdir}/libbpf.a
+
+%changelog
+* Fri Dec 2 2022 zhangmingyi<zhangmingyi5@huawei.com> - 2:0.8.1-2
+- update libbpf.spec source
+
+* Fri Dec 2 2022 zhangmingyi<zhangmingyi5@huawei.com> - 2:0.8.1-1 
+- update master
+
+* Mon Aug 22 2022 hujiawang<hujiawang1@guawei.com> - 2:0.3-3
+- Change the package name
+
+* Wed Aug 3 2022 Lv Ying<lvying6@huawei.com> - 2:0.3-2
+- support detecting and attaching of writable tracepoint program
+  https://lore.kernel.org/bpf/20211004094857.30868-3-hotforest@gmail.com
+
+* Mon Dec 27 2021 sunsuwan<sunsuwan2@huawei.com> - 2:0.3-1
+- update libbpf from v0.1.1 to v0.3
+
+* Sun Sep 26 2021 zhudi<zhudi2@huawei.com> - 0.1.1-1.h1
+- Type:bugfix
+- CVE:
+- SUG:restart
+- DESC: add Use SOCK_CLOEXEC when opening the netlink socket
+
+* Wed Oct 28 2020 hubble_zhu <hubble_zhu@qq.com> - 0.1.1-1
+- update libbpf from v0.0.6 to v0.1.1
+
+* Sun Apr 26 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.0.6-1
+- Package init

_service:tar_scm:backport-libbpf-Fix-determine_ptr_size-guessing.patch Added

@@ -0,0 +1,77 @@
+From a5d75daa8c467a863ecf297982b70ed284adc0e9 Mon Sep 17 00:00:00 2001
+From: Douglas Raillard <douglas.raillard@arm.com>
+Date: Tue, 24 May 2022 10:44:47 +0100
+Subject: PATCH libbpf: Fix determine_ptr_size() guessing
+
+One strategy employed by libbpf to guess the pointer size is by finding
+the size of "unsigned long" type. This is achieved by looking for a type
+of with the expected name and checking its size.
+
+Unfortunately, the C syntax is friendlier to humans than to computers
+as there is some variety in how such a type can be named. Specifically,
+gcc and clang do not use the same names for integer types in debug info:
+
+    - clang uses "unsigned long"
+    - gcc uses "long unsigned int"
+
+Lookup all the names for such a type so that libbpf can hope to find the
+information it wants.
+
+Signed-off-by: Douglas Raillard <douglas.raillard@arm.com>
+Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
+Acked-by: Yonghong Song <yhs@fb.com>
+Link: https://lore.kernel.org/bpf/20220524094447.332186-1-douglas.raillard@arm.com
+---
+ src/btf.c | 26 ++++++++++++++++++++------
+ 1 file changed, 20 insertions(+), 6 deletions(-)
+
+diff --git a/src/btf.c b/src/btf.c
+index bb1e06eb1..3d6c30d9a 100644
+--- a/src/btf.c
++++ b/src/btf.c
+@@ -472,9 +472,22 @@ const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 type_id)
+ 
+ static int determine_ptr_size(const struct btf *btf)
+ {
++	static const char * const long_aliases = {
++		"long",
++		"long int",
++		"int long",
++		"unsigned long",
++		"long unsigned",
++		"unsigned long int",
++		"unsigned int long",
++		"long unsigned int",
++		"long int unsigned",
++		"int unsigned long",
++		"int long unsigned",
++	};
+ 	const struct btf_type *t;
+ 	const char *name;
+-	int i, n;
++	int i, j, n;
+ 
+ 	if (btf->base_btf && btf->base_btf->ptr_sz > 0)
+ 		return btf->base_btf->ptr_sz;
+@@ -485,15 +498,16 @@ static int determine_ptr_size(const struct btf *btf)
+ 		if (!btf_is_int(t))
+ 			continue;
+ 
++		if (t->size != 4 && t->size != 8)
++			continue;
++
+ 		name = btf__name_by_offset(btf, t->name_off);
+ 		if (!name)
+ 			continue;
+ 
+-		if (strcmp(name, "long int") == 0 ||
+-		    strcmp(name, "long unsigned int") == 0) {
+-			if (t->size != 4 && t->size != 8)
+-				continue;
+-			return t->size;
++		for (j = 0; j < ARRAY_SIZE(long_aliases); j++) {
++			if (strcmp(name, long_aliasesj) == 0)
++				return t->size;
+ 		}
+ 	}
+

_service Changed

_service:extract_file:libbpf-0.3.tar.gz Deleted

_service:extract_file:libbpf.yaml Deleted

_service:tar_scm:libbpf-1640605164.425c3ee.tar Deleted

_service:tar_scm:libbpf.yaml Added

_service:tar_scm:v0.8.1.tar.gz Added

Changes of Revision 2