4 Commits

Author SHA256 Message Date
5ac1cbead7 Accepting request 1269780 from server:monitoring
OBS-URL: https://build.opensuse.org/request/show/1269780
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/intel-cmt-cat?expand=0&rev=17
2025-04-16 18:41:31 +00:00
21c4629882 Accepting request 1268639 from home:trenn:branches:server:monitoring
- Update to version 24.05.17.git+f1325a9:
  * appqos_client: update vulnerable dependencies
  * lib: Fix calloc arguments that are in the wrong order
  * appqos_client: update dependencies
  * The cpusetsize is increased in sched_getaffinity and sched_setaffinity functions
  * appqos_client: update 3rd party dependencies

OBS-URL: https://build.opensuse.org/request/show/1268639
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/intel-cmt-cat?expand=0&rev=43
2025-04-16 07:21:44 +00:00
01d916078a Accepting request 1208930 from server:monitoring
OBS-URL: https://build.opensuse.org/request/show/1208930
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/intel-cmt-cat?expand=0&rev=16
2024-10-20 08:04:51 +00:00
21ea79dc44 Accepting request 1207932 from home:trenn:branches:server:monitoring
- Move to the new tag/version model, by using yy/mm in the version
  https://github.com/intel/intel-cmt-cat/issues/264
- Update to version 24.05.12.git+c5f4492:
  * lib: set errno when buf points to NULL in common.c:pqos_read()
  * lib: fix variable types in common.c:pqos_read()
  * llc capture time is increased in testcase test_pqos_cmt_llc_occupancy_cores
  * appqos_client: update 3rd party dependencies
  * appqos_client: update axios version
  * lib: Fix MBR value for non-SNC machines
  * tests: updated schema
  * tests: test_pqos_cmt_llc_occupancy_cores testcase is updated
  * After merging AMD SMBA feature, some unit tests are failed. They are fixed.
  * appqos_client: override dns-packet and socks package versions
  * appqos_client: update 'ws' and 'braces' depedency versions
  * appqos: pipenv 2024.0.1 can fetch pwr-v0.2.2. The word astroid is excluded in codespell.
  * Release 6.0.0
  * appqos: spelling correction
  * dependabot: exclude version updates
  * appqos_client: update required node and npm versions
  * dependabot: update config to ignore major version updates
  * appqos_client: update core-js to v3.23.3
  * appqos_client: update dev dependency versions
  * Add imediate binding flag to SWIG's Makefile
  * Add a GCC flag protecting againsh stack clash attacks
  * Enable strong stack protection for all the compilers
  * Add a stack protection flag to code examples
  * lib/cpuinfo: Increase the file descriptors limit to handle more CPUs
  * add dependabot config
  * Add warning message in case of detection hybrid architecture
  * lib: Fix parsing SMBA CLOS information

OBS-URL: https://build.opensuse.org/request/show/1207932
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/intel-cmt-cat?expand=0&rev=41
2024-10-19 01:01:14 +00:00
9 changed files with 235 additions and 144 deletions

View File

