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

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

[Rakesh Kumar]

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 76233b3..559d295 100644
--- a/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
+++ b/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
@@ -12,6 +12,7 @@
 inherit dpkg-raw
 
 PROVIDES += "secure-boot-secrets"
+DEBIAN_PROVIDES = "${PROVIDES}"
 
 SB_KEY ??= ""
 SB_CERT ??= ""
@@ -29,6 +30,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
-}
-- 
2.39.2

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

[Jan Kiszka]

On 18.04.24 13:03, Rakesh Kumar 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 76233b3..559d295 100644
> --- a/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
> +++ b/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
> @@ -12,6 +12,7 @@
>  inherit dpkg-raw
>  
>  PROVIDES += "secure-boot-secrets"
> +DEBIAN_PROVIDES = "${PROVIDES}"
>  
>  SB_KEY ??= ""
>  SB_CERT ??= ""
> @@ -29,6 +30,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
> -}

Thanks for finding this. Can expand your patch to cover the other two
cases we have in-tree as well?

Jan

-- 
Siemens AG, Technology
Linux Expert Center

Re: [cip-dev] [isar-cip-core][PATCH v1 1/1] recipes-devtools/secure-boot-secrets: Resolve duplicate Provides in debian/control

[Gylstorff Quirin]

On 4/18/24 10:27 PM, Jan Kiszka via lists.cip-project.org wrote:
> On 18.04.24 13:03, Rakesh Kumar 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 76233b3..559d295 100644
>> --- a/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
>> +++ b/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
>> @@ -12,6 +12,7 @@
>>   inherit dpkg-raw
>>   
>>   PROVIDES += "secure-boot-secrets"
>> +DEBIAN_PROVIDES = "${PROVIDES}"
>>   
>>   SB_KEY ??= ""
>>   SB_CERT ??= ""
>> @@ -29,6 +30,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
>> -}
> 
> Thanks for finding this. Can expand your patch to cover the other two
> cases we have in-tree as well?

This has no impact without updating ISAR first. NACK until then.
Quirin
> 
> Jan
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#15583): https://lists.cip-project.org/g/cip-dev/message/15583
> Mute This Topic: https://lists.cip-project.org/mt/105596040/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]
> -=-=-=-=-=-=-=-=-=-=-=-
> 

Re: [cip-dev] [isar-cip-core][PATCH v1 1/1] recipes-devtools/secure-boot-secrets: Resolve duplicate Provides in debian/control

[Gylstorff Quirin]

On 4/19/24 9:22 AM, Quirin Gylstorff via lists.cip-project.org wrote:
> 
> 
> On 4/18/24 10:27 PM, Jan Kiszka via lists.cip-project.org wrote:
>> On 18.04.24 13:03, Rakesh Kumar 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 76233b3..559d295 100644
>>> --- a/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
>>> +++ b/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
>>> @@ -12,6 +12,7 @@
>>>   inherit dpkg-raw
>>>   PROVIDES += "secure-boot-secrets"
>>> +DEBIAN_PROVIDES = "${PROVIDES}"
>>>   SB_KEY ??= ""
>>>   SB_CERT ??= ""
>>> @@ -29,6 +30,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
>>> -}
>>
>> Thanks for finding this. Can expand your patch to cover the other two
>> cases we have in-tree as well?
> 
> This has no impact without updating ISAR first. NACK until then.
We are using 0.10. DEBIAN PROVIDES is introduced with 
4d0955547453e4303f1f274354a0fb6558a74fa9 after 0.10

> Quirin
>>
>> Jan
>>
>>
>>
>>
>>
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#15584): https://lists.cip-project.org/g/cip-dev/message/15584
> Mute This Topic: https://lists.cip-project.org/mt/105596040/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]
> -=-=-=-=-=-=-=-=-=-=-=-
> 

Re: [cip-dev] [isar-cip-core][PATCH v1 1/1] recipes-devtools/secure-boot-secrets: Resolve duplicate Provides in debian/control

[Arjunan, Srinu]

Please correct commit message , remove "ad", Moreover ISAR now supports the "DEBIAN_PROVIDES", why can't you directly use this variable to declare virtual packages to satisfy the dependencies.

Many thanks,
Srinu

-----Original Message-----
From: cip-dev@lists.cip-project.org <cip-dev@lists.cip-project.org> On Behalf Of Rakesh Kumar via lists.cip-project.org
Sent: 18 April 2024 15:45
To: cip-dev@lists.cip-project.org
Cc: Kumar, Rakesh (DI CTO FDS CES LX PBU RSOL 1) <kumar.rakesh@siemens.com>
Subject: [cip-dev] [isar-cip-core][PATCH v1 1/1] recipes-devtools/secure-boot-secrets: Resolve duplicate Provides in debian/control

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 76233b3..559d295 100644
--- a/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
+++ b/recipes-devtools/secure-boot-secrets/secure-boot-secrets.inc
@@ -12,6 +12,7 @@
 inherit dpkg-raw
 
 PROVIDES += "secure-boot-secrets"
+DEBIAN_PROVIDES = "${PROVIDES}"
 
 SB_KEY ??= ""
 SB_CERT ??= ""
@@ -29,6 +30,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
-}
--
2.39.2