[PATCH 03/13] debian templates: name package after BPN instead of PN

["'Felix Moessbauer' via isar-users" <isar-users@googlegroups.com>]

The package variants are are bitbake-only thing but must not affect the
name of the generated packages. By that, all control files must use
Source: ${BPN} instead of Source: ${PN} (and alike for the binary
package).

We fix this for the remaining packages that don't use debianize but
provide their own template.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 .../optee-examples/files/debian/control.tmpl  | 24 ++++++-------
 .../optee-examples-stm32mp15x_3.21.0.bb       | 36 +++++++++----------
 meta/classes-recipe/dracut-module.bbclass     |  2 +-
 meta/classes-recipe/linux-module.bbclass      |  4 +--
 .../optee-ftpm/files/debian/control.tmpl      |  4 +--
 .../linux-module/files/debian/control.tmpl    |  4 +--
 .../linux-module/files/debian/rules.tmpl      |  2 +-
 7 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/meta-isar/recipes-bsp/optee-examples/files/debian/control.tmpl b/meta-isar/recipes-bsp/optee-examples/files/debian/control.tmpl
index 8b8e4eef..ff537e46 100644
--- a/meta-isar/recipes-bsp/optee-examples/files/debian/control.tmpl
+++ b/meta-isar/recipes-bsp/optee-examples/files/debian/control.tmpl
@@ -6,7 +6,7 @@ Build-Depends: debhelper-compat (= ${DEBIAN_COMPAT}), ${DEBIAN_BUILD_DEPENDS}
 Maintainer: Isar project <isar-users@googlegroups.com>
 Rules-Requires-Root: no
 
-Package: ${PN}-acipher-ta
+Package: ${BPN}-acipher-ta
 Architecture: ${DISTRO_ARCH}
 Description: OP-TEE Trusted Application example - acipher
  Generates an RSA key pair of specified size and encrypts a supplied string with
@@ -14,7 +14,7 @@ Description: OP-TEE Trusted Application example - acipher
  .
  UUID: a734eed9-d6a1-4244-aa50-7c99719e7b7b
 
-Package: ${PN}-acipher-host
+Package: ${BPN}-acipher-host
 Architecture: ${DISTRO_ARCH}
 Depends: libteec1, tee-supplicant,
          ${misc:Depends}
@@ -24,7 +24,7 @@ Description: OP-TEE Trusted Application example - acipher (host application)
  .
  UUID: a734eed9-d6a1-4244-aa50-7c99719e7b7b
 
-Package: ${PN}-aes-ta
+Package: ${BPN}-aes-ta
 Architecture: ${DISTRO_ARCH}
 Description: OP-TEE Trusted Application example - aes
  Runs an AES encryption and decryption from a TA using the GlobalPlatform TEE
@@ -33,7 +33,7 @@ Description: OP-TEE Trusted Application example - aes
  .
  UUID: 5dbac793-f574-4871-8ad3-04331ec17f24
 
-Package: ${PN}-aes-host
+Package: ${BPN}-aes-host
 Architecture: ${DISTRO_ARCH}
 Depends: libteec1, tee-supplicant,
          ${misc:Depends}
@@ -44,7 +44,7 @@ Description: OP-TEE Trusted Application example - aes (host application)
  .
  UUID: 5dbac793-f574-4871-8ad3-04331ec17f24
 
-Package: ${PN}-hello-world-ta
+Package: ${BPN}-hello-world-ta
 Architecture: ${DISTRO_ARCH}
 Description: OP-TEE Trusted Application example - hello_world
  This is a very simple Trusted Application to answer a hello command and
@@ -52,7 +52,7 @@ Description: OP-TEE Trusted Application example - hello_world
  .
  UUID: 8aaaf200-2450-11e4-abe2-0002a5d5c51b
 
-Package: ${PN}-hello-world-host
+Package: ${BPN}-hello-world-host
 Architecture: ${DISTRO_ARCH}
 Depends: libteec1, tee-supplicant,
          ${misc:Depends}
@@ -62,14 +62,14 @@ Description: OP-TEE Trusted Application example - hello_world (host application)
  .
  UUID: 8aaaf200-2450-11e4-abe2-0002a5d5c51b
 
