Skip to content

Commit a56f7c4

Browse files
yepmunchunyepmunchun
committed
Intel RDT user space utility
- add intel-cmt-cat v25.04 - include user space utilities (e.g. pqos) Signed-off-by: Mun Chun Yep <mun.chun.yep@intel.com>
1 parent 07b6f4d commit a56f7c4

File tree

9 files changed

+114
-82
lines changed

9 files changed

+114
-82
lines changed

‎SPECS-EXTENDED/intel-cmt-cat/intel-cmt-cat.signatures.json‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

SPECS-EXTENDED/intel-cmt-cat/0001-alter-install-paths.patch renamed to SPECS/intel-cmt-cat/0001-alter-install-paths.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Index: intel-cmt-cat-24.05/lib/Makefile
1313
PREFIX ?= /usr/local
1414
-LIB_INSTALL_DIR ?= $(PREFIX)/lib
1515
-HDR_DIR ?= $(PREFIX)/include
16-
+LIB_INSTALL_DIR ?= $(DESTDIR)/usr/lib64
16+
+LIB_INSTALL_DIR ?= $(DESTDIR)/usr/lib
1717
+HDR_DIR ?= $(DESTDIR)/usr/include
1818
DEPFILE = $(LIB).dep
1919
-NOLDCONFIG ?= n

SPECS-EXTENDED/intel-cmt-cat/0002-remove-build-and-install-of-examples.patch renamed to SPECS/intel-cmt-cat/0002-remove-build-and-install-of-examples.patch

File renamed without changes.

SPECS-EXTENDED/intel-cmt-cat/0003-allow-debian-flags-to-be-added.patch renamed to SPECS/intel-cmt-cat/0003-allow-debian-flags-to-be-added.patch

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ Description: Hard code in hardening options
22
Forwarded: not-needed
33
Author: Colin Ian King <colin.i.king@gmail.com>
44

5-
Index: intel-cmt-cat-24.05/lib/Makefile
5+
Index: intel-cmt-cat-25.04/lib/Makefile
66
===================================================================
7-
--- intel-cmt-cat-24.05.orig/lib/Makefile
8-
+++ intel-cmt-cat-24.05/lib/Makefile
7+
--- intel-cmt-cat-25.04.orig/lib/Makefile
8+
+++ intel-cmt-cat-25.04/lib/Makefile
99
@@ -39,8 +39,8 @@ LIB = libpqos
10-
VERSION = 6.0.0
10+
VERSION = 6.0.1
1111
SO_VERSION = 6
1212
SHARED ?= y
1313
-LDFLAGS = -L. -lpthread -z noexecstack -z relro -z now
@@ -17,10 +17,10 @@ Index: intel-cmt-cat-24.05/lib/Makefile
1717
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
1818
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
1919
-Wcast-qual -Wundef -Wwrite-strings \
20-
Index: intel-cmt-cat-24.05/pqos/Makefile
20+
Index: intel-cmt-cat-25.04/pqos/Makefile
2121
===================================================================
22-
--- intel-cmt-cat-24.05.orig/pqos/Makefile
23-
+++ intel-cmt-cat-24.05/pqos/Makefile
22+
--- intel-cmt-cat-25.04.orig/pqos/Makefile
23+
+++ intel-cmt-cat-25.04/pqos/Makefile
2424
@@ -38,9 +38,9 @@ include ../pre-build.mk
2525

2626
OBJDIR = obj
@@ -33,10 +33,10 @@ Index: intel-cmt-cat-24.05/pqos/Makefile
3333
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
3434
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
3535
-Wcast-qual -Wundef -Wwrite-strings \
36-
Index: intel-cmt-cat-24.05/rdtset/Makefile
36+
Index: intel-cmt-cat-25.04/rdtset/Makefile
3737
===================================================================
38-
--- intel-cmt-cat-24.05.orig/rdtset/Makefile
39-
+++ intel-cmt-cat-24.05/rdtset/Makefile
38+
--- intel-cmt-cat-25.04.orig/rdtset/Makefile
39+
+++ intel-cmt-cat-25.04/rdtset/Makefile
4040
@@ -37,9 +37,9 @@
4141
include ../pre-build.mk
4242

@@ -49,10 +49,10 @@ Index: intel-cmt-cat-24.05/rdtset/Makefile
4949
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
5050
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
5151
-Wcast-qual -Wundef -Wwrite-strings \
52-
Index: intel-cmt-cat-24.05/tools/membw/Makefile
52+
Index: intel-cmt-cat-25.04/tools/membw/Makefile
5353
===================================================================
54-
--- intel-cmt-cat-24.05.orig/tools/membw/Makefile
55-
+++ intel-cmt-cat-24.05/tools/membw/Makefile
54+
--- intel-cmt-cat-25.04.orig/tools/membw/Makefile
55+
+++ intel-cmt-cat-25.04/tools/membw/Makefile
5656
@@ -44,7 +44,7 @@ PREFIX ?= /usr/local
5757
BIN_DIR = $(DESTDIR)/usr/bin
5858
MAN_DIR = $(DESTDIR)/usr/share/man/man8

