diff --git a/0001-accel-config-clean-up-double-frees-in-add_group.patch b/0001-accel-config-clean-up-double-frees-in-add_group.patch deleted file mode 100644 index 876b1ac48bb2aafff34b82658c19f018c4f41f65..0000000000000000000000000000000000000000 --- a/0001-accel-config-clean-up-double-frees-in-add_group.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a073b40ea293dec87af5f887bb90744ed244e0c9 Mon Sep 17 00:00:00 2001 -From: Jerry Snitselaar -Date: Mon, 18 Oct 2021 15:10:00 -0700 -Subject: [PATCH 1/3] accel-config: clean up double frees in add_group - -free(group) is called after jumping to the err_group label, -so don't call free(group) in paths jumping there. - -Signed-off-by: Jerry Snitselaar ---- - accfg/lib/libaccfg.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/accfg/lib/libaccfg.c b/accfg/lib/libaccfg.c -index f4fc17e5ca93..a13be34a7ef5 100644 ---- a/accfg/lib/libaccfg.c -+++ b/accfg/lib/libaccfg.c -@@ -870,13 +870,11 @@ static void *add_group(void *parent, int id, const char *group_base, - group_base_string = strdup(group_base); - if (!group_base_string) { - err(ctx, "conversion of group_base_string failed\n"); -- free(group); - close(dfd); - goto err_group; - } - if (sscanf(basename(group_base_string), - "group%" SCNu64 ".%" SCNu64, &device_id, &group_id) != 2) { -- free(group); - close(dfd); - goto err_group; - } --- -2.33.0 - diff --git a/0001-testing-vercheck.patch b/0001-testing-vercheck.patch deleted file mode 100644 index b5e188bf6740969d091302d4bf4eafaac0a8df2b..0000000000000000000000000000000000000000 --- a/0001-testing-vercheck.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur idxd-config-accel-config-v3.4.2/test/dsa_user_test_runner.sh idxd-config-accel-config-v3.4.2-new/test/dsa_user_test_runner.sh ---- idxd-config-accel-config-v3.4.2/test/dsa_user_test_runner.sh 2021-09-28 16:03:05.000000000 -0700 -+++ idxd-config-accel-config-v3.4.2-new/test/dsa_user_test_runner.sh 2021-10-13 08:26:34.098233734 -0700 -@@ -14,7 +14,7 @@ - - [ ! -f "$DSATEST" ] && echo "fail: $LINENO" && exit 1 - --check_min_kver "5.6" || do_skip "kernel does not support idxd" -+check_min_kver "4.18" || do_skip "kernel does not support idxd" - - # skip if no pasid support as dsa_test does not support operation w/o pasid yet. - [ ! -f "/sys/bus/dsa/devices/$DSA/pasid_enabled" ] && echo "No SVM support" && exit "$EXIT_SKIP" -diff -ur idxd-config-accel-config-v3.4.2/test/libaccfg.c idxd-config-accel-config-v3.4.2-new/test/libaccfg.c ---- idxd-config-accel-config-v3.4.2/test/libaccfg.c 2021-09-28 16:03:05.000000000 -0700 -+++ idxd-config-accel-config-v3.4.2-new/test/libaccfg.c 2021-10-13 08:27:08.099387351 -0700 -@@ -1003,7 +1003,7 @@ - struct kmod_module *mod, *mdev_mod; - struct accfg_device *device; - -- if (!accfg_test_attempt(test, KERNEL_VERSION(5, 6, 0))) -+ if (!accfg_test_attempt(test, KERNEL_VERSION(4, 18, 0))) - return EXIT_SKIP; - - accfg_set_log_priority(ctx, loglevel); diff --git a/0003-accel-config-remove-redundant-assignment-in-umwait.patch b/0003-accel-config-remove-redundant-assignment-in-umwait.patch deleted file mode 100644 index 2045397ba5169f369fe0066367ecebac81e644b5..0000000000000000000000000000000000000000 --- a/0003-accel-config-remove-redundant-assignment-in-umwait.patch +++ /dev/null @@ -1,27 +0,0 @@ -From dc03a40adfaaded6c3e2d9bb0bff2218b187daae Mon Sep 17 00:00:00 2001 -From: Jerry Snitselaar -Date: Mon, 18 Oct 2021 15:47:27 -0700 -Subject: [PATCH 3/3] accel-config: remove redundant assignment in umwait - -Signed-off-by: Jerry Snitselaar ---- - test/dsa.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/test/dsa.c b/test/dsa.c -index 5396b1b97d3a..961f5a73990e 100644 ---- a/test/dsa.c -+++ b/test/dsa.c -@@ -393,9 +393,6 @@ static inline int umwait(unsigned long timeout, unsigned int state) - uint32_t timeout_low = (uint32_t)timeout; - uint32_t timeout_high = (uint32_t)(timeout >> 32); - -- timeout_low = (uint32_t)timeout; -- timeout_high = (uint32_t)(timeout >> 32); -- - asm volatile(".byte 0xf2, 0x48, 0x0f, 0xae, 0xf1\t\n" - "setc %0\t\n" - : "=r"(r) --- -2.33.0 - 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/accel-config-v3.4.6.4.tar.gz b/accel-config-v3.4.6.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..60752f3d4b10980ca84a218f2ebf243f9f6c30b8 Binary files /dev/null and b/accel-config-v3.4.6.4.tar.gz differ diff --git a/accel-config.spec b/accel-config.spec index ac26cc332ed54259ae4068de5c62fc40bf35d098..e099e8a535853ce2cc10c2c4dbae6eae97b54267 100644 --- a/accel-config.spec +++ b/accel-config.spec @@ -1,10 +1,9 @@ -%define anolis_release .0.1 - +%define anolis_release 1 %global project_name idxd-config Name: accel-config -Version: 3.4.2 -Release: 1%{anolis_release}%{?dist} +Version: 3.4.6.4 +Release: %{anolis_release}%{?dist} Summary: Configure accelerator subsystem devices # The entire source code is under GPLv2 except for accel-config # library which is mostly LGPLv2, ccan/list which is BSD-MIT and @@ -12,12 +11,8 @@ Summary: Configure accelerator subsystem devices License: GPLv2 and LGPLv2+ and MIT and CC0 URL: https://github.com/intel/%{project_name} Source0: %{URL}/archive/%{name}-v%{version}.tar.gz -Patch0: 0001-testing-vercheck.patch -Patch1: 0001-accel-config-clean-up-double-frees-in-add_group.patch -Patch2: 0003-accel-config-remove-redundant-assignment-in-umwait.patch -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: glibc +Requires: %{name}-libs = %{version}-%{release} BuildRequires: gcc BuildRequires: autoconf BuildRequires: asciidoc @@ -31,11 +26,9 @@ BuildRequires: pkgconfig(json-c) BuildRequires: pkgconfig(libudev) BuildRequires: systemd -Provides: /usr/bin/%{name} - # accel-config is for configuring Intel DSA (Data-Streaming # Accelerator) subsystem in the Linux kernel. It supports x86 only. -ExclusiveArch: %{ix86} x86_64 +ExclusiveArch: x86_64 %description Utility library for configuring the accelerator subsystem. @@ -43,7 +36,7 @@ Utility library for configuring the accelerator subsystem. %package devel Summary: Development files for libaccfg License: LGPLv2+ -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -55,7 +48,6 @@ Summary: Configuration library for accelerator subsystem devices # All source code of configuration library is LGPLv2, except # ccan/list which is BSD-MIT and the rest of ccan/ which is CC0. License: LGPLv2+ and MIT and CC0 -Requires: %{name}%{?_isa} = %{version}-%{release} %description libs Libraries for %{name}. @@ -63,18 +55,18 @@ Libraries for %{name}. %package test Summary: Tests for accel-config License: GPLv2 -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description test Tests for accel-config command. %package doc -Summary: Documents for %{name} -BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Summary: Documentation files for %{name} +Requires: %{name}-libs = %{version}-%{release} +BuildArch: noarch -%description doc -Doc pages for %{name}. +%description doc +The %{name}-doc package contains documentation files for %{name}. %prep %autosetup -p1 -n %{project_name}-%{name}-v%{version} @@ -98,6 +90,7 @@ make check %{_bindir}/%{name} %{_mandir}/man1/%{name}* %{_sysconfdir}/%{name}/%{name}.conf.sample +%{_datadir}/accel-config/contrib/configs/* %files libs %license Documentation/COPYING licenses/BSD-MIT licenses/CC0 @@ -112,15 +105,14 @@ make check %files test %license Documentation/COPYING LICENSE_GPL_2_0 -#%doc test/README.md %{_datadir}/accel-config/test/* %files doc -%doc README.md +%doc README.md TODO test/README.md %changelog -* Fri Jul 15 2022 Zhao Hang - 3.4.2-1.0.1 -- Add doc sub package +* Wed Sep 21 2022 happy_orange - 3.4.6.4-1 +- Update to 3.4.6.4 * Thu Sep 09 2021 Jerry Snitselaar - 3.4.2-1 - Rebase to 3.4.2 and add test subpackage. diff --git a/download b/download deleted file mode 100644 index 1d1bc7e0bde7650a87d4759a79c386cc3befaa58..0000000000000000000000000000000000000000 --- a/download +++ /dev/null @@ -1 +0,0 @@ -8003ab00e6ce31a7d4e07a2ffaa16814 accel-config-v3.4.2.tar.gz