recipes-devtools: use DPKG_ARCH=all for arch-independent packages
A message that is not in the archive (sent off-list or not yet received): [email protected]
v2 cover recipes-devtools: use DPKG_ARCH=all for arch-independent packages
Changes since v1:
* Add missing PV bump for swupdate-certificates-snakeoil
Reported-by: Jan Kiszka
Cedric Hombourger (1):
recipes-devtools: use DPKG_ARCH=all for arch-independent packages
...g-secure-boot-signer_0.1.bb => ebg-secure-boot-signer_0.2.bb} | 1 +
.../{secure-boot-key_0.1.bb => secure-boot-key_0.2.bb} | 0
recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc | 1 +
.../{secure-boot-snakeoil_0.1.bb => secure-boot-snakeoil_0.2.bb} | 0
...snakeoil_0.1.bb => swupdate-certificates-key-snakeoil_0.2.bb} | 0
.../swupdate-certificates/swupdate-certificates-key.inc | 1 +
...-certificates-key_0.1.bb => swupdate-certificates-key_0.2.bb} | 0
...tes-snakeoil_0.1.bb => swupdate-certificates-snakeoil_0.2.bb} | 0
recipes-devtools/swupdate-certificates/swupdate-certificates.inc | 1 +
...swupdate-certificates_0.1.bb => swupdate-certificates_0.2.bb} | 0
10 files changed, 4 insertions(+)
rename recipes-devtools/ebg-secure-boot-signer/{ebg-secure-boot-signer_0.1.bb => ebg-secure-boot-signer_0.2.bb} (96%)
rename recipes-devtools/secure-boot-secrets/{secure-boot-key_0.1.bb => secure-boot-key_0.2.bb} (100%)
rename recipes-devtools/secure-boot-secrets/{secure-boot-snakeoil_0.1.bb => secure-boot-snakeoil_0.2.bb} (100%)
rename recipes-devtools/swupdate-certificates/{swupdate-certificates-key-snakeoil_0.1.bb => swupdate-certificates-key-snakeoil_0.2.bb} (100%)
rename recipes-devtools/swupdate-certificates/{swupdate-certificates-key_0.1.bb => swupdate-certificates-key_0.2.bb} (100%)
rename recipes-devtools/swupdate-certificates/{swupdate-certificates-snakeoil_0.1.bb => swupdate-certificates-snakeoil_0.2.bb} (100%)
rename recipes-devtools/swupdate-certificates/{swupdate-certificates_0.1.bb => swupdate-certificates_0.2.bb} (100%)Signature · 1 line
2.34.1
PATCH v2 1/1 recipes-devtools: use DPKG_ARCH=all for arch-independent packages
Most devtools packages are architecture-independent and should really be built with "Package: all" instead of "Package: any". Bump PV for all affected packages (to be "apt full-upgrade" friendly).
---
...g-secure-boot-signer_0.1.bb => ebg-secure-boot-signer_0.2.bb} | 1 +
.../{secure-boot-key_0.1.bb => secure-boot-key_0.2.bb} | 0
recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc | 1 +
.../{secure-boot-snakeoil_0.1.bb => secure-boot-snakeoil_0.2.bb} | 0
...snakeoil_0.1.bb => swupdate-certificates-key-snakeoil_0.2.bb} | 0
.../swupdate-certificates/swupdate-certificates-key.inc | 1 +
...-certificates-key_0.1.bb => swupdate-certificates-key_0.2.bb} | 0
...tes-snakeoil_0.1.bb => swupdate-certificates-snakeoil_0.2.bb} | 0
recipes-devtools/swupdate-certificates/swupdate-certificates.inc | 1 +
...swupdate-certificates_0.1.bb => swupdate-certificates_0.2.bb} | 0
10 files changed, 4 insertions(+)
rename recipes-devtools/ebg-secure-boot-signer/{ebg-secure-boot-signer_0.1.bb => ebg-secure-boot-signer_0.2.bb} (96%)
rename recipes-devtools/secure-boot-secrets/{secure-boot-key_0.1.bb => secure-boot-key_0.2.bb} (100%)
rename recipes-devtools/secure-boot-secrets/{secure-boot-snakeoil_0.1.bb => secure-boot-snakeoil_0.2.bb} (100%)
rename recipes-devtools/swupdate-certificates/{swupdate-certificates-key-snakeoil_0.1.bb => swupdate-certificates-key-snakeoil_0.2.bb} (100%)
rename recipes-devtools/swupdate-certificates/{swupdate-certificates-key_0.1.bb => swupdate-certificates-key_0.2.bb} (100%)
rename recipes-devtools/swupdate-certificates/{swupdate-certificates-snakeoil_0.1.bb => swupdate-certificates-snakeoil_0.2.bb} (100%)
rename recipes-devtools/swupdate-certificates/{swupdate-certificates_0.1.bb => swupdate-certificates_0.2.bb} (100%)recipes-devtools/ebg-secure-boot-signer/ebg-secure-boot-signer_0.2.bb renamed from recipes-devtools/ebg-secure-boot-signer/ebg-secure-boot-signer_0.1.bb +1 -0
@@ -16,6 +16,7 @@ DESCRIPTION = "Signing script for EFI Boot Guard setups" DEPENDS = "secure-boot-secrets" DEBIAN_DEPENDS = "sbsigntool, secure-boot-secrets, faketime" +DPKG_ARCH = "all" SRC_URI = "file://sign_secure_image.sh"
recipes-devtools/secure-boot-secrets/secure-boot-key_0.2.bb renamed from recipes-devtools/secure-boot-secrets/secure-boot-key_0.1.bb +0 -0
recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc +1 -0
@@ -11,6 +11,7 @@ inherit dpkg-raw +DPKG_ARCH = "all" PROVIDES += "secure-boot-secrets" SB_KEY ??= ""
recipes-devtools/secure-boot-secrets/secure-boot-snakeoil_0.2.bb renamed from recipes-devtools/secure-boot-secrets/secure-boot-snakeoil_0.1.bb +0 -0
recipes-devtools/swupdate-certificates/swupdate-certificates-key-snakeoil_0.2.bb renamed from recipes-devtools/swupdate-certificates/swupdate-certificates-key-snakeoil_0.1.bb +0 -0
recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc +1 -0
@@ -13,6 +13,7 @@ inherit dpkg-raw FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" +DPKG_ARCH = "all" PROVIDES += "swupdate-certificates-key" SWU_SIGN_KEY ??= ""
recipes-devtools/swupdate-certificates/swupdate-certificates-key_0.2.bb renamed from recipes-devtools/swupdate-certificates/swupdate-certificates-key_0.1.bb +0 -0
recipes-devtools/swupdate-certificates/swupdate-certificates-snakeoil_0.2.bb renamed from recipes-devtools/swupdate-certificates/swupdate-certificates-snakeoil_0.1.bb +0 -0
recipes-devtools/swupdate-certificates/swupdate-certificates.inc +1 -0
@@ -13,6 +13,7 @@ inherit dpkg-raw FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" +DPKG_ARCH = "all" PROVIDES += "swupdate-certificates" SWU_SIGN_CERT ??= ""
recipes-devtools/swupdate-certificates/swupdate-certificates_0.2.bb renamed from recipes-devtools/swupdate-certificates/swupdate-certificates_0.1.bb +0 -0
Signature · 1 line
2.34.1
Jan Kiszka
Appliedrecipes-devtools/swupdate-certificates/swupdate-certificates_0.2.bb
Quoted 100 lines · Cedric Hombourger
Most devtools packages are architecture-independent and should really be built with "Package: all" instead of "Package: any". Bump PV for all affected packages (to be "apt full-upgrade" friendly).
Signed-off-by Cedric Hombourger <[email protected]>--- ...g-secure-boot-signer_0.1.bb => ebg-secure-boot-signer_0.2.bb} | 1 + .../{secure-boot-key_0.1.bb => secure-boot-key_0.2.bb} | 0 recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc | 1 + .../{secure-boot-snakeoil_0.1.bb => secure-boot-snakeoil_0.2.bb} | 0 ...snakeoil_0.1.bb => swupdate-certificates-key-snakeoil_0.2.bb} | 0 .../swupdate-certificates/swupdate-certificates-key.inc | 1 + ...-certificates-key_0.1.bb => swupdate-certificates-key_0.2.bb} | 0 ...tes-snakeoil_0.1.bb => swupdate-certificates-snakeoil_0.2.bb} | 0 recipes-devtools/swupdate-certificates/swupdate-certificates.inc | 1 + ...swupdate-certificates_0.1.bb => swupdate-certificates_0.2.bb} | 0 10 files changed, 4 insertions(+) rename recipes-devtools/ebg-secure-boot-signer/{ebg-secure-boot-signer_0.1.bb => ebg-secure-boot-signer_0.2.bb} (96%) rename recipes-devtools/secure-boot-secrets/{secure-boot-key_0.1.bb => secure-boot-key_0.2.bb} (100%) rename recipes-devtools/secure-boot-secrets/{secure-boot-snakeoil_0.1.bb => secure-boot-snakeoil_0.2.bb} (100%) rename recipes-devtools/swupdate-certificates/{swupdate-certificates-key-snakeoil_0.1.bb => swupdate-certificates-key-snakeoil_0.2.bb} (100%) rename recipes-devtools/swupdate-certificates/{swupdate-certificates-key_0.1.bb => swupdate-certificates-key_0.2.bb} (100%) rename recipes-devtools/swupdate-certificates/{swupdate-certificates-snakeoil_0.1.bb => swupdate-certificates-snakeoil_0.2.bb} (100%) rename recipes-devtools/swupdate-certificates/{swupdate-certificates_0.1.bb => swupdate-certificates_0.2.bb} (100%)recipes-devtools/ebg-secure-boot-signer/ebg-secure-boot-signer_0.2.bb renamed from recipes-devtools/ebg-secure-boot-signer/ebg-secure-boot-signer_0.1.bb +1
-0@@ -16,6 +16,7 @@ DESCRIPTION = "Signing script for EFI Boot Guard setups" DEPENDS = "secure-boot-secrets" DEBIAN_DEPENDS = "sbsigntool, secure-boot-secrets, faketime" +DPKG_ARCH = "all" SRC_URI = "file://sign_secure_image.sh"recipes-devtools/secure-boot-secrets/secure-boot-key_0.2.bb renamed from recipes-devtools/secure-boot-secrets/secure-boot-key_0.1.bb +0
-0recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc +1
-0@@ -11,6 +11,7 @@ inherit dpkg-raw +DPKG_ARCH = "all" PROVIDES += "secure-boot-secrets" SB_KEY ??= ""recipes-devtools/secure-boot-secrets/secure-boot-snakeoil_0.2.bb renamed from recipes-devtools/secure-boot-secrets/secure-boot-snakeoil_0.1.bb +0
-0recipes-devtools/swupdate-certificates/swupdate-certificates-key-snakeoil_0.2.bb renamed from recipes-devtools/swupdate-certificates/swupdate-certificates-key-snakeoil_0.1.bb +0
-0recipes-devtools/swupdate-certificates/swupdate-certificates-key.inc +1
-0@@ -13,6 +13,7 @@ inherit dpkg-raw FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" +DPKG_ARCH = "all" PROVIDES += "swupdate-certificates-key" SWU_SIGN_KEY ??= ""recipes-devtools/swupdate-certificates/swupdate-certificates-key_0.2.bb renamed from recipes-devtools/swupdate-certificates/swupdate-certificates-key_0.1.bb +0
-0recipes-devtools/swupdate-certificates/swupdate-certificates-snakeoil_0.2.bb renamed from recipes-devtools/swupdate-certificates/swupdate-certificates-snakeoil_0.1.bb +0
-0recipes-devtools/swupdate-certificates/swupdate-certificates.inc +1
-0@@ -13,6 +13,7 @@ inherit dpkg-raw FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:" +DPKG_ARCH = "all" PROVIDES += "swupdate-certificates" SWU_SIGN_CERT ??= ""recipes-devtools/swupdate-certificates/swupdate-certificates_0.2.bb renamed from recipes-devtools/swupdate-certificates/swupdate-certificates_0.1.bb +0
-0
Thanks, applied.
Please tag future cip-core patches with "[isar-cip-core]".
Jan
Signature · 2 lines
Siemens AG, Technology Linux Expert Center
Quoted 52 lines · Cedric Hombourger
Most devtools packages are architecture-independent and should really be built with "Package: all" instead of "Package: any". Bump PV for all affected packages (to be "apt full-upgrade" friendly).
Signed-off-by Cedric Hombourger <[email protected]>---
...g-secure-boot-signer_0.1.bb => ebg-secure-boot-signer_0.2.bb} | 1 +
.../{secure-boot-key_0.1.bb => secure-boot-key_0.2.bb} | 0 recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc | 1 +
.../{secure-boot-snakeoil_0.1.bb => secure-boot-snakeoil_0.2.bb} | 0 ...snakeoil_0.1.bb => swupdate-certificates-key-snakeoil_0.2.bb} | 0 .../swupdate-certificates/swupdate-certificates-key.inc | 1 +...-certificates-key_0.1.bb => swupdate-certificates-key_0.2.bb} | 0 ...tes-snakeoil_0.1.bb => swupdate-certificates-snakeoil_0.2.bb} | 0 recipes-devtools/swupdate-certificates/swupdate-certificates.inc | 1 + ...swupdate-certificates_0.1.bb => swupdate-certificates_0.2.bb} | 0 10 files changed, 4 insertions(+)rename recipes-devtools/ebg-secure-boot-signer/{ebg-secure-boot- signer_0.1.bb => ebg-secure-boot-signer_0.2.bb} (96%) rename recipes-devtools/secure-boot-secrets/{secure-boot-key_0.1.bb => secure-boot-key_0.2.bb} (100%)
rename recipes-devtools/secure-boot-secrets/{secure-boot- snakeoil_0.1.bb => secure-boot-snakeoil_0.2.bb} (100%) rename recipes-devtools/swupdate-certificates/{swupdate- certificates-key-snakeoil_0.1.bb => swupdate-certificates-key- snakeoil_0.2.bb} (100%)
rename recipes-devtools/swupdate-certificates/{swupdate- certificates-key_0.1.bb => swupdate-certificates-key_0.2.bb} (100%) rename recipes-devtools/swupdate-certificates/{swupdate- certificates-snakeoil_0.1.bb => swupdate-certificates- snakeoil_0.2.bb} (100%)
rename recipes-devtools/swupdate-certificates/{swupdate- certificates_0.1.bb => swupdate-certificates_0.2.bb} (100%)(quoted diff) +0
-0signer_0.1.bb b/recipes-devtools/ebg-secure-boot-signer/ebg-secure- boot-signer_0.2.bb
similarity index 96%
rename from recipes-devtools/ebg-secure-boot-signer/ebg-secure-boot- signer_0.1.bb
rename to recipes-devtools/ebg-secure-boot-signer/ebg-secure-boot- signer_0.2.bb
index 57ad1be..83289d4 100644
--- a/recipes-devtools/ebg-secure-boot-signer/ebg-secure-boot- signer_0.1.bb
+++ b/recipes-devtools/ebg-secure-boot-signer/ebg-secure-boot- signer_0.2.bb(quoted diff) +0
-0@@ -16,6 +16,7 @@ DESCRIPTION = "Signing script for EFI Boot Guard
Quoted 5 lines
setups"
DEPENDS = "secure-boot-secrets"
DEBIAN_DEPENDS = "sbsigntool, secure-boot-secrets, faketime" +DPKG_ARCH = "all"
Hi Cedric,
you are missing the multiarch specifier here, as otherwise this package will not be accepted as a dependency when cross compiling.
Setting DEBIAN_MULTI_ARCH = "foreign" should do the trick.
For a longer discussion about why this is required for the arch=all packages, see
https://lists.debian.org/debian-cross/2024/01/msg00012.html
Happy Coding!
Felix
Quoted 96 lines
SRC_URI = "file://sign_secure_image.sh"(quoted diff) +0
-0key_0.1.bb b/recipes-devtools/secure-boot-secrets/secure-boot- key_0.2.bb
similarity index 100%
rename from recipes-devtools/secure-boot-secrets/secure-boot- key_0.1.bb
rename to recipes-devtools/secure-boot-secrets/secure-boot-key_0.2.bb(quoted diff) +0
-0secrets.inc b/recipes-devtools/secure-boot-secrets/secure-boot- secrets.inc
index 76233b3..859637f 100644recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc +0
-0@@ -11,6 +11,7 @@
inherit dpkg-raw
+DPKG_ARCH = "all"
PROVIDES += "secure-boot-secrets"
SB_KEY ??= ""(quoted diff) +0
-0snakeoil_0.1.bb b/recipes-devtools/secure-boot-secrets/secure-boot- snakeoil_0.2.bb
similarity index 100%
rename from recipes-devtools/secure-boot-secrets/secure-boot- snakeoil_0.1.bb
rename to recipes-devtools/secure-boot-secrets/secure-boot- snakeoil_0.2.bb(quoted diff) +0
-0certificates-key-snakeoil_0.1.bb b/recipes-devtools/swupdate- certificates/swupdate-certificates-key-snakeoil_0.2.bb similarity index 100%
rename from recipes-devtools/swupdate-certificates/swupdate- certificates-key-snakeoil_0.1.bb
rename to recipes-devtools/swupdate-certificates/swupdate- certificates-key-snakeoil_0.2.bb(quoted diff) +0
-0certificates-key.inc b/recipes-devtools/swupdate- certificates/swupdate-certificates-key.inc
index 2c67e89..944c2dc 100644
--- a/recipes-devtools/swupdate-certificates/swupdate-certificates- key.inc
+++ b/recipes-devtools/swupdate-certificates/swupdate-certificates- key.increcipes-devtools/secure-boot-secrets/secure-boot-secrets.inc +0
-0@@ -13,6 +13,7 @@ inherit dpkg-raw
FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:"
+DPKG_ARCH = "all"
PROVIDES += "swupdate-certificates-key"
SWU_SIGN_KEY ??= ""(quoted diff) +0
-0certificates-key_0.1.bb b/recipes-devtools/swupdate- certificates/swupdate-certificates-key_0.2.bb similarity index 100%
rename from recipes-devtools/swupdate-certificates/swupdate- certificates-key_0.1.bb
rename to recipes-devtools/swupdate-certificates/swupdate- certificates-key_0.2.bb(quoted diff) +0
-0certificates-snakeoil_0.1.bb b/recipes-devtools/swupdate- certificates/swupdate-certificates-snakeoil_0.2.bb similarity index 100%
rename from recipes-devtools/swupdate-certificates/swupdate- certificates-snakeoil_0.1.bb
rename to recipes-devtools/swupdate-certificates/swupdate- certificates-snakeoil_0.2.bb(quoted diff) +0
-0certificates.inc b/recipes-devtools/swupdate-certificates/swupdate- certificates.inc
index 564dda4..d319d8e 100644
--- a/recipes-devtools/swupdate-certificates/swupdate- certificates.inc
+++ b/recipes-devtools/swupdate-certificates/swupdate- certificates.increcipes-devtools/secure-boot-secrets/secure-boot-secrets.inc +0
-0@@ -13,6 +13,7 @@ inherit dpkg-raw
FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:"
+DPKG_ARCH = "all"
PROVIDES += "swupdate-certificates"
SWU_SIGN_CERT ??= ""(quoted diff) +0
-0certificates_0.1.bb b/recipes-devtools/swupdate- certificates/swupdate-certificates_0.2.bb similarity index 100%
rename from recipes-devtools/swupdate-certificates/swupdate- certificates_0.1.bb
rename to recipes-devtools/swupdate-certificates/swupdate- certificates_0.2.bb
Signature · 2 lines
Siemens AG, Technology Linux Expert Center
Quoted 61 lines · Felix
Quoted 52 lines · Cedric Hombourger
Most devtools packages are architecture-independent and should really be built with "Package: all" instead of "Package: any". Bump PV for all affected packages (to be "apt full-upgrade" friendly).
Signed-off-by Cedric Hombourger <[email protected]>---
...g-secure-boot-signer_0.1.bb => ebg-secure-boot-signer_0.2.bb} | 1 +
.../{secure-boot-key_0.1.bb => secure-boot-key_0.2.bb} | 0 recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc | 1 +
.../{secure-boot-snakeoil_0.1.bb => secure-boot-snakeoil_0.2.bb} | 0 ...snakeoil_0.1.bb => swupdate-certificates-key-snakeoil_0.2.bb} | 0 .../swupdate-certificates/swupdate-certificates-key.inc | 1 +...-certificates-key_0.1.bb => swupdate-certificates-key_0.2.bb} | 0 ...tes-snakeoil_0.1.bb => swupdate-certificates-snakeoil_0.2.bb} | 0 recipes-devtools/swupdate-certificates/swupdate-certificates.inc | 1 + ...swupdate-certificates_0.1.bb => swupdate-certificates_0.2.bb} | 0 10 files changed, 4 insertions(+)rename recipes-devtools/ebg-secure-boot-signer/{ebg-secure-boot- signer_0.1.bb => ebg-secure-boot-signer_0.2.bb} (96%) rename recipes-devtools/secure-boot-secrets/{secure-boot-key_0.1.bb => secure-boot-key_0.2.bb} (100%)
rename recipes-devtools/secure-boot-secrets/{secure-boot- snakeoil_0.1.bb => secure-boot-snakeoil_0.2.bb} (100%) rename recipes-devtools/swupdate-certificates/{swupdate- certificates-key-snakeoil_0.1.bb => swupdate-certificates-key- snakeoil_0.2.bb} (100%)
rename recipes-devtools/swupdate-certificates/{swupdate- certificates-key_0.1.bb => swupdate-certificates-key_0.2.bb} (100%) rename recipes-devtools/swupdate-certificates/{swupdate- certificates-snakeoil_0.1.bb => swupdate-certificates- snakeoil_0.2.bb} (100%)
rename recipes-devtools/swupdate-certificates/{swupdate- certificates_0.1.bb => swupdate-certificates_0.2.bb} (100%)(quoted diff) +0
-0signer_0.1.bb b/recipes-devtools/ebg-secure-boot-signer/ebg-secure- boot-signer_0.2.bb
similarity index 96%
rename from recipes-devtools/ebg-secure-boot-signer/ebg-secure-boot- signer_0.1.bb
rename to recipes-devtools/ebg-secure-boot-signer/ebg-secure-boot- signer_0.2.bb
index 57ad1be..83289d4 100644
--- a/recipes-devtools/ebg-secure-boot-signer/ebg-secure-boot- signer_0.1.bb
+++ b/recipes-devtools/ebg-secure-boot-signer/ebg-secure-boot- signer_0.2.bb(quoted diff) +0
-0@@ -16,6 +16,7 @@ DESCRIPTION = "Signing script for EFI Boot GuardQuoted 5 lines
setups"
DEPENDS = "secure-boot-secrets"
DEBIAN_DEPENDS = "sbsigntool, secure-boot-secrets, faketime" +DPKG_ARCH = "all"Hi Cedric,
Quoted 9 lines
you are missing the multiarch specifier here, as otherwise this package will not be accepted as a dependency when cross compiling.
Setting
DEBIAN_MULTI_ARCH= "foreign" should do the trick.For a longer discussion about why this is required for the arch=all packages, see
https://lists.debian.org/debian-cross/2024/01/msg00012.html
Done that in next now in order to unbreak the pipeline (in this regard).
Thanks,
Jan
Signature · 2 lines
Siemens AG, Technology Linux Expert Center