diff mbox series

[isar-cip-core,v2,1/1] recipes-devtools/secure-boot-secrets: Resolve duplicate Provides in debian/control

Message ID 20240419035001.594631-2-kumar.rakesh@siemens.com (mailing list archive)
State Superseded
Headers show
Series recipes-devtools/secure-boot-secrets: Resolve duplicate Provides in debian/control | expand

Commit Message

Rakesh Kumar April 19, 2024, 3:50 a.m. UTC
Previously, the debian/control file contained a duplicate Provides line,
    which caused a build failure ad below
    | DEBUG: Executing shell function do_dpkg_source
    | dpkg-source: error: syntax error in secure-boot-custmpk-0.1/debian/control at line 16:
    | duplicate field Provides found

Use DEBIAN_PROVIDES to resolve the duplicate Provides problem to ensure
that the build process completes successfully.

Signed-off-by: Rakesh Kumar <kumar.rakesh@siemens.com>
---
 recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Gylstorff Quirin April 19, 2024, 3:04 p.m. UTC | #1
On 4/19/24 5:50 AM, Rakesh Kumar via lists.cip-project.org wrote:
> Previously, the debian/control file contained a duplicate Provides line,
>      which caused a build failure ad below
>      | DEBUG: Executing shell function do_dpkg_source
>      | dpkg-source: error: syntax error in secure-boot-custmpk-0.1/debian/control at line 16:
>      | duplicate field Provides found
> 
> Use DEBIAN_PROVIDES to resolve the duplicate Provides problem to ensure
> that the build process completes successfully.
> 
> Signed-off-by: Rakesh Kumar <kumar.rakesh@siemens.com>
> ---
>   recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc b/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
> index 2164b12..00b2a38 100644
> --- a/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
> +++ b/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
> @@ -14,6 +14,7 @@ inherit dpkg-raw
>   DPKG_ARCH = "all"
>   DEBIAN_MULTI_ARCH = "foreign"
>   PROVIDES += "secure-boot-secrets"
> +DEBIAN_PROVIDES = "${PROVIDES}"
>   
>   SB_KEY ??= ""
>   SB_CERT ??= ""
> @@ -31,6 +32,3 @@ do_install() {
>       install -m 0700 ${WORKDIR}/${SB_CERT} ${TARGET}/secure-boot.pem
>   }
>   
> -do_prepare_build:append() {
> -    echo "Provides: secure-boot-secrets" >> ${S}/debian/control
> -}
> 
> 

cip-core is using 0.10. DEBIAN PROVIDES was introduced with 
4d0955547453e4303f1f274354a0fb6558a74fa9 which is after 0.10.

Update ISAR first.

Quirin
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#15698): https://lists.cip-project.org/g/cip-dev/message/15698
> Mute This Topic: https://lists.cip-project.org/mt/105616566/1753640
> Group Owner: cip-dev+owner@lists.cip-project.org
> Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129121/1753640/1405269326/xyzzy [quirin.gylstorff@siemens.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc b/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
index 2164b12..00b2a38 100644
--- a/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
+++ b/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
@@ -14,6 +14,7 @@  inherit dpkg-raw
 DPKG_ARCH = "all"
 DEBIAN_MULTI_ARCH = "foreign"
 PROVIDES += "secure-boot-secrets"
+DEBIAN_PROVIDES = "${PROVIDES}"
 
 SB_KEY ??= ""
 SB_CERT ??= ""
@@ -31,6 +32,3 @@  do_install() {
     install -m 0700 ${WORKDIR}/${SB_CERT} ${TARGET}/secure-boot.pem
 }
 
-do_prepare_build:append() {
-    echo "Provides: secure-boot-secrets" >> ${S}/debian/control
-}