diff mbox series

[meta-swupdate] swupdate-image: rm image-artifact-names in releases

Message ID 20210830192140.27000-1-o.mandel@menlosystems.com
State Changes Requested
Headers show
Series [meta-swupdate] swupdate-image: rm image-artifact-names in releases | expand

Commit Message

Olaf Mandel Aug. 30, 2021, 7:21 p.m. UTC
The swupdate-image class in the dunfell and hardknott branches inherited
an image-artifact-names class from oe-core/meta master, which does *not*
exist in the oe-core branches for dunfell / hardknott. As the inherit is
not even needed, remove it.

Note: this does not change master, only dunfell / hardknott.

Signed-off-by: Olaf Mandel <o.mandel@menlosystems.com>
---
 classes/swupdate-image.bbclass | 1 -
 1 file changed, 1 deletion(-)

Comments

Stefano Babic Aug. 30, 2021, 9:24 p.m. UTC | #1
Hi Olaf,

On 30.08.21 21:21, Olaf Mandel wrote:
> The swupdate-image class in the dunfell and hardknott branches inherited
> an image-artifact-names class from oe-core/meta master, which does *not*
> exist in the oe-core branches for dunfell / hardknott.

Are you sure ? It was introduced after dunfell was release, and it is 
present in gatesgarth and hardknott. Why should this applied to hardknott ?

> As the inherit is
> not even needed, remove it.
> 
> Note: this does not change master, only dunfell / hardknott.
> 
> Signed-off-by: Olaf Mandel <o.mandel@menlosystems.com>
> ---
>   classes/swupdate-image.bbclass | 1 -
>   1 file changed, 1 deletion(-)
> 
> diff --git a/classes/swupdate-image.bbclass b/classes/swupdate-image.bbclass
> index 54d121f..618b438 100644
> --- a/classes/swupdate-image.bbclass
> +++ b/classes/swupdate-image.bbclass
> @@ -9,7 +9,6 @@
>   # swupdate.
>   
>   inherit swupdate-common.bbclass
> -inherit image-artifact-names
>   
>   S = "${WORKDIR}/${PN}"
>   
> 

Regards,
Stefano
Olaf Mandel Aug. 31, 2021, 11:17 a.m. UTC | #2
Hello Stefano,

Am 30.08.2021 um 23:24 schrieb Stefano Babic:
> On 30.08.21 21:21, Olaf Mandel wrote:
>> The swupdate-image class in the dunfell and hardknott branches inherited
>> an image-artifact-names class from oe-core/meta master, which does *not*
>> exist in the oe-core branches for dunfell / hardknott.
> 
> Are you sure ? It was introduced after dunfell was release, and it is 
> present in gatesgarth and hardknott. Why should this applied to hardknott ?
> 
my mistake: I checked the files existence with "git checkout hardknott 
-- meta/classes/image-artifact-names.bbclass" while I should have been 
saying "git checkout origin/hardknott -- ...".

Will post a corrected patch.

Best regards,
Olaf
diff mbox series

Patch

diff --git a/classes/swupdate-image.bbclass b/classes/swupdate-image.bbclass
index 54d121f..618b438 100644
--- a/classes/swupdate-image.bbclass
+++ b/classes/swupdate-image.bbclass
@@ -9,7 +9,6 @@ 
 # swupdate.
 
 inherit swupdate-common.bbclass
-inherit image-artifact-names
 
 S = "${WORKDIR}/${PN}"