-Package: ${PN}-hotp-ta
+Package: ${BPN}-hotp-ta
 Architecture: ${DISTRO_ARCH}
 Description: OP-TEE Trusted Application example - hotp
  HMAC based One Time Password in OP-TEE.
  .
  UUID: 484d4143-2d53-4841-3120-4a6f636b6542
 
-Package: ${PN}-hotp-host
+Package: ${BPN}-hotp-host
 Architecture: ${DISTRO_ARCH}
 Depends: libteec1, tee-supplicant,
          ${misc:Depends}
@@ -78,14 +78,14 @@ Description: OP-TEE Trusted Application example - hotp (host application)
  .
  UUID: 484d4143-2d53-4841-3120-4a6f636b6542
 
-Package: ${PN}-random-ta
+Package: ${BPN}-random-ta
 Architecture: ${DISTRO_ARCH}
 Description: OP-TEE Trusted Application example - random
  Generates a random UUID using capabilities of TEE API (TEE_GenerateRandom()).
  .
  UUID: b6c53aba-9669-4668-a7f2-205629d00f86
 
-Package: ${PN}-random-host
+Package: ${BPN}-random-host
 Architecture: ${DISTRO_ARCH}
 Depends: libteec1, tee-supplicant,
          ${misc:Depends}
@@ -94,7 +94,7 @@ Description: OP-TEE Trusted Application example - random (host application)
  .
  UUID: b6c53aba-9669-4668-a7f2-205629d00f86
 
-Package: ${PN}-secure-storage-ta
+Package: ${BPN}-secure-storage-ta
 Architecture: ${DISTRO_ARCH}
 Description: OP-TEE Trusted Application example - secure_storage
  A Trusted Application to read/write raw data into the OP-TEE secure storage
@@ -102,7 +102,7 @@ Description: OP-TEE Trusted Application example - secure_storage
  .
  UUID: f4e750bb-1437-4fbf-8785-8d3580c34994
 
-Package: ${PN}-secure-storage-host
+Package: ${BPN}-secure-storage-host
 Architecture: ${DISTRO_ARCH}
 Depends: libteec1, tee-supplicant,
          ${misc:Depends}
