From 282dd6345e5726273b790cecbea7d57a58c623d3 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sat, 14 Jan 2023 08:09:40 +0000 Subject: [PATCH] Auto sync2gitlab import of accel-config-3.5.0-1.el8.src.rpm --- .gitignore | 1 + 0001-testing-vercheck.patch | 24 ++++++++++++++++++------ accel-config.spec | 16 ++++++++++++---- sources | 2 +- 4 files changed, 32 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 1088432..589492b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /accel-config-v3.4.2.tar.gz /accel-config-v3.4.6.3.tar.gz +/accel-config-v3.5.0.tar.gz diff --git a/0001-testing-vercheck.patch b/0001-testing-vercheck.patch index 586d43e..8ad2812 100644 --- a/0001-testing-vercheck.patch +++ b/0001-testing-vercheck.patch @@ -1,6 +1,6 @@ -diff -ur idxd-config-accel-config-v3.4.6.2/test/dsa_user_test_runner.sh idxd-config-accel-config-v3.4.6.2-new/test/dsa_user_test_runner.sh ---- idxd-config-accel-config-v3.4.6.2/test/dsa_user_test_runner.sh 2022-03-22 16:13:44.000000000 -0700 -+++ idxd-config-accel-config-v3.4.6.2-new/test/dsa_user_test_runner.sh 2022-04-04 22:36:15.080120329 -0700 +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 @@ -10,9 +10,21 @@ diff -ur idxd-config-accel-config-v3.4.6.2/test/dsa_user_test_runner.sh idxd-con # 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.6.2/test/libaccfg.c idxd-config-accel-config-v3.4.6.2-new/test/libaccfg.c ---- idxd-config-accel-config-v3.4.6.2/test/libaccfg.c 2022-03-22 16:13:44.000000000 -0700 -+++ idxd-config-accel-config-v3.4.6.2-new/test/libaccfg.c 2022-04-04 22:36:26.861224525 -0700 +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; diff --git a/accel-config.spec b/accel-config.spec index 9f506f5..aa4ebe8 100644 --- a/accel-config.spec +++ b/accel-config.spec @@ -1,7 +1,7 @@ %global project_name idxd-config Name: accel-config -Version: 3.4.6.3 +Version: 3.5.0 Release: 1%{?dist} Summary: Configure accelerator subsystem devices # The entire source code is under GPLv2 except for accel-config @@ -24,6 +24,7 @@ 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 @@ -82,8 +83,7 @@ make check %license licenses/accel-config-licenses LICENSE_GPL_2_0 %{_bindir}/%{name} %{_mandir}/man1/%{name}* -%{_sysconfdir}/%{name}/%{name}.conf.sample -%{_datadir}/%{name}/contrib/* +%{_sysconfdir}/%{name}/contrib/configs/* %files libs %doc README.md @@ -100,9 +100,17 @@ make check %files test %license Documentation/COPYING LICENSE_GPL_2_0 #%doc test/README.md -%{_datadir}/%{name}/test/* +%{_prefix}/lib/accel-config/test/* %changelog +* 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 diff --git a/sources b/sources index 1fdc46d..61579c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (accel-config-v3.4.6.3.tar.gz) = 703d70c309a06b0f0f90cc7434d43d7eaa067c10c79263778eeb50cfbbd0e540a3755ad3af6109900577e336f20d258f9381e1825807ed3e47fe80f322d6d8a3 +SHA512 (accel-config-v3.5.0.tar.gz) = c27806eae5d66e36e5dbebfb7552fa43ffb3df880d2d2f0708e2c0c521d6a56455888ce1166c0e5f5069561506256302cce05afb5322829192d888856ae75153