[PATCH] dpkg-raw: Allow patching and templating

[PATCH] dpkg-raw: Allow patching and templating

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

We already allow pulling the artifacts from git, so it is also
consequent to support patching as well as using templates before
installing things.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/dpkg-raw.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass
index 9d4e8c19..dd7b761f 100644
--- a/meta/classes/dpkg-raw.bbclass
+++ b/meta/classes/dpkg-raw.bbclass
@@ -13,7 +13,7 @@ do_install() {
 }
 
 do_install[cleandirs] = "${D}"
-addtask install after do_unpack before do_prepare_build
+addtask install after do_patch do_transform_template before do_prepare_build
 
 do_prepare_build[cleandirs] += "${S}/debian"
 do_prepare_build() {
-- 
2.26.2


-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

Re: [PATCH] dpkg-raw: Allow patching and templating

[Baurzhan Ismagulov]

On Tue, Jun 09, 2020 at 01:57:41PM +0200, Jan Kiszka wrote:
> We already allow pulling the artifacts from git, so it is also
> consequent to support patching as well as using templates before
> installing things.

Thanks, looks good to me.

With kind regards,
Baurzhan.

Re: [PATCH] dpkg-raw: Allow patching and templating

[Henning Schild]

Just found this the hard way, LGTM

Am Tue, 9 Jun 2020 13:57:41 +0200
schrieb "[ext] Jan Kiszka" <jan.kiszka@siemens.com>:

> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> We already allow pulling the artifacts from git, so it is also
> consequent to support patching as well as using templates before
> installing things.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  meta/classes/dpkg-raw.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/dpkg-raw.bbclass
> b/meta/classes/dpkg-raw.bbclass index 9d4e8c19..dd7b761f 100644
> --- a/meta/classes/dpkg-raw.bbclass
> +++ b/meta/classes/dpkg-raw.bbclass
> @@ -13,7 +13,7 @@ do_install() {
>  }
>  
>  do_install[cleandirs] = "${D}"
> -addtask install after do_unpack before do_prepare_build
> +addtask install after do_patch do_transform_template before
> do_prepare_build 
>  do_prepare_build[cleandirs] += "${S}/debian"
>  do_prepare_build() {

Re: [PATCH] dpkg-raw: Allow patching and templating

[Jan Kiszka]

On 10.06.20 18:35, Henning Schild wrote:
> Just found this the hard way, LGTM
> 

Yeah, it's a nasty issue. We even released the first IOT2050 image with
this (I left this gremlin behind) - but the binary image itself is fine.
That is because you may see a race in favor of you, allowing the
parallel patch to actually run before the install.

Jan

> Am Tue, 9 Jun 2020 13:57:41 +0200
> schrieb "[ext] Jan Kiszka" <jan.kiszka@siemens.com>:
> 
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> We already allow pulling the artifacts from git, so it is also
>> consequent to support patching as well as using templates before
>> installing things.
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>  meta/classes/dpkg-raw.bbclass | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/classes/dpkg-raw.bbclass
>> b/meta/classes/dpkg-raw.bbclass index 9d4e8c19..dd7b761f 100644
>> --- a/meta/classes/dpkg-raw.bbclass
>> +++ b/meta/classes/dpkg-raw.bbclass
>> @@ -13,7 +13,7 @@ do_install() {
>>  }
>>  
>>  do_install[cleandirs] = "${D}"
>> -addtask install after do_unpack before do_prepare_build
>> +addtask install after do_patch do_transform_template before
>> do_prepare_build 
>>  do_prepare_build[cleandirs] += "${S}/debian"
>>  do_prepare_build() {
> 

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

Re: [PATCH] dpkg-raw: Allow patching and templating

[Baurzhan Ismagulov]

On Tue, Jun 09, 2020 at 01:57:41PM +0200, Jan Kiszka wrote:
> We already allow pulling the artifacts from git, so it is also
> consequent to support patching as well as using templates before
> installing things.

Applied to next, thanks.

With kind regards,
Baurzhan.