diff --git a/meta-isar/recipes-bsp/optee-examples/optee-examples-stm32mp15x_3.21.0.bb b/meta-isar/recipes-bsp/optee-examples/optee-examples-stm32mp15x_3.21.0.bb
index cbe2a635..f35df17b 100644
--- a/meta-isar/recipes-bsp/optee-examples/optee-examples-stm32mp15x_3.21.0.bb
+++ b/meta-isar/recipes-bsp/optee-examples/optee-examples-stm32mp15x_3.21.0.bb
@@ -53,51 +53,51 @@ do_prepare_build() {
 
     # acipher.install
     echo "acipher/ta/a734eed9-d6a1-4244-aa50-7c99719e7b7b.ta /usr/lib/optee-os/${OPTEE_NAME}/ta" > \
-        ${S}/debian/${PN}-acipher-ta.install
+        ${S}/debian/${BPN}-acipher-ta.install
     echo "acipher/ta/a734eed9-d6a1-4244-aa50-7c99719e7b7b.stripped.elf /usr/lib/optee-os/${OPTEE_NAME}/ta" >> \
-        ${S}/debian/${PN}-acipher-ta.install
+        ${S}/debian/${BPN}-acipher-ta.install
     echo "acipher/host/optee_example_acipher /usr/lib/optee-os/${OPTEE_NAME}/ca" > \
-        ${S}/debian/${PN}-acipher-host.install
+        ${S}/debian/${BPN}-acipher-host.install
 
     # aes.install
     echo "aes/ta/5dbac793-f574-4871-8ad3-04331ec17f24.ta /usr/lib/optee-os/${OPTEE_NAME}/ta" > \
-        ${S}/debian/${PN}-aes-ta.install
+        ${S}/debian/${BPN}-aes-ta.install
     echo "aes/ta/5dbac793-f574-4871-8ad3-04331ec17f24.stripped.elf /usr/lib/optee-os/${OPTEE_NAME}/ta" >> \
-        ${S}/debian/${PN}-aes-ta.install
+        ${S}/debian/${BPN}-aes-ta.install
     echo "aes/host/optee_example_aes /usr/lib/optee-os/${OPTEE_NAME}/ca" > \
-        ${S}/debian/${PN}-aes-host.install
+        ${S}/debian/${BPN}-aes-host.install
 
     # hello-world.install
     echo "hello_world/ta/8aaaf200-2450-11e4-abe2-0002a5d5c51b.ta /usr/lib/optee-os/${OPTEE_NAME}/ta" > \
-        ${S}/debian/${PN}-hello-world-ta.install
+        ${S}/debian/${BPN}-hello-world-ta.install
     echo "hello_world/ta/8aaaf200-2450-11e4-abe2-0002a5d5c51b.stripped.elf /usr/lib/optee-os/${OPTEE_NAME}/ta" >> \
-        ${S}/debian/${PN}-hello-world-ta.install
+        ${S}/debian/${BPN}-hello-world-ta.install
     echo "hello_world/host/optee_example_hello_world /usr/lib/optee-os/${OPTEE_NAME}/ca" > \
-        ${S}/debian/${PN}-hello-world-host.install
+        ${S}/debian/${BPN}-hello-world-host.install
 
     # hotp.install
     echo "hotp/ta/484d4143-2d53-4841-3120-4a6f636b6542.ta /usr/lib/optee-os/${OPTEE_NAME}/ta" > \
-        ${S}/debian/${PN}-hotp-ta.install
+        ${S}/debian/${BPN}-hotp-ta.install
     echo "hotp/ta/484d4143-2d53-4841-3120-4a6f636b6542.stripped.elf /usr/lib/optee-os/${OPTEE_NAME}/ta" >> \
-        ${S}/debian/${PN}-hotp-ta.install
+        ${S}/debian/${BPN}-hotp-ta.install
     echo "hotp/host/optee_example_hotp /usr/lib/optee-os/${OPTEE_NAME}/ca" > \
-        ${S}/debian/${PN}-hotp-host.install
+        ${S}/debian/${BPN}-hotp-host.install
 
     # random.install
     echo "random/ta/b6c53aba-9669-4668-a7f2-205629d00f86.ta /usr/lib/optee-os/${OPTEE_NAME}/ta" > \
-        ${S}/debian/${PN}-random-ta.install
+        ${S}/debian/${BPN}-random-ta.install
     echo "random/ta/b6c53aba-9669-4668-a7f2-205629d00f86.stripped.elf /usr/lib/optee-os/${OPTEE_NAME}/ta" >> \
-        ${S}/debian/${PN}-random-ta.install
+        ${S}/debian/${BPN}-random-ta.install
     echo "random/host/optee_example_random /usr/lib/optee-os/${OPTEE_NAME}/ca" > \
-        ${S}/debian/${PN}-random-host.install
+        ${S}/debian/${BPN}-random-host.install
 
     # secure-storage.install
     echo "secure_storage/ta/f4e750bb-1437-4fbf-8785-8d3580c34994.ta /usr/lib/optee-os/${OPTEE_NAME}/ta" > \
-        ${S}/debian/${PN}-secure-storage-ta.install
+        ${S}/debian/${BPN}-secure-storage-ta.install
     echo "secure_storage/ta/f4e750bb-1437-4fbf-8785-8d3580c34994.stripped.elf /usr/lib/optee-os/${OPTEE_NAME}/ta" >> \
-        ${S}/debian/${PN}-secure-storage-ta.install
+        ${S}/debian/${BPN}-secure-storage-ta.install
     echo "secure_storage/host/optee_example_secure_storage /usr/lib/optee-os/${OPTEE_NAME}/ca" > \
-        ${S}/debian/${PN}-secure-storage-host.install
+        ${S}/debian/${BPN}-secure-storage-host.install
 }
 
 COMPATIBLE_MACHINE = "^(stm32mp15x)$"
diff --git a/meta/classes-recipe/dracut-module.bbclass b/meta/classes-recipe/dracut-module.bbclass
index 6fce979a..d13ace4f 100644
--- a/meta/classes-recipe/dracut-module.bbclass
+++ b/meta/classes-recipe/dracut-module.bbclass
@@ -15,7 +15,7 @@ DRACUT_MODULE_SETUP = "module-setup.sh"
 SRC_URI:append = "file://${DRACUT_MODULE_SETUP}.tmpl"
 
 DRACUT_MODULE_NO ??= "50"