@@ -24,70 +24,70 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: <trenn@suse.com>
diff --git a/examples/c/CAT_MBA/Makefile b/examples/c/CAT_MBA/Makefile
index 6b5ceb7..02adce8 100644
--- a/examples/c/CAT_MBA/Makefile
+++ b/examples/c/CAT_MBA/Makefile
@@ -63,8 +63,7 @@ IS_GCC = $(shell $(CC) -v 2>&1 | grep -c "^gcc version ")
ifeq ($(IS_GCC),1)
Index: intel-cmt-cat-24.05.12.git+c5f4492/examples/c/CAT_MBA/Makefile
===================================================================
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/examples/c/CAT_MBA/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/examples/c/CAT_MBA/Makefile
@@ -64,8 +64,7 @@ ifeq ($(IS_GCC),1)
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
- -fwrapv \
-fwrapv \
- -fstack-clash-protection \
- -fcf-protection=full
+ -fwrapv
+ -fstack-clash-protection
endif
# Build targets and dependencies
diff --git a/examples/c/CMT_MBM/Makefile b/examples/c/CMT_MBM/Makefile
index 650f37e..4090be9 100644
--- a/examples/c/CMT_MBM/Makefile
+++ b/examples/c/CMT_MBM/Makefile
@@ -63,8 +63,7 @@ IS_GCC = $(shell $(CC) -v 2>&1 | grep -c "^gcc version ")
ifeq ($(IS_GCC),1)
Index: intel-cmt-cat-24.05.12.git+c5f4492/examples/c/CMT_MBM/Makefile
===================================================================
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/examples/c/CMT_MBM/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/examples/c/CMT_MBM/Makefile
@@ -64,8 +64,7 @@ ifeq ($(IS_GCC),1)
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
- -fwrapv \
-fwrapv \
- -fstack-clash-protection \
- -fcf-protection=full
+ -fwrapv
+ -fstack-clash-protection
endif
# Build targets and dependencies
diff --git a/examples/c/PSEUDO_LOCK/Makefile b/examples/c/PSEUDO_LOCK/Makefile
index c0cdf66..37e7a60 100644
--- a/examples/c/PSEUDO_LOCK/Makefile
+++ b/examples/c/PSEUDO_LOCK/Makefile
@@ -63,8 +63,7 @@ IS_GCC = $(shell $(CC) -v 2>&1 | grep -c "^gcc version ")
ifeq ($(IS_GCC),1)
Index: intel-cmt-cat-24.05.12.git+c5f4492/examples/c/PSEUDO_LOCK/Makefile
===================================================================
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/examples/c/PSEUDO_LOCK/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/examples/c/PSEUDO_LOCK/Makefile
@@ -64,8 +64,7 @@ ifeq ($(IS_GCC),1)
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
- -fwrapv \
-fwrapv \
- -fstack-clash-protection \
- -fcf-protection=full
+ -fwrapv
+ -fstack-clash-protection
endif
# Build targets and dependencies
diff --git a/lib/Makefile b/lib/Makefile
index d171892..04eecc1 100644
--- a/lib/Makefile
+++ b/lib/Makefile
Index: intel-cmt-cat-24.05.12.git+c5f4492/lib/Makefile
===================================================================
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/lib/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/lib/Makefile
@@ -72,8 +72,7 @@ ifeq ($(IS_GCC),1)
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
-fwrapv \
- -fstack-protector-strong \
- -fstack-clash-protection \
- -fcf-protection=full
+ -fstack-protector-strong
+ -fstack-clash-protection
endif
# so or static build
diff --git a/pqos/Makefile b/pqos/Makefile
index c1f1c0b..868e81a 100644
--- a/pqos/Makefile
+++ b/pqos/Makefile
Index: intel-cmt-cat-24.05.12.git+c5f4492/pqos/Makefile
===================================================================
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/pqos/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/pqos/Makefile
@@ -45,8 +45,7 @@ CFLAGS = -I$(LIBDIR) \
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
-Wcast-qual -Wundef -Wwrite-strings \
-Wformat -Wformat-security -fstack-protector -fPIE \
-Wformat -Wformat-security -fstack-protector-strong -fPIE \
- -Wunreachable-code -Wsign-compare -Wno-endif-labels \
- -fcf-protection=full
+ -Wunreachable-code -Wsign-compare -Wno-endif-labels
@@ -98,19 +98,19 @@ index c1f1c0b..868e81a 100644
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
-fwrapv \
- -fstack-protector-strong \
- -fstack-clash-protection \
- -fcf-protection=full
+ -fstack-protector-strong
+ -fstack-clash-protection
endif
ifeq ($(shell uname), FreeBSD)
diff --git a/rdtset/Makefile b/rdtset/Makefile
index 7b34594..36f3343 100644
--- a/rdtset/Makefile
+++ b/rdtset/Makefile
Index: intel-cmt-cat-24.05.12.git+c5f4492/rdtset/Makefile
===================================================================
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/rdtset/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/rdtset/Makefile
@@ -45,8 +45,7 @@ CFLAGS = -I$(LIBDIR) \
-Wcast-qual -Wundef -Wwrite-strings \
-Wformat -Wformat-security -fstack-protector -fPIE \
-Wformat -Wformat-security -fstack-protector-strong -fPIE \
-Wunreachable-code -Wsign-compare -Wno-endif-labels \
- -D_GNU_SOURCE \
- -fcf-protection=full
@@ -122,19 +122,19 @@ index 7b34594..36f3343 100644
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
-fwrapv \
- -fstack-protector-strong \
- -fstack-clash-protection \
- -fcf-protection=full
+ -fstack-protector-strong
+ -fstack-clash-protection
endif
# DEBUG build
diff --git a/tools/membw/Makefile b/tools/membw/Makefile
index fbe25ab..4246af9 100644
--- a/tools/membw/Makefile
+++ b/tools/membw/Makefile
@@ -49,8 +49,7 @@ CFLAGS=-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
Index: intel-cmt-cat-24.05.12.git+c5f4492/tools/membw/Makefile
===================================================================
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/tools/membw/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/tools/membw/Makefile
@@ -49,8 +49,7 @@ CFLAGS=-W -Wall -Wextra -Wstrict-prototy
-Wcast-qual -Wundef -Wwrite-strings \
-Wformat -Wformat-security -fstack-protector -fPIE \
-Wformat -Wformat-security -fstack-protector-strong -fPIE \
-Wunreachable-code -Wsign-compare -Wno-endif-labels \
- -Winline -msse4.2 \
- -fcf-protection=full
@@ -146,65 +146,71 @@ index fbe25ab..4246af9 100644
-fno-delete-null-pointer-checks \
-fwrapv \
-fno-expensive-optimizations \
- -fstack-protector-strong \
- -fstack-clash-protection \
- -fcf-protection=full
+ -fstack-protector-strong
+ -fstack-clash-protection
endif
SRCS = $(sort $(wildcard *.c))
diff --git a/unit-test/lib/Makefile b/unit-test/lib/Makefile
index 3bf18a7..b472489 100644
--- a/unit-test/lib/Makefile
+++ b/unit-test/lib/Makefile
Index: intel-cmt-cat-24.05.12.git+c5f4492/unit-test/lib/Makefile
===================================================================
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/unit-test/lib/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/unit-test/lib/Makefile
@@ -34,8 +34,7 @@ ifeq ($(IS_GCC),1)
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
-fwrapv \
- -fstack-protector-strong \
- -fstack-clash-protection \
- -fcf-protection=full
+ -fstack-protector-strong
+ -fstack-clash-protection
endif
# common function wrap
diff --git a/unit-test/mock/Makefile b/unit-test/mock/Makefile
index d2ee6e0..aad7603 100644
--- a/unit-test/mock/Makefile
+++ b/unit-test/mock/Makefile
@@ -68,8 +68,7 @@ IS_GCC = $(shell $(CC) -v 2>&1 | grep -c "^gcc version ")
ifeq ($(IS_GCC),1)
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
- -fwrapv \
- -fcf-protection=full
+ -fwrapv
endif
# so or static build
diff --git a/unit-test/output/Makefile b/unit-test/output/Makefile
index 72f7ed5..d4ae752 100644
--- a/unit-test/output/Makefile
+++ b/unit-test/output/Makefile
@@ -65,8 +65,7 @@ IS_GCC = $(shell $(CC) -v 2>&1 | grep -c "^gcc version ")
ifeq ($(IS_GCC),1)
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
- -fwrapv \
- -fcf-protection=full
+ -fwrapv
endif
# so or static build
diff --git a/unit-test/pqos/Makefile b/unit-test/pqos/Makefile
index a980c19..509ee31 100644
--- a/unit-test/pqos/Makefile
+++ b/unit-test/pqos/Makefile
Index: intel-cmt-cat-24.05.12.git+c5f4492/unit-test/mock/Makefile
===================================================================
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/unit-test/mock/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/unit-test/mock/Makefile
@@ -69,8 +69,7 @@ ifeq ($(IS_GCC),1)
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
-fwrapv \
- -fstack-protector-strong \
- -fstack-clash-protection \
- -fcf-protection=full
+ -fstack-protector-strong
+ -fstack-clash-protection
endif
# so or static build
Index: intel-cmt-cat-24.05.12.git+c5f4492/unit-test/output/Makefile
===================================================================
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/unit-test/output/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/unit-test/output/Makefile
@@ -66,8 +66,7 @@ ifeq ($(IS_GCC),1)
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
-fwrapv \
- -fstack-clash-protection \
- -fcf-protection=full
+ -fstack-clash-protection
endif
# so or static build
Index: intel-cmt-cat-24.05.12.git+c5f4492/unit-test/pqos/Makefile
===================================================================
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/unit-test/pqos/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/unit-test/pqos/Makefile
@@ -1,4 +1,4 @@
-###############################################################################
+[1;115;0c###############################################################################
# Makefile script for PQoS library and sample application
#
# @par
@@ -69,8 +69,7 @@ ifeq ($(IS_GCC),1)
CFLAGS += -fno-strict-overflow \
-fno-delete-null-pointer-checks \
-fwrapv \
- -fstack-clash-protection \
- -fcf-protection=full
+ -fstack-clash-protection
endif
CFLAGS += -g -ggdb -O0

View File

@@ -3,12 +3,12 @@
<param name="url">https://github.com/intel/intel-cmt-cat.git</param>
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
<param name="versionformat">5.0.0.@TAG_OFFSET@.git+%h</param>
<!-- They broke tagging:
https://github.com/intel/intel-cmt-cat/issues/264
<param name="versionformat">5.0.0.@TAG_OFFSET@.git+%h</param>
-->
<param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.git+%h</param>
<param name="versionrewrite-pattern">v(.*)</param>
-->
</service>
<service name="set_version" mode="manual"/>
<service name="tar" mode="buildtime"/>

View File

@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/intel/intel-cmt-cat.git</param>
<param name="changesrevision">b26b31b0ae6980c5939a421cefe0316cae884626</param></service></servicedata>
<param name="changesrevision">f1325a9645ea934efa466a8dab7690e0e1391f34</param></service></servicedata>

Binary file not shown.

Binary file not shown.

View File

@@ -1,4 +1,89 @@
-------------------------------------------------------------------
Fri Apr 11 12:42:16 UTC 2025 - trenn@suse.de
- Update to version 24.05.17.git+f1325a9:
* appqos_client: update vulnerable dependencies
* lib: Fix calloc arguments that are in the wrong order
* appqos_client: update dependencies
* The cpusetsize is increased in sched_getaffinity and sched_setaffinity functions
* appqos_client: update 3rd party dependencies
-------------------------------------------------------------------
Mon Oct 14 08:54:57 UTC 2024 - trenn@suse.de
- Move to the new tag/version model, by using yy/mm in the version
https://github.com/intel/intel-cmt-cat/issues/264
- Update to version 24.05.12.git+c5f4492:
* lib: set errno when buf points to NULL in common.c:pqos_read()
* lib: fix variable types in common.c:pqos_read()
* llc capture time is increased in testcase test_pqos_cmt_llc_occupancy_cores
* appqos_client: update 3rd party dependencies
* appqos_client: update axios version
* lib: Fix MBR value for non-SNC machines
* tests: updated schema
* tests: test_pqos_cmt_llc_occupancy_cores testcase is updated
* After merging AMD SMBA feature, some unit tests are failed. They are fixed.
* appqos_client: override dns-packet and socks package versions
* appqos_client: update 'ws' and 'braces' depedency versions
* appqos: pipenv 2024.0.1 can fetch pwr-v0.2.2. The word astroid is excluded in codespell.
* Release 6.0.0
* appqos: spelling correction
* dependabot: exclude version updates
* appqos_client: update required node and npm versions
* dependabot: update config to ignore major version updates
* appqos_client: update core-js to v3.23.3
* appqos_client: update dev dependency versions
* Add imediate binding flag to SWIG's Makefile
* Add a GCC flag protecting againsh stack clash attacks
* Enable strong stack protection for all the compilers
* Add a stack protection flag to code examples
* lib/cpuinfo: Increase the file descriptors limit to handle more CPUs
* add dependabot config
* Add warning message in case of detection hybrid architecture
* lib: Fix parsing SMBA CLOS information
* lib: Fix parsing MBA CLOS information
* lib: Fix parsing L3 cache information
* pqos tool hangs with wrong cores list format. That error is fixed.
* appqos_client: update express dep version
* AMD's SMBA is included in python wrapper
* Skip some testcases in presence of SNC
* Add SNC presence detection function for tests
* appqos_client: update dependencies
* rdtset: Update rdtset manpage to support SMBA feature
* pqos: Update pqos manpage for SMBA feature
* lib: Update cfg_set_cores_msr to support SMBA feature
* rdtset: Update cfg_set_cores_os for SMBA feature
* rdtset: Update cfg_set_pids to support SMBA feature
* rdtset: Update cfg_configure_cos to support SMBA feature
* rdtset: Update alloc_init and alloc_fini for SMBA feature
* rdtset: Add the support for SMBA feature
* rdtset: Update the rdt data structure to support SMBA feature
* lib: Update the functions to reset the SMBA COS settings
* pqos: Introduce _pqos_cap_smba_change
* pqos: Update print_per_socket_config for SMBA
* pqos: Introduce cap_print_features_smba
* pqos: Update alloc_apply to support SMBA feature
* pqos: Introduce set_smba_cos for SMBA
* lib: Introduce os_smba_set_amd to update schemata for SMBA
* lib: Add resctrl_schemata functions to support SMBA
* lib: Introduce os_smba_get_amd to read the COS information
* lib: Update resctrl_schemata functions to support SMBA
* lib: Update the function resctrl_schemata_alloc to support SMBA feature
* lib: Introduce resctrl_schemata_smba_get
* lib: Introduce pqos_cpu_get_smba_ids
* lib: Introduce data structures to support SMBA feature
* lib: Implement the function hw_smba_set_amd
* lib: Implement the function hw_smba_get_amd
* lib: Introduce pqos_smba_get_cos_num
* lib: Introduce pqos_cpu_get_one_by_smba_id
* lib: Add Slow Memory Bandwidth Allocation MSR definition
* lib: Discover SMBA feature using resctrl sysfs interface
* lib: Discover SMBA feature using cpuid method
* lib: Introduce Slow Memory Bandwidth Allocation
* Add description of the memwb tool limitations
M Remove-fcf-protection-full.patch
Adopt patch to latest mainline changes
-------------------------------------------------------------------
Tue Mar 12 09:43:42 UTC 2024 - trenn@suse.de
- Update to version 5.0.0.10.git+b26b31b:

View File

@@ -1,4 +1,4 @@
name: intel-cmt-cat
version: 5.0.0.10.git+b26b31b
mtime: 1709650933
commit: b26b31b0ae6980c5939a421cefe0316cae884626
version: 24.05.17.git+f1325a9
mtime: 1742502556
commit: f1325a9645ea934efa466a8dab7690e0e1391f34

View File

@@ -19,10 +19,10 @@
# Since they ship libpqos and the binaries in one package but do not simultatious
# updates libversion can differ from binaries version.
%define libpqosMajor 5
%define libpqosMajor 6
%global make_flags EXTRA_CFLAGS="%{optflags}" SHARED=y PREFIX=%{buildroot}/%{_prefix} MAN_DIR=%{buildroot}/%{_mandir}/man8 LIB_INSTALL_DIR=%{buildroot}%{_libdir}/
Name: intel-cmt-cat
Version: 5.0.0.10.git+b26b31b
Version: 24.05.17.git+f1325a9
Release: 0
Summary: Command line interface to CMT, MBM, CAT and CDP technologies
License: BSD-3-Clause

View File

@@ -1,7 +1,7 @@
Index: intel-cmt-cat/Makefile
Index: intel-cmt-cat-24.05.12.git+c5f4492/Makefile
===================================================================
--- intel-cmt-cat.orig/Makefile
+++ intel-cmt-cat/Makefile
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/Makefile
@@ -34,8 +34,6 @@
#
###############################################################################
@@ -11,10 +11,10 @@ Index: intel-cmt-cat/Makefile
# XXX: modify as desired
PREFIX ?= /usr/local
export PREFIX
Index: intel-cmt-cat/examples/c/CAT_MBA/Makefile
Index: intel-cmt-cat-24.05.12.git+c5f4492/examples/c/CAT_MBA/Makefile
===================================================================
--- intel-cmt-cat.orig/examples/c/CAT_MBA/Makefile
+++ intel-cmt-cat/examples/c/CAT_MBA/Makefile
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/examples/c/CAT_MBA/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/examples/c/CAT_MBA/Makefile
@@ -34,8 +34,6 @@
#
###############################################################################
@@ -24,10 +24,10 @@ Index: intel-cmt-cat/examples/c/CAT_MBA/Makefile
LIBDIR ?= ../../../lib
CFLAGS =-I$(LIBDIR) \
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
Index: intel-cmt-cat/examples/c/CMT_MBM/Makefile
Index: intel-cmt-cat-24.05.12.git+c5f4492/examples/c/CMT_MBM/Makefile
===================================================================
--- intel-cmt-cat.orig/examples/c/CMT_MBM/Makefile
+++ intel-cmt-cat/examples/c/CMT_MBM/Makefile
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/examples/c/CMT_MBM/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/examples/c/CMT_MBM/Makefile
@@ -34,8 +34,6 @@
#
###############################################################################
@@ -37,10 +37,10 @@ Index: intel-cmt-cat/examples/c/CMT_MBM/Makefile
LIBDIR ?= ../../../lib
CFLAGS =-I$(LIBDIR) -pthread \
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
Index: intel-cmt-cat/examples/c/PSEUDO_LOCK/Makefile
Index: intel-cmt-cat-24.05.12.git+c5f4492/examples/c/PSEUDO_LOCK/Makefile
===================================================================
--- intel-cmt-cat.orig/examples/c/PSEUDO_LOCK/Makefile
+++ intel-cmt-cat/examples/c/PSEUDO_LOCK/Makefile
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/examples/c/PSEUDO_LOCK/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/examples/c/PSEUDO_LOCK/Makefile
@@ -34,8 +34,6 @@
#
###############################################################################
@@ -50,10 +50,10 @@ Index: intel-cmt-cat/examples/c/PSEUDO_LOCK/Makefile
LIBDIR ?= ../../../lib
LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
LDLIBS = -lpqos -lrt -lpthread
Index: intel-cmt-cat/lib/Makefile
Index: intel-cmt-cat-24.05.12.git+c5f4492/lib/Makefile
===================================================================
--- intel-cmt-cat.orig/lib/Makefile
+++ intel-cmt-cat/lib/Makefile
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/lib/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/lib/Makefile
@@ -33,8 +33,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
###############################################################################
@@ -61,12 +61,12 @@ Index: intel-cmt-cat/lib/Makefile
-include ../pre-build.mk
-
LIB = libpqos
VERSION = 5.0.0
SO_VERSION = 5
Index: intel-cmt-cat/pqos/Makefile
VERSION = 6.0.0
SO_VERSION = 6
Index: intel-cmt-cat-24.05.12.git+c5f4492/pqos/Makefile
===================================================================
--- intel-cmt-cat.orig/pqos/Makefile
+++ intel-cmt-cat/pqos/Makefile
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/pqos/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/pqos/Makefile
@@ -34,8 +34,6 @@
#
###############################################################################
@@ -76,10 +76,10 @@ Index: intel-cmt-cat/pqos/Makefile
OBJDIR = obj
LIBDIR ?= ../lib
LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
Index: intel-cmt-cat/rdtset/Makefile
Index: intel-cmt-cat-24.05.12.git+c5f4492/rdtset/Makefile
===================================================================
--- intel-cmt-cat.orig/rdtset/Makefile
+++ intel-cmt-cat/rdtset/Makefile
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/rdtset/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/rdtset/Makefile
@@ -34,8 +34,6 @@
#
###############################################################################
@@ -89,10 +89,10 @@ Index: intel-cmt-cat/rdtset/Makefile
LIBDIR ?= ../lib
LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
LDLIBS = -lpqos -lpthread
Index: intel-cmt-cat/tools/membw/Makefile
Index: intel-cmt-cat-24.05.12.git+c5f4492/tools/membw/Makefile
===================================================================
--- intel-cmt-cat.orig/tools/membw/Makefile
+++ intel-cmt-cat/tools/membw/Makefile
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/tools/membw/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/tools/membw/Makefile
@@ -34,8 +34,6 @@
#
###############################################################################
@@ -102,30 +102,30 @@ Index: intel-cmt-cat/tools/membw/Makefile
APP = membw
MAN = membw.8
Index: intel-cmt-cat/unit-test/Makefile
Index: intel-cmt-cat-24.05.12.git+c5f4492/unit-test/Makefile
===================================================================
--- intel-cmt-cat.orig/unit-test/Makefile
+++ intel-cmt-cat/unit-test/Makefile
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/unit-test/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/unit-test/Makefile
@@ -1,5 +1,3 @@
-include ../pre-build.mk
-
LIB_DIR=$(CURDIR)/../lib
.PHONY: run style clean
Index: intel-cmt-cat/unit-test/lib/Makefile
Index: intel-cmt-cat-24.05.12.git+c5f4492/unit-test/lib/Makefile
===================================================================
--- intel-cmt-cat.orig/unit-test/lib/Makefile
+++ intel-cmt-cat/unit-test/lib/Makefile
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/unit-test/lib/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/unit-test/lib/Makefile
@@ -1,5 +1,3 @@
-include ../../pre-build.mk
-
LIB_DIR = ../../lib
OBJ_DIR = ./obj
BIN_DIR = ./bin
Index: intel-cmt-cat/unit-test/mock/Makefile
Index: intel-cmt-cat-24.05.12.git+c5f4492/unit-test/mock/Makefile
===================================================================
--- intel-cmt-cat.orig/unit-test/mock/Makefile
+++ intel-cmt-cat/unit-test/mock/Makefile
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/unit-test/mock/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/unit-test/mock/Makefile
@@ -34,8 +34,6 @@
###############################################################################
@@ -135,10 +135,10 @@ Index: intel-cmt-cat/unit-test/mock/Makefile
LIB_DIR = ../../lib
LIB = libpqosmock
Index: intel-cmt-cat/unit-test/output/Makefile
Index: intel-cmt-cat-24.05.12.git+c5f4492/unit-test/output/Makefile
===================================================================
--- intel-cmt-cat.orig/unit-test/output/Makefile
+++ intel-cmt-cat/unit-test/output/Makefile
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/unit-test/output/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/unit-test/output/Makefile
@@ -33,8 +33,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
###############################################################################
@@ -148,10 +148,10 @@ Index: intel-cmt-cat/unit-test/output/Makefile
LIB = libgraboutput
SHARED ?= y
LDFLAGS = -L. -lpthread -z noexecstack -z relro -z now
Index: intel-cmt-cat/unit-test/pqos/Makefile
Index: intel-cmt-cat-24.05.12.git+c5f4492/unit-test/pqos/Makefile
===================================================================
--- intel-cmt-cat.orig/unit-test/pqos/Makefile
+++ intel-cmt-cat/unit-test/pqos/Makefile
--- intel-cmt-cat-24.05.12.git+c5f4492.orig/unit-test/pqos/Makefile
+++ intel-cmt-cat-24.05.12.git+c5f4492/unit-test/pqos/Makefile
@@ -33,8 +33,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
###############################################################################