Followup-For: Bug #1123710
Control: tag -1 patch pending

I intend to NMU this and a few more fixes (see the separate bug reports)
to restore buildability of src:papi.

Andreas
>From f1e7b565c242178222c5011ee4492c9601679ca0 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <[email protected]>
Date: Sat, 20 Dec 2025 02:28:43 +0100
Subject: [PATCH 1/8] Fix CMAKE_SHARED_LINKER_FLAGS usage.

This is not a semicolon-separated cmake list.

Closes: #1123710
---
 .../0002-add-version-script-to-control-exposed-symbols.patch  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/debian/patches/0002-add-version-script-to-control-exposed-symbols.patch 
b/debian/patches/0002-add-version-script-to-control-exposed-symbols.patch
index 79ebdf1..4e9e6af 100644
--- a/debian/patches/0002-add-version-script-to-control-exposed-symbols.patch
+++ b/debian/patches/0002-add-version-script-to-control-exposed-symbols.patch
@@ -12,11 +12,11 @@ Forwarded: not-needed
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -113,6 +113,8 @@
+@@ -113,6 +113,8 @@ else ()
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb -O0 -DDEBUG")
  endif ()
  
-+set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} 
"-Wl,--version-script=${CMAKE_SOURCE_DIR}/debian/librocm-smi64-1.version")
++set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} 
-Wl,--version-script=${CMAKE_SOURCE_DIR}/debian/librocm-smi64-1.version")
 +
  ## Address Sanitize Flag
  if (${ADDRESS_SANITIZER})
-- 
2.39.5

>From b339f44b177789f98babb6c3ec9b8efa1e68c37c Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <[email protected]>
Date: Sat, 20 Dec 2025 02:59:08 +0100
Subject: [PATCH 2/8] Fix building twice in a row.

---
 debian/clean | 1 +
 debian/files | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 debian/files

diff --git a/debian/clean b/debian/clean
index 3863960..f6002ad 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1,4 @@
 include/rocm_smi/rocm_smi64Config.h
 oam/include/oam/oamConfig.h
+python_smi_tools/rsmiBindingsInit.py
 rocm_smi/docs/ROCm_SMI_Manual_new.pdf
diff --git a/debian/files b/debian/files
deleted file mode 100644
index 519b7fd..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-rocm-smi-lib_6.1.2-1~exp1_source.buildinfo devel optional
-- 
2.39.5

>From bbd161c71cd4fa51d4982b6e9beb55cf6c0ac8ff Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <[email protected]>
Date: Sat, 20 Dec 2025 03:33:08 +0100
Subject: [PATCH 3/8] Restrict autopkgtest dependencies to rocm-smi.

Depending on all packages ('@') will hide dependency problems.
---
 debian/tests/control | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 2d6b19c..877154f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,14 +1,14 @@
 Test-Command: python3 -c "import rsmiBindings; print('OK')"
-Depends: @
+Depends: rocm-smi
 Restrictions: allow-stderr
 Features: test-name=py_binding_can_be_imported
 
 Test-Command: rocm-smi
-Depends: @
+Depends: rocm-smi
 Restrictions: allow-stderr
 Features: test-name=py_cli_can_import_correctly
 
 Test-Command: rocm-smi -S
-Depends: @
+Depends: rocm-smi
 Restrictions: allow-stderr
 Features: test-name=regression_bug_1031121
-- 
2.39.5

>From 441a1e8e92e4f069de04ed35415ead559e348ff4 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <[email protected]>
Date: Sat, 20 Dec 2025 10:10:44 +0100
Subject: [PATCH 4/8] Drop redundant Rules-Requires-Root: no.

---
 debian/control | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/control b/debian/control
index 904acd0..b0c9c53 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Standards-Version: 4.7.2
 Vcs-Browser: https://salsa.debian.org/rocm-team/rocm-smi-lib
 Vcs-Git: https://salsa.debian.org/rocm-team/rocm-smi-lib.git
 Homepage: https://github.com/ROCm/rocm_smi_lib
-Rules-Requires-Root: no
 
 Package: rocm-smi
 Architecture: linux-any
-- 
2.39.5

Reply via email to