accel-config: Fix debuginfo builds

.accel-config.metadata

@@ -0,0 +1 @@
+5432462e78a9f4b551c85e91d65cfd180816813f accel-config-v3.5.3.tar.gz

.gitignore

@@ -6,4 +6,3 @@
 /accel-config-v3.4.8.tar.gz
 /accel-config-v3.5.0.tar.gz
 /accel-config-v3.5.3.tar.gz
-/accel-config-v4.1.3.tar.gz

0001-accel-config-test-only-configure-ats_disable-if-supp.patch

@@ -1,54 +0,0 @@
-From bcc6e90baa61434568e8225a7fcdc070610dae46 Mon Sep 17 00:00:00 2001
-From: Jerry Snitselaar <jsnitsel@redhat.com>
-Date: Thu, 30 Nov 2023 14:58:06 -0700
-Subject: [PATCH] accel-config/test: only configure ats_disable if supported
-'Content-type: text/plain'
-
-Upstream Status: RHEL-only
-
-Don't try to configure ats_disable if it isn't supported.
-Temporary work around until there is a complete upstream
-solution, and we don't ship the testing bits just use
-them for test.
-
-Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
----
- test/libaccfg.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/test/libaccfg.c b/test/libaccfg.c
-index bfe277b996cf..4a580b2bb02e 100644
---- a/test/libaccfg.c
-+++ b/test/libaccfg.c
-@@ -240,7 +240,9 @@ static int config_wq(struct accfg_ctx *ctx, struct accfg_device *device,
- 	if (wq_param->threshold)
- 		SET_ERR(rc, accfg_wq_set_threshold(wq, wq_param->threshold));
- 
--	SET_ERR(rc, accfg_wq_set_ats_disable(wq, wq_param->ats_disable));
-+	if (accfg_wq_get_ats_disable(wq) >= 0) {
-+		SET_ERR(rc, accfg_wq_set_ats_disable(wq, wq_param->ats_disable));
-+	}
- 	/* Don't fail test if per wq ats disable is not supported */
- 	if (rc == -EOPNOTSUPP)
- 		rc = 0;
-@@ -251,6 +253,7 @@ static int config_wq(struct accfg_ctx *ctx, struct accfg_device *device,
- static int check_wq(struct accfg_ctx *ctx, struct accfg_device *device,
- 		struct accfg_wq *wq, struct wq_parameters *wq_param)
- {
-+	int ats_disable = 0;
- 
- 	if (wq_param->wq_size != accfg_wq_get_size(wq)) {
- 		fprintf(stderr, "%s failed on wq_size\n", __func__);
-@@ -290,7 +293,8 @@ static int check_wq(struct accfg_ctx *ctx, struct accfg_device *device,
- 		fprintf(stderr, "%s failed on wq name\n", __func__);
- 		return -EINVAL;
- 	}
--	if (wq_param->ats_disable != accfg_wq_get_ats_disable(wq)) {
-+	ats_disable = accfg_wq_get_ats_disable(wq);
-+	if (ats_disable >= 0 && (wq_param->ats_disable != ats_disable)) {
- 		fprintf(stderr, "%s failed on ats_disable\n", __func__);
- 		return -EINVAL;
- 	}
--- 
-2.41.0
-

accel-config.spec

@@ -1,13 +1,15 @@
 %global	project_name	idxd-config
 
 Name:		accel-config
-Version:	4.1.3
+Version:	3.5.3
 Release:	2%{?dist}
 Summary:	Configure accelerator subsystem devices
-License:	GPL-2.0-only
+# The entire source code is under GPLv2 except for accel-config
+# library which is mostly LGPLv2.1, ccan/list which is BSD-MIT and
+# the rest of ccan which is CC0.
+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-accel-config-test-only-configure-ats_disable-if-supp.patch
 
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 BuildRequires:	gcc
@@ -16,7 +18,6 @@ BuildRequires:	asciidoc
 BuildRequires:	xmlto
 BuildRequires:	automake
 BuildRequires:	libtool
-BuildRequires:  openssl-devel
 BuildRequires:	pkgconfig
 BuildRequires:	pkgconfig(libkmod)
 BuildRequires:	pkgconfig(uuid)
@@ -35,7 +36,7 @@ Utility library for configuring the accelerator subsystem.
 
 %package devel
 Summary:	Development files for libaccfg
-License:	LGPL-2.1-only
+License:	LGPLv2+
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 %description devel
@@ -45,7 +46,9 @@ developing applications that use %{name}.
 
 %package libs
 Summary:	Configuration library for accelerator subsystem devices
-License:	LGPL-2.1-only
+# All source code of configuration library is LGPLv2.1, 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
@@ -53,7 +56,7 @@ Libraries for %{name}.
 
 %package test
 Summary:        Tests for accel-config
-License:        GPL-2.0-only
+License:        GPLv2
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description test
@@ -100,15 +103,6 @@ make check
 %{_libexecdir}/accel-config/test/*
 
 %changelog
-* Wed Jan 17 2024 Jerry Snitselaar <jsnitsel@redhat.com> - 4.1.3-2
-- Fix SPDX tags
-Resolves: RHEL-15610
-
-* Fri Dec 01 2023 Jerry Snitselaar <jsnitsel@redhat.com> - 4.1.3-1
-- Rebase to 4.1.3 release
-- Update License tags to SPDX identifiers
-Resolves: RHEL-15610
-
 * Tue Apr 18 2023 Jerry Snitselaar <jsnitsel@redhat.com> - 3.5.3-2
 - Remove spec file variable that blocked debuginfo build
 Resolves: rhz#2153899

sources

@@ -1 +1 @@
-SHA512 (accel-config-v4.1.3.tar.gz) = d3c56e14fe497558c4d593e99eee0da184131acdb86fd33be3ab7221985ce94194f4b80edc96b192a67063cb9e8e23480af6e02f46ff593c7d52f77d92508506
+SHA512 (accel-config-v3.5.3.tar.gz) = f6a579362c241deeb3cb2e47ba11616801eac5466206eac335bd259c42d4c777b57c0ddb29a2800d24be9d029ece09df86bbfb45c96780ec2c4add262f10d568