diff --git a/0001-testing-vercheck.patch b/0001-testing-vercheck.patch new file mode 100644 index 0000000000000000000000000000000000000000..8ad2812aa32502799aed2bdf3b1b98e3e9e0211a --- /dev/null +++ b/0001-testing-vercheck.patch @@ -0,0 +1,36 @@ +diff --color -ur idxd-config-accel-config-v3.4.8/test/dsa_user_test_runner.sh idxd-config-accel-config-v3.4.8-new/test/dsa_user_test_runner.sh +--- idxd-config-accel-config-v3.4.8/test/dsa_user_test_runner.sh 2022-09-21 14:16:06.000000000 -0700 ++++ idxd-config-accel-config-v3.4.8-new/test/dsa_user_test_runner.sh 2022-10-06 16:36:02.838178412 -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 --color -ur idxd-config-accel-config-v3.4.8/test/iaa_user_test_runner.sh idxd-config-accel-config-v3.4.8-new/test/iaa_user_test_runner.sh +--- idxd-config-accel-config-v3.4.8/test/iaa_user_test_runner.sh 2022-09-21 14:16:06.000000000 -0700 ++++ idxd-config-accel-config-v3.4.8-new/test/iaa_user_test_runner.sh 2022-10-06 16:35:43.989998045 -0700 +@@ -14,7 +14,7 @@ + + [ ! -f "$IAATEST" ] && 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 iaa_test does not support operation w/o pasid yet. + [ ! -f "/sys/bus/dsa/devices/$IAA/pasid_enabled" ] && echo "No SVM support" && exit "$EXIT_SKIP" +diff --color -ur idxd-config-accel-config-v3.4.8/test/libaccfg.c idxd-config-accel-config-v3.4.8-new/test/libaccfg.c +--- idxd-config-accel-config-v3.4.8/test/libaccfg.c 2022-09-21 14:16:06.000000000 -0700 ++++ idxd-config-accel-config-v3.4.8-new/test/libaccfg.c 2022-10-06 16:36:31.090448787 -0700 +@@ -966,7 +966,7 @@ + struct accfg_device *device; + struct log_ctx log_ctx; + +- 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/README.md b/README.md deleted file mode 100644 index 7342728d557c602f51c6d278bba9f3dd9faaf356..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 60752f3d4b10980ca84a218f2ebf243f9f6c30b8..0000000000000000000000000000000000000000 Binary files a/accel-config-v3.4.6.4.tar.gz and /dev/null differ diff --git a/accel-config-v3.5.0.tar.gz b/accel-config-v3.5.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..46ebdd18136377e1c0074cda0df8c3d21ad28f09 Binary files /dev/null and b/accel-config-v3.5.0.tar.gz differ diff --git a/accel-config.spec b/accel-config.spec index e099e8a535853ce2cc10c2c4dbae6eae97b54267..aa4ebe8b28a3dd636dfd3e0ed5b6eef6715f5a25 100644 --- a/accel-config.spec +++ b/accel-config.spec @@ -1,9 +1,8 @@ -%define anolis_release 1 %global project_name idxd-config Name: accel-config -Version: 3.4.6.4 -Release: %{anolis_release}%{?dist} +Version: 3.5.0 +Release: 1%{?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 @@ -11,8 +10,9 @@ 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 -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} BuildRequires: gcc BuildRequires: autoconf BuildRequires: asciidoc @@ -24,11 +24,12 @@ BuildRequires: pkgconfig(libkmod) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(json-c) BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(zlib) BuildRequires: systemd # accel-config is for configuring Intel DSA (Data-Streaming # Accelerator) subsystem in the Linux kernel. It supports x86 only. -ExclusiveArch: x86_64 +ExclusiveArch: %{ix86} x86_64 %description Utility library for configuring the accelerator subsystem. @@ -36,7 +37,7 @@ Utility library for configuring the accelerator subsystem. %package devel Summary: Development files for libaccfg License: LGPLv2+ -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -48,6 +49,7 @@ 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}. @@ -55,19 +57,11 @@ Libraries for %{name}. %package test Summary: Tests for accel-config License: GPLv2 -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description test Tests for accel-config command. -%package doc -Summary: Documentation files for %{name} -Requires: %{name}-libs = %{version}-%{release} -BuildArch: noarch - -%description doc -The %{name}-doc package contains documentation files for %{name}. - %prep %autosetup -p1 -n %{project_name}-%{name}-v%{version} @@ -89,10 +83,10 @@ make check %license licenses/accel-config-licenses LICENSE_GPL_2_0 %{_bindir}/%{name} %{_mandir}/man1/%{name}* -%{_sysconfdir}/%{name}/%{name}.conf.sample -%{_datadir}/accel-config/contrib/configs/* +%{_sysconfdir}/%{name}/contrib/configs/* %files libs +%doc README.md %license Documentation/COPYING licenses/BSD-MIT licenses/CC0 %license licenses/libaccel-config-licenses accfg/lib/LICENSE_LGPL_2_1 %{_libdir}/lib%{name}.so.* @@ -105,14 +99,21 @@ make check %files test %license Documentation/COPYING LICENSE_GPL_2_0 -%{_datadir}/accel-config/test/* - -%files doc -%doc README.md TODO test/README.md +#%doc test/README.md +%{_prefix}/lib/accel-config/test/* %changelog -* Wed Sep 21 2022 happy_orange - 3.4.6.4-1 -- Update to 3.4.6.4 +* Sun Oct 16 2022 Jerry Snitselaar - 3.5.0-1 +- Rebase to the 3.5.0 release. +resolves: rhbz#2101608 + +* Thu Oct 06 2022 Jerry Snitselaar - 3.4.8-1 +- Rebase to 3.4.8 release. +resolves: rhbz#2101608 + +* Sun Apr 03 2022 Jerry Snitselaar - 3.4.6.3-1 +- Rebase to 3.4.6.3 release. +resolves: rhbz#2040076 * Thu Sep 09 2021 Jerry Snitselaar - 3.4.2-1 - Rebase to 3.4.2 and add test subpackage.