diff --git a/0001-fix-build-error.patch b/0001-fix-build-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..ac3c4f45d79b82333c049f6beef78b3b639ae03d --- /dev/null +++ b/0001-fix-build-error.patch @@ -0,0 +1,30 @@ +From 6cdef5719475291a869b782b4bba5a0bfb52b655 Mon Sep 17 00:00:00 2001 +From: happy_orange +Date: Wed, 5 Apr 2023 14:25:46 +0800 +Subject: [PATCH 1/1] fix build error + +--- + tools/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/Makefile b/tools/Makefile +index 1c0c65c..b9f9825 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -18,11 +18,11 @@ $(build)/tools/%.o: %.c + @mkdir $(shell dirname $@) 2>/dev/null || true + @clang $< $(CFLAGS) -fPIC -c -o $@ + +-$(build)/xudpperf: $(build)/tools/xudpperf.o ++$(build)/xudpperf: $(build)/tools/xudpperf.c + @echo LD $@ + @clang $^ $(LDFLAGS) -o $@ -l pthread + +-$(build)/xudp-echo-server: $(build)/tools/xudp_echo_server.o ++$(build)/xudp-echo-server: $(build)/tools/xudp_echo_server.c + @echo LD $@ + @clang $^ $(LDFLAGS) -o $@ + +-- +2.31.1 + diff --git a/README.md b/README.md new file mode 100644 index 0000000000000000000000000000000000000000..7342728d557c602f51c6d278bba9f3dd9faaf356 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +Anolis OS +======================================= +# 代码仓库说明 +## 分支说明 +>进行代码开发工作时,请注意选择当前版本对应的分支 +* aX分支为对应大版本的主分支,如a8分支对应当前最新版本 +* aX.Y分支为对应小版本的维护分支,如a8.2分支对应8.2版本 +## 开发流程 +1. 首先fork目标分支到自己的namespace +2. 在自己的fork分支上做出修改 +3. 向对应的仓库中提交merge request,源分支为fork分支 diff --git a/libxudp-1.0.1.tar.gz b/libxudp-1.0.1.tar.gz deleted file mode 100644 index d0c16a66a95665f4661598caadcb347e61e082ff..0000000000000000000000000000000000000000 Binary files a/libxudp-1.0.1.tar.gz and /dev/null differ diff --git a/libxudp-1.0.3.tar.gz b/libxudp-1.0.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9ad6506b0e4925c6da0195d00b886e310fb3dd2e Binary files /dev/null and b/libxudp-1.0.3.tar.gz differ diff --git a/libxudp.spec b/libxudp.spec index 310c47dfe7935127b1b5424f1e4d946d42439ec0..fb132aaada46f925fb750e942886698ff6243991 100644 --- a/libxudp.spec +++ b/libxudp.spec @@ -1,7 +1,7 @@ %define anolis_release 1 Name: libxudp -Version: 1.0.1 +Version: 1.0.3 Release: %{anolis_release}%{?dist} Summary: Express UDP(xudp) library Vendor: Alibaba @@ -16,6 +16,7 @@ BuildRequires: elfutils-libelf-devel BuildRequires: libcap-devel BuildRequires: clang BuildRequires: llvm +BuildRequires: git %description Express UDP is a high-performance UDP communication software library based on the xdp socket technology. @@ -38,7 +39,8 @@ Express UDP is a high-performance UDP communication software library based on th %autosetup -n %{name}-%{version} -p1 %build -make prefix=%{buildroot} SO=1 +export CFLAGS=%{nil} +make SO=1 %install mkdir -p %{buildroot}/usr @@ -57,6 +59,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libxudp.so.* %files tools +%{_bindir}/xudp-route6 %{_bindir}/xudp-echo-server %{_bindir}/xudp-map %{_bindir}/xudp-dump @@ -70,9 +73,20 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libxudp.pc %changelog -* Mon Sep 7 2022 Xuan Zhuo - 1.0.1-1 +* Thu Apr 13 2023 happy_orange - 1.0.3-1 +- update to 1.0.3 + +* Thu Apr 13 2023 happy_orange - 1.0.2-2 +- remove the abi and api + +* Mon Feb 27 2023 Xuan Zhuo - 1.0.2-1 +- support ipv6 +- support python3 + +* Wed Sep 7 2022 Xuan Zhuo - 1.0.1-1 - make gcc happy - use /usr/bin/python2 replace /bin/env python2 + * Mon Aug 15 2022 Xuan Zhuo - 1.0.0-1 - Initial libxudp