‎SPECS/intel-cmt-cat/intel-cmt-cat.signatures.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"Signatures": {
3+
"intel-cmt-cat-25.04.tar.gz": "5841e503acd5baae310ac4c9c74921f606479442ec6d59ef2f9cbbfb94a8c980"
4+
}
5+
}
6+

SPECS-EXTENDED/intel-cmt-cat/intel-cmt-cat.spec renamed to SPECS/intel-cmt-cat/intel-cmt-cat.spec

Lines changed: 84 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,34 @@
1-
Vendor: Microsoft Corporation
2-
Distribution: Azure Linux
3-
# Copyright (c) 2016-2020, Intel Corporation
4-
#
5-
# Redistribution and use in source and binary forms, with or without
6-
# modification, are permitted provided that the following conditions are met:
7-
#
8-
# * Redistributions of source code must retain the above copyright notice,
9-
# this list of conditions and the following disclaimer.
10-
# * Redistributions in binary form must reproduce the above copyright
11-
# notice, this list of conditions and the following disclaimer in the
12-
# documentation and/or other materials provided with the distribution.
13-
# * Neither the name of Intel Corporation nor the names of its contributors
14-
# may be used to endorse or promote products derived from this software
15-
# without specific prior written permission.
16-
#
17-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
18-
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19-
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20-
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
21-
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22-
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
23-
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
24-
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
25-
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
26-
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27-
28-
%global libpqos_ver 6.0.0
1+
%global libpqos_ver 6.0.1
292
%global desc %{expand: \
303
This package provides basic support for Intel Resource Director Technology
314
including, Cache Monitoring Technology (CMT), Memory Bandwidth Monitoring
325
(MBM), Cache Allocation Technology (CAT), Code and Data Prioritization
336
(CDP) and Memory Bandwidth Allocation (MBA).}
347

35-
Name: intel-cmt-cat
36-
Version: 24.05
37-
Release: 1%{?dist}
38-
Summary: Intel cache monitoring and allocation technology config tool
8+
Summary: Intel cache monitoring and allocation technology config tool
9+
Name: intel-cmt-cat
10+
Version: 25.04
11+
Release: 2%{?dist}
12+
License: BSD-3-Clause
13+
Vendor: Intel Corporation
14+
Distribution: Edge Microvisor Toolkit
15+
URL: https://github.com/intel/intel-cmt-cat
16+
Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
17+
Patch0: 0001-alter-install-paths.patch
18+
Patch1: 0002-remove-build-and-install-of-examples.patch
19+
Patch2: 0003-allow-debian-flags-to-be-added.patch
3920

40-
License: BSD-3-Clause
41-
URL: https://github.com/intel/intel-cmt-cat
42-
Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
21+
ExclusiveArch: x86_64
4322

44-
Patch0: 0001-alter-install-paths.patch
45-
Patch1: 0002-remove-build-and-install-of-examples.patch
46-
Patch2: 0003-allow-debian-flags-to-be-added.patch
47-
48-
ExclusiveArch: x86_64
49-
50-
BuildRequires: gcc
51-
BuildRequires: make
23+
BuildRequires: gcc
24+
BuildRequires: make
5225

5326
%description
5427
%{desc}
5528

5629
%package devel
57-
Summary: Development files for %{name}
58-
Requires: %{name}%{?_isa} = %{version}-%{release}
30+
Summary: Development files for %{name}
31+
Requires: %{name}%{?_isa} = %{version}-%{release}
5932

6033
%description devel %{desc}
6134

@@ -68,20 +41,20 @@ Development files.
6841
%make_build
6942

7043
%install
71-
%make_install
44+
%make_install BIN_DIR="%{buildroot}%{_bindir}" SBIN_DIR="%{buildroot}%{_sbindir}"
7245

7346
%ldconfig_scriptlets
7447

7548
%files
7649
%license LICENSE
7750
%doc ChangeLog README.md
7851
%{_bindir}/membw
79-
%{_sbindir}/pqos
80-
%{_sbindir}/pqos-msr
81-
%{_sbindir}/pqos-os
82-
%{_sbindir}/rdtset
83-
%{_lib64dir}/libpqos.so.6
84-
%{_lib64dir}/libpqos.so.%{libpqos_ver}
52+
%{_bindir}/pqos
53+
%{_bindir}/pqos-msr
54+
%{_bindir}/pqos-os
55+
%{_bindir}/rdtset
56+
%{_libdir}/libpqos.so.6
57+
%{_libdir}/libpqos.so.%{libpqos_ver}
8558
%{_mandir}/man8/membw.8*
8659
%{_mandir}/man8/pqos.8*
8760
%{_mandir}/man8/pqos-msr.8*
@@ -90,15 +63,68 @@ Development files.
9063