-DRACUT_MODULE_NAME ?= "${@ d.getVar('PN')[7:] if d.getVar('PN').startswith('dracut-') else d.getVar('PN')}"
+DRACUT_MODULE_NAME ?= "${@ d.getVar('BPN')[7:] if d.getVar('BPN').startswith('dracut-') else d.getVar('BPN')}"
 
 DEBIAN_DEPENDS = "dracut-core"
 DRACUT_MODULE_PATH = "${D}/usr/lib/dracut/modules.d/${DRACUT_MODULE_NO}${DRACUT_MODULE_NAME}/"
diff --git a/meta/classes-recipe/linux-module.bbclass b/meta/classes-recipe/linux-module.bbclass
index f0b5790c..05a36129 100644
--- a/meta/classes-recipe/linux-module.bbclass
+++ b/meta/classes-recipe/linux-module.bbclass
@@ -5,7 +5,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-DESCRIPTION ?= "Custom kernel module ${PN}"
+DESCRIPTION ?= "Custom kernel module ${BPN}"
 MAINTAINER ?= "isar-users <isar-users@googlegroups.com>"
 
 KERNEL_NAME ?= ""
@@ -66,7 +66,7 @@ TEMPLATE_VARS += " \
     SIGNATURE_CERTFILE \
     SIGNATURE_HASHFN \
     SIGNATURE_SIGNWITH \
-    PN \
+    BPN \
     DEBIAN_COMPAT \
     DEBIAN_STANDARDS_VERSION"
 
diff --git a/meta/recipes-bsp/optee-ftpm/files/debian/control.tmpl b/meta/recipes-bsp/optee-ftpm/files/debian/control.tmpl
index 7f41b5c4..22e62c8f 100644
--- a/meta/recipes-bsp/optee-ftpm/files/debian/control.tmpl
+++ b/meta/recipes-bsp/optee-ftpm/files/debian/control.tmpl
@@ -1,4 +1,4 @@
-Source: ${PN}
+Source: ${BPN}
 Section: misc
 Priority: optional
 Standards-Version: ${DEBIAN_STANDARDS_VERSION}
@@ -6,7 +6,7 @@ Maintainer: Unknown maintainer <unknown@example.com>
 Build-Depends: debhelper-compat (= ${DEBIAN_COMPAT}), ${DEBIAN_BUILD_DEPENDS}
 Rules-Requires-Root: no
 
-Package: ${PN}
+Package: ${BPN}
 Architecture: any
 Depends:
 Description: TCG reference implementation of the TPM 2.0 Specification.
diff --git a/meta/recipes-kernel/linux-module/files/debian/control.tmpl b/meta/recipes-kernel/linux-module/files/debian/control.tmpl
index d8f4aded..43bf7c14 100644
--- a/meta/recipes-kernel/linux-module/files/debian/control.tmpl
+++ b/meta/recipes-kernel/linux-module/files/debian/control.tmpl
@@ -1,4 +1,4 @@
-Source: ${PN}
+Source: ${BPN}
 Section: kernel
 Priority: optional
 Standards-Version: ${DEBIAN_STANDARDS_VERSION}
@@ -6,7 +6,7 @@ Build-Depends: debhelper-compat (= ${DEBIAN_COMPAT}), ${DEBIAN_BUILD_DEPENDS}
 Maintainer: ${MAINTAINER}
 Rules-Requires-Root: no
 
-Package: ${PN}
+Package: ${BPN}
 Architecture: any
 Depends: ${KERNEL_IMAGE_PKG}, kmod
 Description: ${DESCRIPTION}
diff --git a/meta/recipes-kernel/linux-module/files/debian/rules.tmpl b/meta/recipes-kernel/linux-module/files/debian/rules.tmpl
index ff8d551a..66b0e87d 100755
--- a/meta/recipes-kernel/linux-module/files/debian/rules.tmpl
+++ b/meta/recipes-kernel/linux-module/files/debian/rules.tmpl
@@ -62,7 +62,7 @@ ifneq ($(filter pkg.signwith,$(DEB_BUILD_PROFILES)),)
 endif
 
 override_dh_auto_install:
-	$(MAKE) -C $(KDIR) M=${MODULE_DIR} INSTALL_MOD_PATH=$(PWD)/debian/${PN} modules_install
+	$(MAKE) -C $(KDIR) M=${MODULE_DIR} INSTALL_MOD_PATH=$(PWD)/debian/${BPN} modules_install
 
 %:
 	CFLAGS= LDFLAGS= dh $@
-- 
2.55.0

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20261002144936.246628-4-felix.moessbauer%40siemens.com.