[Debian-on-mobile-maintainers] Bug#1108522: unblock: protection-domain-mapper/1.0-7

[Arnaud Ferraris]

Package: release.debian.org
Severity: normal
X-Debbugs-Cc: protection-domain-mapper at packages.debian.org, aferraris at debian.org
Control: affects -1 + src:protection-domain-mapper
User: release.debian.org at packages.debian.org
Usertags: unblock

Please unblock package protection-domain-mapper

[ Reason ]
Removes an unneeded dependency on qrtr-ns (from package qrtr-tools) in the
included systemd service

[ Impact ]
The systemd service would be unusable unless the user manually installs qrtr-
tools

[ Tests ]
Verified the systemd service is enabled and working as expected when qrtr-tools
isn't installed

[ Risks ]
None that I can think of (trivial change, backported from upstream)

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

[ Other info ]
This upload also limits the build architectures to amd64, armhf & arm64 -- see
#1108223 (done) for the RM request for other arches

unblock protection-domain-mapper/1.0-7
-------------- next part --------------
diff -Nru protection-domain-mapper-1.0/debian/changelog protection-domain-mapper-1.0/debian/changelog
--- protection-domain-mapper-1.0/debian/changelog	2025-02-03 17:07:05.000000000 +0100
+++ protection-domain-mapper-1.0/debian/changelog	2025-05-19 12:18:36.000000000 +0200
@@ -1,3 +1,18 @@
+protection-domain-mapper (1.0-7) unstable; urgency=medium
+
+  * d/control: only build for ARMv7+
+    This package is specifically aimed at supporting hardware features of
+    modern Qualcomm SoC's, which are all ARM-based (mostly `arm64`, but that
+    includes `armhf` parts such as e.g. MSM8916). There's no point shipping
+    this package on other architectures, so limit the list to `armhf` and
+    `arm64`, while keeping `amd64` as it greatly simplifies running CI and
+    debugging builds.
+  * d/patches: backport upstream service fix.
+    The QRTR nameserver has been built into the kernel for years now, so the
+    service no longer needs to depend on `qrtr-ns.service`.
+
+ -- Arnaud Ferraris <aferraris at debian.org>  Mon, 19 May 2025 12:18:36 +0200
+
 protection-domain-mapper (1.0-6) unstable; urgency=medium
 
   * debian: update references to upstream URL.
diff -Nru protection-domain-mapper-1.0/debian/control protection-domain-mapper-1.0/debian/control
--- protection-domain-mapper-1.0/debian/control	2025-02-03 17:07:05.000000000 +0100
+++ protection-domain-mapper-1.0/debian/control	2025-05-19 12:18:36.000000000 +0200
@@ -13,7 +13,7 @@
 Rules-Requires-Root: no
 
 Package: protection-domain-mapper
-Architecture: any
+Architecture: amd64 armhf arm64
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Description: Qualcomm Protection Domain mapper service
@@ -28,7 +28,7 @@
 Build-Profiles: <!noudeb>
 Package-Type: udeb
 Section: debian-installer
-Architecture: any
+Architecture: amd64 armhf arm64
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Description: Qualcomm Protection Domain mapper service
diff -Nru protection-domain-mapper-1.0/debian/patches/0003-pd-mapper.service-Drop-qrtr-ns-dependency.patch protection-domain-mapper-1.0/debian/patches/0003-pd-mapper.service-Drop-qrtr-ns-dependency.patch
--- protection-domain-mapper-1.0/debian/patches/0003-pd-mapper.service-Drop-qrtr-ns-dependency.patch	1970-01-01 01:00:00.000000000 +0100
+++ protection-domain-mapper-1.0/debian/patches/0003-pd-mapper.service-Drop-qrtr-ns-dependency.patch	2025-05-19 12:18:36.000000000 +0200
@@ -0,0 +1,26 @@
+From: Tobias Heider <tobias.heider at canonical.com>
+Date: Tue, 18 Jun 2024 19:41:06 +0000
+Subject: pd-mapper.service: Drop qrtr-ns dependency
+
+qrtr-ns has moved to the kernel so we don't need the userland
+service.
+
+Signed-off-by: Tobias Heider <tobias.heider at canonical.com>
+
+Origin: upstream commit fa2ad72bda24c444dcd165b3b4c6e7af19353e46
+---
+ pd-mapper.service.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/pd-mapper.service.in b/pd-mapper.service.in
+index 09b594b..33f5314 100644
+--- a/pd-mapper.service.in
++++ b/pd-mapper.service.in
+@@ -1,7 +1,5 @@
+ [Unit]
+ Description=Qualcomm PD mapper service
+-Requires=qrtr-ns.service
+-After=qrtr-ns.service
+ 
+ [Service]
+ ExecStart=PD_MAPPER_PATH/pd-mapper
diff -Nru protection-domain-mapper-1.0/debian/patches/series protection-domain-mapper-1.0/debian/patches/series
--- protection-domain-mapper-1.0/debian/patches/series	2025-02-03 17:07:05.000000000 +0100
+++ protection-domain-mapper-1.0/debian/patches/series	2025-05-19 12:18:36.000000000 +0200
@@ -1,2 +1,3 @@
 0001-Makefile-use-compiler-flags-from-environment-variabl.patch
 0002-pd-mapper-lookup-firmware-files-under-lib-firmware-u.patch
+0003-pd-mapper.service-Drop-qrtr-ns-dependency.patch