9164
%files -n %{name}-devel
9265
%{_includedir}/pqos.h
93-
%{_lib64dir}/libpqos.so
66+
%{_libdir}/libpqos.so
9467

9568
%changelog
96-
* Mon Nov 11 2024 Sumit Jena <v-sumitjena@microsoft.com> - 24.05-1
97-
- Update to version 24.05
98-
- License verified.
69+
* Thu Jun 05 2025 Mun Chun Yep <mun.chun.yep@intel.com> - 25.04-2
70+
- Initial Edge Microvisor Toolkit import from Fedora 43 (license: MIT). License verified.
71+
72+
* Tue Apr 29 2025 Ali Erdinc Koroglu <aekoroglu@fedoraproject.org> - 25.04-1
73+
- Update to 25.04
74+
75+
* Wed Feb 12 2025 Ali Erdinc Koroglu <aekoroglu@fedoraproject.org> - 24.05-4
76+
- Merging upstream patches and Rawhide FTBFS fix
77+
78+
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 24.05-3
79+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
80+
81+
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 24.05-2
82+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
83+
84+
* Wed Jun 26 2024 Ali Erdinc Koroglu <aekoroglu@fedoraproject.org> - 24.05-1
85+
- Update to 24.05
86+
87+
* Wed Mar 13 2024 Ali Erdinc Koroglu <aekoroglu@fedoraproject.org> - 23.11.1-1
88+
- Update to 23.11.1
89+
90+
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 23.11-3
91+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
92+
93+
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 23.11-2
94+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
95+
96+
* Mon Nov 13 2023 Ali Erdinc Koroglu <aekoroglu@fedoraproject.org> - 23.11-1
97+
- Update to 23.11
9998

100-
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 4.1.0-2
101-
- Initial CBL-Mariner import from Fedora 33 (license: MIT).
99+
* Thu Aug 31 2023 Ali Erdinc Koroglu <aekoroglu@fedoraproject.org> - 23.08-1
100+
- Update to 23.08
101+
102+
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.0-2
103+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
104+
105+
* Mon Mar 06 2023 Raghavan Kanagaraj <raghavan.kanagaraj@intel.com> - 4.5.0-1
106+
- New release 4.5.0
107+
108+
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.1-2
109+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
110+
111+
* Wed Oct 12 2022 Marcel cornu <marcel.d.cornu@intel.com> - 4.4.1-1
112+
- New release 4.4.1
113+
114+
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0-2
115+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
116+
117+
* Tue Mar 1 2022 Khawar Abbasi <khawar.abbasi@intel.com> - 4.3.0-1
118+
- New release 4.3.0
119+
120+
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-4
121+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
122+
123+
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-3
124+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
125+
126+
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-2
127+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
102128

103129
* Fri Dec 18 2020 Khawar Abbasi <khawar.abbasi@intel.com> - 4.1.0-1
104130
- New release 4.1.0
@@ -109,9 +135,6 @@ Development files.
109135
* Tue Jul 21 2020 Khawar Abbasi <khawar.abbasi@intel.com> - 4.0.0-1
110136
- New release 4.0.0
111137

112-
* Mon Feb 17 2020 Marcel Cornu <marcel.d.cornu@intel.com> - 3.1.1-3
113-
- Patched compilation issue on Fedora 32 (RhBug: 1799525)
114-
115138
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-2
116139
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
117140

‎cgmanifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7441,8 +7441,8 @@
74417441
"type": "other",
74427442
"other": {
74437443
"name": "intel-cmt-cat",
7444-
"version": "24.05",
7445-
"downloadUrl": "https://github.com/intel/intel-cmt-cat/archive/v24.05/intel-cmt-cat-24.05.tar.gz"
7444+
"version": "25.04",
7445+
"downloadUrl": "https://github.com/intel/intel-cmt-cat/archive/v25.04/intel-cmt-cat-25.04.tar.gz"
74467446
}
74477447
}
74487448
},

‎toolkit/imageconfigs/full.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"packagelists/ssh-server.json",
1212
"packagelists/selinux-full.json",
1313
"packagelists/intel-gpu-base-rt.json",
14+
"packagelists/intel-rdt.json",
1415
"packagelists/drtm.json",
1516
"packagelists/virt-guest-packages.json",
1617
"packagelists/docker.json"
@@ -71,6 +72,7 @@
7172
"packagelists/ssh-server.json",
7273
"packagelists/selinux-full.json",
7374
"packagelists/intel-gpu-base-rt.json",
75+
"packagelists/intel-rdt.json",
7476
"packagelists/drtm.json",
7577
"packagelists/virt-guest-packages.json"
7678
],

‎toolkit/imageconfigs/packagelists/intel-rdt.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"packages": [
3+
"intel-cmt-cat",
4+
"intel-cmt-cat-devel"
5+
]
6+
}

0 commit comments

Comments
 (0)