Compare commits
No commits in common. "c8" and "c9-beta" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/intel-cmt-cat-23.11.tar.gz
|
||||
SOURCES/intel-cmt-cat-25.04.tar.gz
|
||||
|
||||
1
.intel-cmt-cat.metadata
Normal file
1
.intel-cmt-cat.metadata
Normal file
@ -0,0 +1 @@
|
||||
669d0f40d1a585801ed4ff2f1f9590c7c2fb1e91 SOURCES/intel-cmt-cat-25.04.tar.gz
|
||||
@ -1,64 +0,0 @@
|
||||
Description: Hard code in hardening options
|
||||
Forwarded: not-needed
|
||||
Author: Colin Ian King <colin.i.king@gmail.com>
|
||||
|
||||
Index: intel-cmt-cat-23.11/lib/Makefile
|
||||
===================================================================
|
||||
--- intel-cmt-cat-23.11.orig/lib/Makefile 2023-11-01 14:00:13.000000000 +0100
|
||||
+++ intel-cmt-cat-23.11/lib/Makefile 2024-02-21 08:55:18.864718246 +0100
|
||||
@@ -37,8 +37,8 @@
|
||||
VERSION = 5.0.0
|
||||
SO_VERSION = 5
|
||||
SHARED ?= y
|
||||
-LDFLAGS = -L. -lpthread -z noexecstack -z relro -z now
|
||||
-CFLAGS = -pthread -I./ -D_GNU_SOURCE \
|
||||
+LDFLAGS += -L. -lpthread -z noexecstack -z relro -z now
|
||||
+CFLAGS += -pthread -I./ -D_GNU_SOURCE \
|
||||
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
|
||||
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
|
||||
-Wcast-qual -Wundef -Wwrite-strings \
|
||||
Index: intel-cmt-cat-23.11/pqos/Makefile
|
||||
===================================================================
|
||||
--- intel-cmt-cat-23.11.orig/pqos/Makefile 2023-11-01 14:00:13.000000000 +0100
|
||||
+++ intel-cmt-cat-23.11/pqos/Makefile 2024-02-21 08:55:18.865718244 +0100
|
||||
@@ -36,9 +36,9 @@
|
||||
|
||||
OBJDIR = obj
|
||||
LIBDIR ?= ../lib
|
||||
-LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
|
||||
+LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
|
||||
LDLIBS = -lpqos -lpthread
|
||||
-CFLAGS = -I$(LIBDIR) \
|
||||
+CFLAGS += -I$(LIBDIR) \
|
||||
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
|
||||
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
|
||||
-Wcast-qual -Wundef -Wwrite-strings \
|
||||
Index: intel-cmt-cat-23.11/rdtset/Makefile
|
||||
===================================================================
|
||||
--- intel-cmt-cat-23.11.orig/rdtset/Makefile 2023-11-01 14:00:13.000000000 +0100
|
||||
+++ intel-cmt-cat-23.11/rdtset/Makefile 2024-02-21 08:55:18.866718241 +0100
|
||||
@@ -35,9 +35,9 @@
|
||||
###############################################################################
|
||||
|
||||
LIBDIR ?= ../lib
|
||||
-LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
|
||||
+LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
|
||||
LDLIBS = -lpqos -lpthread
|
||||
-CFLAGS = -I$(LIBDIR) \
|
||||
+CFLAGS += -I$(LIBDIR) \
|
||||
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
|
||||
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
|
||||
-Wcast-qual -Wundef -Wwrite-strings \
|
||||
Index: intel-cmt-cat-23.11/tools/membw/Makefile
|
||||
===================================================================
|
||||
--- intel-cmt-cat-23.11.orig/tools/membw/Makefile 2023-11-01 14:00:13.000000000 +0100
|
||||
+++ intel-cmt-cat-23.11/tools/membw/Makefile 2024-02-21 08:55:18.866718241 +0100
|
||||
@@ -42,7 +42,7 @@
|
||||
BIN_DIR = $(PREFIX)/bin
|
||||
MAN_DIR = $(PREFIX)/man/man8
|
||||
|
||||
-CFLAGS=-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
|
||||
+CFLAGS += -W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
|
||||
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
|
||||
-Wcast-qual -Wundef -Wwrite-strings \
|
||||
-Wformat -Wformat-security -fstack-protector -fPIE \
|
||||
@ -24,7 +24,7 @@
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
%global githubname intel-cmt-cat
|
||||
%global githubver 23.11
|
||||
%global githubver 25.04
|
||||
|
||||
%if %{defined githubsubver}
|
||||
%global githubfull %{githubname}-%{githubver}.%{githubsubver}
|
||||
@ -48,8 +48,6 @@ Source: https://github.com/intel/%{githubname}/archive/%{githubname}
|
||||
Source: https://github.com/intel/%{githubname}/archive/%{githubname}-%{githubver}.tar.gz
|
||||
%endif
|
||||
|
||||
Patch0001: 0001-allow-debian-flags-to-be-added.patch
|
||||
|
||||
URL: https://github.com/intel/%{githubname}
|
||||
BuildRequires: gcc, make
|
||||
|
||||
@ -86,6 +84,29 @@ https://github.com/intel/%{githubname}
|
||||
%prep
|
||||
%autosetup -p1 -n %{githubfull}
|
||||
|
||||
# lib: honor DESTDIR and drop ldconfig
|
||||
sed -i 's|\$(LIB_INSTALL_DIR)|$(DESTDIR)$(LIB_INSTALL_DIR)|g' lib/Makefile
|
||||
sed -i 's|\$(HDR_DIR)|$(DESTDIR)$(HDR_DIR)|g' lib/Makefile
|
||||
sed -i '/^[[:space:]]*ldconfig[[:space:]]*$/d' lib/Makefile
|
||||
|
||||
# pqos: honor DESTDIR for binaries and man pages
|
||||
sed -i 's|\$(PREFIX)/bin|$(DESTDIR)$(PREFIX)/bin|g' pqos/Makefile
|
||||
sed -i 's|^MAN_DIR *=.*|MAN_DIR = $(DESTDIR)%{_mandir}/man8|' pqos/Makefile
|
||||
|
||||
# rdtset: honor DESTDIR for binaries and man pages
|
||||
sed -i 's|\$(PREFIX)/bin|$(DESTDIR)$(PREFIX)/bin|g' rdtset/Makefile
|
||||
sed -i 's|^MAN_DIR *=.*|MAN_DIR = $(DESTDIR)%{_mandir}/man8|' rdtset/Makefile
|
||||
|
||||
# membw: honor DESTDIR for binaries and man pages
|
||||
sed -i 's|\$(PREFIX)/bin|$(DESTDIR)$(PREFIX)/bin|g' tools/membw/Makefile
|
||||
sed -i 's|^MAN_DIR *=.*|MAN_DIR = $(DESTDIR)%{_mandir}/man8|' tools/membw/Makefile
|
||||
|
||||
# Ensure CFLAGS/LDFLAGS are augmented (+=) instead of overwritten (=)
|
||||
for mf in $(find . -name Makefile); do
|
||||
sed -i 's/^\(CFLAGS\)[[:space:]]*=/\1 +=/' "$mf"
|
||||
sed -i 's/^\(LDFLAGS\)[[:space:]]*=/\1 +=/' "$mf"
|
||||
done
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%build
|
||||
@ -130,7 +151,7 @@ install -m 0644 %{_builddir}/%{githubfull}/LICENSE %{buildroot}/%{_licensedir}/%
|
||||
install -d %{buildroot}/%{_libdir}
|
||||
install -s %{_builddir}/%{githubfull}/lib/libpqos.so.* %{buildroot}/%{_libdir}
|
||||
cp -a %{_builddir}/%{githubfull}/lib/libpqos.so %{buildroot}/%{_libdir}
|
||||
cp -a %{_builddir}/%{githubfull}/lib/libpqos.so.5 %{buildroot}/%{_libdir}
|
||||
cp -a %{_builddir}/%{githubfull}/lib/libpqos.so.6 %{buildroot}/%{_libdir}
|
||||
|
||||
# Install the header file
|
||||
install -d %{buildroot}/%{_includedir}
|
||||
@ -184,7 +205,7 @@ install -m 0644 %{_builddir}/%{githubfull}/examples/c/PSEUDO_LOCK/tsc.h
|
||||
|
||||
%files -n intel-cmt-cat-devel
|
||||
%{_libdir}/libpqos.so
|
||||
%{_libdir}/libpqos.so.5
|
||||
%{_libdir}/libpqos.so.6
|
||||
%{_includedir}/pqos.h
|
||||
%{_usrsrc}/%{githubfull}/c/CAT_MBA/Makefile
|
||||
%{_usrsrc}/%{githubfull}/c/CAT_MBA/README
|
||||
@ -206,63 +227,40 @@ install -m 0644 %{_builddir}/%{githubfull}/examples/c/PSEUDO_LOCK/tsc.h
|
||||
%doc %{_usrsrc}/%{githubfull}/LICENSE
|
||||
|
||||
%changelog
|
||||
* Fri Oct 24 2025 Tony Camuso <tcamuso@redhat.com> - 25.04-1
|
||||
- Update to latest upstream.
|
||||
- Clean up install paths, drop obsolete patches, and improve flag injection
|
||||
handling
|
||||
- Replaced hard-coded install paths in Makefiles with sed-based DESTDIR
|
||||
fixes for lib, pqos, rdtset, and membw
|
||||
- Using sed during %prep is more robust and version-agnostic than patching,
|
||||
which requires rebasing each release
|
||||
- Relocated admin tools (pqos*, rdtset) from /usr/bin to /usr/sbin for FHS
|
||||
compliance
|
||||
- These tools require root and interact with system-level cache controls
|
||||
- Updated %files to match SONAME bump (libpqos.so.5 -> libpqos.so.6) introduced
|
||||
upstream
|
||||
- Dropped patches 0001, 0002, 0004, 0005
|
||||
- 0001/0002 replaced by sed
|
||||
- Ensure CFLAGS and LDFLAGS are augmented, not overridden by using sed to
|
||||
convert assignments to +=
|
||||
- Ensures compatibility with distro-injected flags (e.g. %{optflags},
|
||||
hardening) without carrying a version-specific patch
|
||||
Resolves: RHEL-122380
|
||||
|
||||
* Fri Mar 01 2024 Eugene Syromiatnikov <esyr@redhat.com> - 23.11-2
|
||||
- Revert commit "lib: update detection of non-architectural L3CAT" that removed
|
||||
L3CAT detection support on Tiger Lake and Erkhart Lake CPUs (RHEL-22729)
|
||||
|
||||
* Mon Feb 12 2024 Eugene Syromiatnikov <esyr@redhat.com> - 23.11-1
|
||||
- Rebase to 23.11 (RHEL-25780)
|
||||
- Rebase to 23.11 (RHEL-22729, RHEL-25781)
|
||||
|
||||
* Mon Oct 12 2020 Jiri Olsa <jolsa@redhat.com> - 4.0.0-0
|
||||
- New release 4.0.0
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.1.0-3
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Thu Jun 11 2020 Martin Cermak <mcermak@redhat.com> - 2.0.0-3
|
||||
- NVR bump and rebuild because of CI gating.
|
||||
Related: #1682388
|
||||
* Wed Jun 09 2021 Martin Cermak <mcermak@redhat.com> - 4.1.0-2
|
||||
- CI gating related NVR bump and rebuild
|
||||
|
||||
* Mon Oct 08 2018 Jiri Olsa <jolsa@redhat.com> - 2.0.0-2
|
||||
- New release 2.0.0-2
|
||||
- passing distro CFLAGS/LDFLAGS
|
||||
|
||||
* Thu Jun 28 2018 Marcel cornu <marcel.d.cornu@intel.com>, Michal Aleksinski <michalx.aleksinski@intel.com> - 2.0.0-1
|
||||
- New release 2.0.0
|
||||
|
||||
* Thu Mar 08 2018 Marcel cornu <marcel.d.cornu@intel.com>, Michal Aleksinski <michalx.aleksinski@intel.com> - 1.2.0-3
|
||||
- Updated spec file with BuildRequires tag
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Nov 29 2017 Marcel Cornu <marcel.d.cornu@intel.com>, Wojciech Andralojc <wojciechx.andralojc@intel.com> 1.2.0-1
|
||||
- New release 1.2.0
|
||||
|
||||
* Thu Aug 3 2017 Aaron Hetherington <aaron.hetherington@intel.com>, Marcel Cornu <marcel.d.cornu@intel.com> 1.1.0-1
|
||||
- New release 1.1.0
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Jun 21 2017 Aaron Hetherington <aaron.hetherington@intel.com>, Marcel Cornu <marcel.d.cornu@intel.com> 1.0.1-1
|
||||
- Spec file bug fixes
|
||||
|
||||
* Wed Jun 07 2017 Aaron Hetherington <aaron.hetherington@intel.com>, Marcel Cornu <marcel.d.cornu@intel.com> 1.0.1-1
|
||||
- new release
|
||||
- bug fixes
|
||||
|
||||
* Fri May 19 2017 Aaron Hetherington <aaron.hetherington@intel.com>, Michal Aleksinski <michalx.aleksinski@intel.com> 1.0.0-1
|
||||
- new release
|
||||
|
||||
* Tue Feb 14 2017 Aaron Hetherington <aaron.hetherington@intel.com> 0.1.5-1
|
||||
- new release
|
||||
|
||||
* Mon Oct 17 2016 Aaron Hetherington <aaron.hetherington@intel.com> 0.1.5
|
||||
- new release
|
||||
|
||||
* Tue Apr 19 2016 Tomasz Kantecki <tomasz.kantecki@intel.com> 0.1.4-3
|
||||
- global typo fix
|
||||
- small edits in the description
|
||||
|
||||
* Mon Apr 18 2016 Tomasz Kantecki <tomasz.kantecki@intel.com> 0.1.4-2
|
||||
- LICENSE file added to the package
|
||||
|
||||
* Thu Apr 7 2016 Tomasz Kantecki <tomasz.kantecki@intel.com> 0.1.4-1
|
||||
- initial version of the package
|
||||
* Sun May 02 2021 Jiri Olsa <jolsa@kernel.org> - 4.1.0-1
|
||||
- RHEL9 release 4.1.0, copied from fedora
|
||||
|
||||
Loading…
Reference in New Issue
Block a user