diff --git a/README.en.md b/README.en.md deleted file mode 100644 index dd7805405a9f6c4805bce0334c8da6a7e9bdc6b7..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# libbpf - -#### Description -Automated upstream mirror for libbpf stand-alone build. - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index ec767b86661907efd9e9090239b53233d758dff9..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# libbpf - -#### 介绍 -Automated upstream mirror for libbpf stand-alone build. - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/backport-libbpf-Support-detecting-and-attaching-of-writable-t.patch b/backport-libbpf-Support-detecting-and-attaching-of-writable-t.patch new file mode 100644 index 0000000000000000000000000000000000000000..dc6f17e1a50fa6002b599f98b37452deecd39cad --- /dev/null +++ b/backport-libbpf-Support-detecting-and-attaching-of-writable-t.patch @@ -0,0 +1,34 @@ +From 4d32ba754a242fb31827923c4a6f051063b32fea Mon Sep 17 00:00:00 2001 +From: Hou Tao +Date: Mon, 4 Oct 2021 17:48:56 +0800 +Subject: [PATCH] libbpf: Support detecting and attaching of writable + tracepoint program + +Program on writable tracepoint is BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE, +but its attachment is the same as BPF_PROG_TYPE_RAW_TRACEPOINT. + +Signed-off-by: Hou Tao +Signed-off-by: Andrii Nakryiko +Link: https://lore.kernel.org/bpf/20211004094857.30868-3-hotforest@gmail.com +--- + src/libbpf.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/libbpf.c b/src/libbpf.c +index d9ece93..02e9d33 100644 +--- a/src/libbpf.c ++++ b/src/libbpf.c +@@ -6894,6 +6894,10 @@ static const struct bpf_sec_def section_defs[] = { + .attach_fn = attach_raw_tp), + SEC_DEF("raw_tp/", RAW_TRACEPOINT, + .attach_fn = attach_raw_tp), ++ SEC_DEF("raw_tracepoint.w/", RAW_TRACEPOINT_WRITABLE, ++ .attach_fn = attach_raw_tp), ++ SEC_DEF("raw_tp.w/", RAW_TRACEPOINT_WRITABLE, ++ .attach_fn = attach_raw_tp), + SEC_DEF("tp_btf/", TRACING, + .expected_attach_type = BPF_TRACE_RAW_TP, + .is_attach_btf = true, +-- +2.29.2 + diff --git a/libbpf.spec b/libbpf.spec index 16ce7c8c104bedf02649dab885ad5f80968666b5..671247ee7d065506500392750417ac554fa2b91b 100644 --- a/libbpf.spec +++ b/libbpf.spec @@ -1,17 +1,19 @@ %global githubname libbpf -%global githubver 0.0.6 +%global githubver 0.3 %global githubfull %{githubname}-%{githubver} Name: %{githubname} Version: %{githubver} -Release: 1 +Release: 3 Summary: Libbpf library License: LGPLv2 or BSD URL: https://github.com/%{githubname}/%{githubname} -Source: https://github.com/%{githubname}/%{githubname}/archive/v%{githubver}.tar.gz +Source: https://github.com/%{githubname}/%{githubname}/archive/%{githubname}-%{githubver}.tar.gz BuildRequires: gcc elfutils-libelf-devel elfutils-devel +Patch6000: backport-libbpf-Support-detecting-and-attaching-of-writable-t.patch + # This package supersedes libbpf from kernel-tools, # which has default Epoch: 0. By having Epoch: 1 # this libbpf will take over smoothly @@ -42,7 +44,7 @@ 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} +%autosetup -n %{githubfull} -p1 %build %make_build -C ./src %{make_flags} @@ -51,7 +53,7 @@ developing applications that use %{name} %make_install -C ./src %{make_flags} %files -%{_libdir}/libbpf.so.%{version} +%{_libdir}/libbpf.so.0.3.0 %{_libdir}/libbpf.so.0 %files devel @@ -63,5 +65,24 @@ developing applications that use %{name} %{_libdir}/libbpf.a %changelog -* Sun Apr 26 2020 openEuler Buildteam - 0.13.0-1 +* Mon Aug 22 2022 hujiawang - 2:0.3-3 +- Change the package name + +* Wed Aug 3 2022 Lv Ying - 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 - 2:0.3-1 +- update libbpf from v0.1.1 to v0.3 + +* Sun Sep 26 2021 zhudi - 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 - 0.1.1-1 +- update libbpf from v0.0.6 to v0.1.1 + +* Sun Apr 26 2020 openEuler Buildteam - 0.0.6-1 - Package init diff --git a/v0.0.6.tar.gz b/v0.0.6.tar.gz deleted file mode 100644 index 81c654c0f9f6b88e2525e62cb02a5d774e7371a3..0000000000000000000000000000000000000000 Binary files a/v0.0.6.tar.gz and /dev/null differ diff --git a/v0.3.tar.gz b/v0.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..dc95de423876f1c8ed0fe8ca6c52c020884e4cea Binary files /dev/null and b/v0.3.tar.gz differ