diff mbox series

[isar-cip-core,v2,2/2] images: Add dosfstools as DEPENDENCY to all images

Message ID 20230925165833.2696-3-venkata.pyla@toshiba-tsip.com (mailing list archive)
State Superseded
Headers show
Series [isar-cip-core,v2,1/2] dosfstools: Add recipe to build it locally | expand

Commit Message

Venkata Pyla Sept. 25, 2023, 4:58 p.m. UTC
From: venkata pyla <venkata.pyla@toshiba-tsip.com>

Signed-off-by: venkata pyla <venkata.pyla@toshiba-tsip.com>
---
 recipes-core/images/cip-core-image-kernelci.bb |  1 +
 recipes-core/images/cip-core-image-security.bb |  1 +
 recipes-core/images/cip-core-image.bb          |  1 +
 recipes-core/images/common-image.inc           | 13 +++++++++++++
 4 files changed, 16 insertions(+)
 create mode 100644 recipes-core/images/common-image.inc

Comments

Jan Kiszka Sept. 25, 2023, 5:13 p.m. UTC | #1
On 25.09.23 18:58, venkata.pyla@toshiba-tsip.com wrote:
> From: venkata pyla <venkata.pyla@toshiba-tsip.com>
> 
> Signed-off-by: venkata pyla <venkata.pyla@toshiba-tsip.com>
> ---
>  recipes-core/images/cip-core-image-kernelci.bb |  1 +
>  recipes-core/images/cip-core-image-security.bb |  1 +
>  recipes-core/images/cip-core-image.bb          |  1 +
>  recipes-core/images/common-image.inc           | 13 +++++++++++++
>  4 files changed, 16 insertions(+)
>  create mode 100644 recipes-core/images/common-image.inc
> 
> diff --git a/recipes-core/images/cip-core-image-kernelci.bb b/recipes-core/images/cip-core-image-kernelci.bb
> index 479c14c..8a58e7b 100644
> --- a/recipes-core/images/cip-core-image-kernelci.bb
> +++ b/recipes-core/images/cip-core-image-kernelci.bb
> @@ -10,6 +10,7 @@
>  #
>  
>  inherit image
> +require common-image.inc
>  
>  DESCRIPTION = "CIP Core image for KernelCI"
>  
> diff --git a/recipes-core/images/cip-core-image-security.bb b/recipes-core/images/cip-core-image-security.bb
> index 3421ce5..f114974 100644
> --- a/recipes-core/images/cip-core-image-security.bb
> +++ b/recipes-core/images/cip-core-image-security.bb
> @@ -10,6 +10,7 @@
>  #
>  
>  inherit image
> +require common-image.inc
>  
>  DESCRIPTION = "CIP Core image including security packages"
>  
> diff --git a/recipes-core/images/cip-core-image.bb b/recipes-core/images/cip-core-image.bb
> index 0ec7220..711d3d3 100644
> --- a/recipes-core/images/cip-core-image.bb
> +++ b/recipes-core/images/cip-core-image.bb
> @@ -10,6 +10,7 @@
>  #
>  
>  inherit image
> +require common-image.inc
>  
>  ISAR_RELEASE_CMD = "git -C ${LAYERDIR_cip-core} describe --tags --dirty --always --match 'v[0-9].[0-9]*'"
>  DESCRIPTION = "CIP Core image"
> diff --git a/recipes-core/images/common-image.inc b/recipes-core/images/common-image.inc
> new file mode 100644
> index 0000000..863f817
> --- /dev/null
> +++ b/recipes-core/images/common-image.inc
> @@ -0,0 +1,13 @@
> +#
> +# CIP Core, generic profile
> +#
> +# Copyright (c) Toshiba Corporation 2023
> +#
> +# Authors:
> +#  Venkata Pyla <venkata.pyla@toshiba-tsip.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +# Install in build system for creating reproducible DOS filesystems
> +DEPENDS += "dosfstools"

Why this now? Patch 1 is adding it as IMAGES_BUILD_DEPS, and that should
be enough as you correctly analyzed. Do we want that change rather in
conf/distro/cip-core-common.inc?

Jan
Venkata Pyla Sept. 26, 2023, 1:39 a.m. UTC | #2
> -----Original Message-----
> From: cip-dev@lists.cip-project.org <cip-dev@lists.cip-project.org> On Behalf
> Of Jan Kiszka via lists.cip-project.org
> Sent: Monday, September 25, 2023 10:43 PM
> To: pyla venkata(TSIP TMIEC ODG Porting) <Venkata.Pyla@toshiba-
> tsip.com>; cip-dev@lists.cip-project.org
> Cc: dinesh kumar(TSIP TMIEC ODG Porting) <dinesh.kumar@toshiba-
> tsip.com>; hayashi kazuhiro(林 和宏 DME ○DIG□MPS○MP4)
> <kazuhiro3.hayashi@toshiba.co.jp>
> Subject: Re: [cip-dev] [isar-cip-core v2 2/2] images: Add dosfstools as
> DEPENDENCY to all images
> 
> On 25.09.23 18:58, venkata.pyla@toshiba-tsip.com wrote:
> > From: venkata pyla <venkata.pyla@toshiba-tsip.com>
> >
> > Signed-off-by: venkata pyla <venkata.pyla@toshiba-tsip.com>
> > ---
> >  recipes-core/images/cip-core-image-kernelci.bb |  1 +
> > recipes-core/images/cip-core-image-security.bb |  1 +
> >  recipes-core/images/cip-core-image.bb          |  1 +
> >  recipes-core/images/common-image.inc           | 13 +++++++++++++
> >  4 files changed, 16 insertions(+)
> >  create mode 100644 recipes-core/images/common-image.inc
> >
> > diff --git a/recipes-core/images/cip-core-image-kernelci.bb
> > b/recipes-core/images/cip-core-image-kernelci.bb
> > index 479c14c..8a58e7b 100644
> > --- a/recipes-core/images/cip-core-image-kernelci.bb
> > +++ b/recipes-core/images/cip-core-image-kernelci.bb
> > @@ -10,6 +10,7 @@
> >  #
> >
> >  inherit image
> > +require common-image.inc
> >
> >  DESCRIPTION = "CIP Core image for KernelCI"
> >
> > diff --git a/recipes-core/images/cip-core-image-security.bb
> > b/recipes-core/images/cip-core-image-security.bb
> > index 3421ce5..f114974 100644
> > --- a/recipes-core/images/cip-core-image-security.bb
> > +++ b/recipes-core/images/cip-core-image-security.bb
> > @@ -10,6 +10,7 @@
> >  #
> >
> >  inherit image
> > +require common-image.inc
> >
> >  DESCRIPTION = "CIP Core image including security packages"
> >
> > diff --git a/recipes-core/images/cip-core-image.bb
> > b/recipes-core/images/cip-core-image.bb
> > index 0ec7220..711d3d3 100644
> > --- a/recipes-core/images/cip-core-image.bb
> > +++ b/recipes-core/images/cip-core-image.bb
> > @@ -10,6 +10,7 @@
> >  #
> >
> >  inherit image
> > +require common-image.inc
> >
> >  ISAR_RELEASE_CMD = "git -C ${LAYERDIR_cip-core} describe --tags --dirty --
> always --match 'v[0-9].[0-9]*'"
> >  DESCRIPTION = "CIP Core image"
> > diff --git a/recipes-core/images/common-image.inc
> > b/recipes-core/images/common-image.inc
> > new file mode 100644
> > index 0000000..863f817
> > --- /dev/null
> > +++ b/recipes-core/images/common-image.inc
> > @@ -0,0 +1,13 @@
> > +#
> > +# CIP Core, generic profile
> > +#
> > +# Copyright (c) Toshiba Corporation 2023 # # Authors:
> > +#  Venkata Pyla <venkata.pyla@toshiba-tsip.com> # #
> > +SPDX-License-Identifier: MIT #
> > +
> > +# Install in build system for creating reproducible DOS filesystems
> > +DEPENDS += "dosfstools"
> 
> Why this now? Patch 1 is adding it as IMAGES_BUILD_DEPS, and that should
> be enough as you correctly analyzed. Do we want that change rather in
> conf/distro/cip-core-common.inc?

It is not required; I was confused then with your comment I thought you are expecting this change for some reason.

If you agree you can discard the Patch 2.

> Jan
> 
> --
> Siemens AG, Technology
> Linux Expert Center
Jan Kiszka Sept. 26, 2023, 7:10 a.m. UTC | #3
On 26.09.23 03:39, Venkata.Pyla@toshiba-tsip.com wrote:
> 
> 
>> -----Original Message-----
>> From: cip-dev@lists.cip-project.org <cip-dev@lists.cip-project.org> On Behalf
>> Of Jan Kiszka via lists.cip-project.org
>> Sent: Monday, September 25, 2023 10:43 PM
>> To: pyla venkata(TSIP TMIEC ODG Porting) <Venkata.Pyla@toshiba-
>> tsip.com>; cip-dev@lists.cip-project.org
>> Cc: dinesh kumar(TSIP TMIEC ODG Porting) <dinesh.kumar@toshiba-
>> tsip.com>; hayashi kazuhiro(林 和宏 DME ○DIG□MPS○MP4)
>> <kazuhiro3.hayashi@toshiba.co.jp>
>> Subject: Re: [cip-dev] [isar-cip-core v2 2/2] images: Add dosfstools as
>> DEPENDENCY to all images
>>
>> On 25.09.23 18:58, venkata.pyla@toshiba-tsip.com wrote:
>>> From: venkata pyla <venkata.pyla@toshiba-tsip.com>
>>>
>>> Signed-off-by: venkata pyla <venkata.pyla@toshiba-tsip.com>
>>> ---
>>>  recipes-core/images/cip-core-image-kernelci.bb |  1 +
>>> recipes-core/images/cip-core-image-security.bb |  1 +
>>>  recipes-core/images/cip-core-image.bb          |  1 +
>>>  recipes-core/images/common-image.inc           | 13 +++++++++++++
>>>  4 files changed, 16 insertions(+)
>>>  create mode 100644 recipes-core/images/common-image.inc
>>>
>>> diff --git a/recipes-core/images/cip-core-image-kernelci.bb
>>> b/recipes-core/images/cip-core-image-kernelci.bb
>>> index 479c14c..8a58e7b 100644
>>> --- a/recipes-core/images/cip-core-image-kernelci.bb
>>> +++ b/recipes-core/images/cip-core-image-kernelci.bb
>>> @@ -10,6 +10,7 @@
>>>  #
>>>
>>>  inherit image
>>> +require common-image.inc
>>>
>>>  DESCRIPTION = "CIP Core image for KernelCI"
>>>
>>> diff --git a/recipes-core/images/cip-core-image-security.bb
>>> b/recipes-core/images/cip-core-image-security.bb
>>> index 3421ce5..f114974 100644
>>> --- a/recipes-core/images/cip-core-image-security.bb
>>> +++ b/recipes-core/images/cip-core-image-security.bb
>>> @@ -10,6 +10,7 @@
>>>  #
>>>
>>>  inherit image
>>> +require common-image.inc
>>>
>>>  DESCRIPTION = "CIP Core image including security packages"
>>>
>>> diff --git a/recipes-core/images/cip-core-image.bb
>>> b/recipes-core/images/cip-core-image.bb
>>> index 0ec7220..711d3d3 100644
>>> --- a/recipes-core/images/cip-core-image.bb
>>> +++ b/recipes-core/images/cip-core-image.bb
>>> @@ -10,6 +10,7 @@
>>>  #
>>>
>>>  inherit image
>>> +require common-image.inc
>>>
>>>  ISAR_RELEASE_CMD = "git -C ${LAYERDIR_cip-core} describe --tags --dirty --
>> always --match 'v[0-9].[0-9]*'"
>>>  DESCRIPTION = "CIP Core image"
>>> diff --git a/recipes-core/images/common-image.inc
>>> b/recipes-core/images/common-image.inc
>>> new file mode 100644
>>> index 0000000..863f817
>>> --- /dev/null
>>> +++ b/recipes-core/images/common-image.inc
>>> @@ -0,0 +1,13 @@
>>> +#
>>> +# CIP Core, generic profile
>>> +#
>>> +# Copyright (c) Toshiba Corporation 2023 # # Authors:
>>> +#  Venkata Pyla <venkata.pyla@toshiba-tsip.com> # #
>>> +SPDX-License-Identifier: MIT #
>>> +
>>> +# Install in build system for creating reproducible DOS filesystems
>>> +DEPENDS += "dosfstools"
>>
>> Why this now? Patch 1 is adding it as IMAGES_BUILD_DEPS, and that should
>> be enough as you correctly analyzed. Do we want that change rather in
>> conf/distro/cip-core-common.inc?
> 
> It is not required; I was confused then with your comment I thought you are expecting this change for some reason.
> 
> If you agree you can discard the Patch 2.

OK, but the question remains on patch 1 if we only want to include the
tool in the reproducible mode or unconditionally. In the latter case, my
suggestion above would come into play.

Jan
Venkata Pyla Sept. 26, 2023, 7:41 a.m. UTC | #4
> -----Original Message-----
> From: Jan Kiszka <jan.kiszka@siemens.com>
> Sent: Tuesday, September 26, 2023 12:41 PM
> To: pyla venkata(TSIP TMIEC ODG Porting) <Venkata.Pyla@toshiba-
> tsip.com>; cip-dev@lists.cip-project.org
> Cc: dinesh kumar(TSIP TMIEC ODG Porting) <dinesh.kumar@toshiba-
> tsip.com>; hayashi kazuhiro(林 和宏 DME ○DIG□MPS○MP4)
> <kazuhiro3.hayashi@toshiba.co.jp>
> Subject: Re: [cip-dev] [isar-cip-core v2 2/2] images: Add dosfstools as
> DEPENDENCY to all images
> 
> On 26.09.23 03:39, Venkata.Pyla@toshiba-tsip.com wrote:
> >
> >
> >> -----Original Message-----
> >> From: cip-dev@lists.cip-project.org <cip-dev@lists.cip-project.org>
> >> On Behalf Of Jan Kiszka via lists.cip-project.org
> >> Sent: Monday, September 25, 2023 10:43 PM
> >> To: pyla venkata(TSIP TMIEC ODG Porting) <Venkata.Pyla@toshiba-
> >> tsip.com>; cip-dev@lists.cip-project.org
> >> Cc: dinesh kumar(TSIP TMIEC ODG Porting) <dinesh.kumar@toshiba-
> >> tsip.com>; hayashi kazuhiro(林 和宏 DME ○DIG□MPS○MP4)
> >> <kazuhiro3.hayashi@toshiba.co.jp>
> >> Subject: Re: [cip-dev] [isar-cip-core v2 2/2] images: Add dosfstools
> >> as DEPENDENCY to all images
> >>
> >> On 25.09.23 18:58, venkata.pyla@toshiba-tsip.com wrote:
> >>> From: venkata pyla <venkata.pyla@toshiba-tsip.com>
> >>>
> >>> Signed-off-by: venkata pyla <venkata.pyla@toshiba-tsip.com>
> >>> ---
> >>>  recipes-core/images/cip-core-image-kernelci.bb |  1 +
> >>> recipes-core/images/cip-core-image-security.bb |  1 +
> >>>  recipes-core/images/cip-core-image.bb          |  1 +
> >>>  recipes-core/images/common-image.inc           | 13 +++++++++++++
> >>>  4 files changed, 16 insertions(+)
> >>>  create mode 100644 recipes-core/images/common-image.inc
> >>>
> >>> diff --git a/recipes-core/images/cip-core-image-kernelci.bb
> >>> b/recipes-core/images/cip-core-image-kernelci.bb
> >>> index 479c14c..8a58e7b 100644
> >>> --- a/recipes-core/images/cip-core-image-kernelci.bb
> >>> +++ b/recipes-core/images/cip-core-image-kernelci.bb
> >>> @@ -10,6 +10,7 @@
> >>>  #
> >>>
> >>>  inherit image
> >>> +require common-image.inc
> >>>
> >>>  DESCRIPTION = "CIP Core image for KernelCI"
> >>>
> >>> diff --git a/recipes-core/images/cip-core-image-security.bb
> >>> b/recipes-core/images/cip-core-image-security.bb
> >>> index 3421ce5..f114974 100644
> >>> --- a/recipes-core/images/cip-core-image-security.bb
> >>> +++ b/recipes-core/images/cip-core-image-security.bb
> >>> @@ -10,6 +10,7 @@
> >>>  #
> >>>
> >>>  inherit image
> >>> +require common-image.inc
> >>>
> >>>  DESCRIPTION = "CIP Core image including security packages"
> >>>
> >>> diff --git a/recipes-core/images/cip-core-image.bb
> >>> b/recipes-core/images/cip-core-image.bb
> >>> index 0ec7220..711d3d3 100644
> >>> --- a/recipes-core/images/cip-core-image.bb
> >>> +++ b/recipes-core/images/cip-core-image.bb
> >>> @@ -10,6 +10,7 @@
> >>>  #
> >>>
> >>>  inherit image
> >>> +require common-image.inc
> >>>
> >>>  ISAR_RELEASE_CMD = "git -C ${LAYERDIR_cip-core} describe --tags
> >>> --dirty --
> >> always --match 'v[0-9].[0-9]*'"
> >>>  DESCRIPTION = "CIP Core image"
> >>> diff --git a/recipes-core/images/common-image.inc
> >>> b/recipes-core/images/common-image.inc
> >>> new file mode 100644
> >>> index 0000000..863f817
> >>> --- /dev/null
> >>> +++ b/recipes-core/images/common-image.inc
> >>> @@ -0,0 +1,13 @@
> >>> +#
> >>> +# CIP Core, generic profile
> >>> +#
> >>> +# Copyright (c) Toshiba Corporation 2023 # # Authors:
> >>> +#  Venkata Pyla <venkata.pyla@toshiba-tsip.com> # #
> >>> +SPDX-License-Identifier: MIT #
> >>> +
> >>> +# Install in build system for creating reproducible DOS filesystems
> >>> +DEPENDS += "dosfstools"
> >>
> >> Why this now? Patch 1 is adding it as IMAGES_BUILD_DEPS, and that
> >> should be enough as you correctly analyzed. Do we want that change
> >> rather in conf/distro/cip-core-common.inc?
> >
> > It is not required; I was confused then with your comment I thought you are
> expecting this change for some reason.
> >
> > If you agree you can discard the Patch 2.
> 
> OK, but the question remains on patch 1 if we only want to include the tool in
> the reproducible mode or unconditionally. In the latter case, my suggestion
> above would come into play.

I didn’t understand your question properly then, I am pasting your comment again as below.

>> +    IMAGER_BUILD_DEPS += "dosfstools"
> This will lead to funny effects when also the image requests dosfstools and HOST_ARCH, thus PACKAGE_ARCH == DISTRO_ARCH: If the package is built early enough, the target image will get our custom version. If it is built "too late", the distro version is used. All that would be non-reproducible.
What do you mean by "image requests dosfstools and HOST_ARCH"? -> dosfstools is requested to install in target image?
If it so, do you think dosfstools requested for target image MAY get it from Debian instead from local build? That would make image non-reproducible

Do you think we need add more stricter DEPENDENCY rule that will install before image is getting installed from Distro

> 
> Jan
> 
> --
> Siemens AG, Technology
> Linux Expert Center
Jan Kiszka Sept. 26, 2023, 9:19 a.m. UTC | #5
On 26.09.23 09:41, Venkata.Pyla@toshiba-tsip.com wrote:
> 
> 
>> -----Original Message-----
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>> Sent: Tuesday, September 26, 2023 12:41 PM
>> To: pyla venkata(TSIP TMIEC ODG Porting) <Venkata.Pyla@toshiba-
>> tsip.com>; cip-dev@lists.cip-project.org
>> Cc: dinesh kumar(TSIP TMIEC ODG Porting) <dinesh.kumar@toshiba-
>> tsip.com>; hayashi kazuhiro(林 和宏 DME ○DIG□MPS○MP4)
>> <kazuhiro3.hayashi@toshiba.co.jp>
>> Subject: Re: [cip-dev] [isar-cip-core v2 2/2] images: Add dosfstools as
>> DEPENDENCY to all images
>>
>> On 26.09.23 03:39, Venkata.Pyla@toshiba-tsip.com wrote:
>>>
>>>
>>>> -----Original Message-----
>>>> From: cip-dev@lists.cip-project.org <cip-dev@lists.cip-project.org>
>>>> On Behalf Of Jan Kiszka via lists.cip-project.org
>>>> Sent: Monday, September 25, 2023 10:43 PM
>>>> To: pyla venkata(TSIP TMIEC ODG Porting) <Venkata.Pyla@toshiba-
>>>> tsip.com>; cip-dev@lists.cip-project.org
>>>> Cc: dinesh kumar(TSIP TMIEC ODG Porting) <dinesh.kumar@toshiba-
>>>> tsip.com>; hayashi kazuhiro(林 和宏 DME ○DIG□MPS○MP4)
>>>> <kazuhiro3.hayashi@toshiba.co.jp>
>>>> Subject: Re: [cip-dev] [isar-cip-core v2 2/2] images: Add dosfstools
>>>> as DEPENDENCY to all images
>>>>
>>>> On 25.09.23 18:58, venkata.pyla@toshiba-tsip.com wrote:
>>>>> From: venkata pyla <venkata.pyla@toshiba-tsip.com>
>>>>>
>>>>> Signed-off-by: venkata pyla <venkata.pyla@toshiba-tsip.com>
>>>>> ---
>>>>>  recipes-core/images/cip-core-image-kernelci.bb |  1 +
>>>>> recipes-core/images/cip-core-image-security.bb |  1 +
>>>>>  recipes-core/images/cip-core-image.bb          |  1 +
>>>>>  recipes-core/images/common-image.inc           | 13 +++++++++++++
>>>>>  4 files changed, 16 insertions(+)
>>>>>  create mode 100644 recipes-core/images/common-image.inc
>>>>>
>>>>> diff --git a/recipes-core/images/cip-core-image-kernelci.bb
>>>>> b/recipes-core/images/cip-core-image-kernelci.bb
>>>>> index 479c14c..8a58e7b 100644
>>>>> --- a/recipes-core/images/cip-core-image-kernelci.bb
>>>>> +++ b/recipes-core/images/cip-core-image-kernelci.bb
>>>>> @@ -10,6 +10,7 @@
>>>>>  #
>>>>>
>>>>>  inherit image
>>>>> +require common-image.inc
>>>>>
>>>>>  DESCRIPTION = "CIP Core image for KernelCI"
>>>>>
>>>>> diff --git a/recipes-core/images/cip-core-image-security.bb
>>>>> b/recipes-core/images/cip-core-image-security.bb
>>>>> index 3421ce5..f114974 100644
>>>>> --- a/recipes-core/images/cip-core-image-security.bb
>>>>> +++ b/recipes-core/images/cip-core-image-security.bb
>>>>> @@ -10,6 +10,7 @@
>>>>>  #
>>>>>
>>>>>  inherit image
>>>>> +require common-image.inc
>>>>>
>>>>>  DESCRIPTION = "CIP Core image including security packages"
>>>>>
>>>>> diff --git a/recipes-core/images/cip-core-image.bb
>>>>> b/recipes-core/images/cip-core-image.bb
>>>>> index 0ec7220..711d3d3 100644
>>>>> --- a/recipes-core/images/cip-core-image.bb
>>>>> +++ b/recipes-core/images/cip-core-image.bb
>>>>> @@ -10,6 +10,7 @@
>>>>>  #
>>>>>
>>>>>  inherit image
>>>>> +require common-image.inc
>>>>>
>>>>>  ISAR_RELEASE_CMD = "git -C ${LAYERDIR_cip-core} describe --tags
>>>>> --dirty --
>>>> always --match 'v[0-9].[0-9]*'"
>>>>>  DESCRIPTION = "CIP Core image"
>>>>> diff --git a/recipes-core/images/common-image.inc
>>>>> b/recipes-core/images/common-image.inc
>>>>> new file mode 100644
>>>>> index 0000000..863f817
>>>>> --- /dev/null
>>>>> +++ b/recipes-core/images/common-image.inc
>>>>> @@ -0,0 +1,13 @@
>>>>> +#
>>>>> +# CIP Core, generic profile
>>>>> +#
>>>>> +# Copyright (c) Toshiba Corporation 2023 # # Authors:
>>>>> +#  Venkata Pyla <venkata.pyla@toshiba-tsip.com> # #
>>>>> +SPDX-License-Identifier: MIT #
>>>>> +
>>>>> +# Install in build system for creating reproducible DOS filesystems
>>>>> +DEPENDS += "dosfstools"
>>>>
>>>> Why this now? Patch 1 is adding it as IMAGES_BUILD_DEPS, and that
>>>> should be enough as you correctly analyzed. Do we want that change
>>>> rather in conf/distro/cip-core-common.inc?
>>>
>>> It is not required; I was confused then with your comment I thought you are
>> expecting this change for some reason.
>>>
>>> If you agree you can discard the Patch 2.
>>
>> OK, but the question remains on patch 1 if we only want to include the tool in
>> the reproducible mode or unconditionally. In the latter case, my suggestion
>> above would come into play.
> 
> I didn’t understand your question properly then, I am pasting your comment again as below.

Your patch one currently only adds the self-built dosfstools when the
user explicitly selects reproducible building. In other cases - simpler
ones, granted - we apply reproducibility fixes unconditionally. Should
we do that for dosfstools as well? That is my only question.

Jan
Venkata Pyla Sept. 26, 2023, 11:51 a.m. UTC | #6
> -----Original Message-----
> From: Jan Kiszka <jan.kiszka@siemens.com>
> Sent: Tuesday, September 26, 2023 2:49 PM
> To: pyla venkata(TSIP TMIEC ODG Porting) <Venkata.Pyla@toshiba-
> tsip.com>; cip-dev@lists.cip-project.org
> Cc: dinesh kumar(TSIP TMIEC ODG Porting) <dinesh.kumar@toshiba-
> tsip.com>; hayashi kazuhiro(林 和宏 DME ○DIG□MPS○MP4)
> <kazuhiro3.hayashi@toshiba.co.jp>
> Subject: Re: [cip-dev] [isar-cip-core v2 2/2] images: Add dosfstools as
> DEPENDENCY to all images
> 
> On 26.09.23 09:41, Venkata.Pyla@toshiba-tsip.com wrote:
> >
> >
> >> -----Original Message-----
> >> From: Jan Kiszka <jan.kiszka@siemens.com>
> >> Sent: Tuesday, September 26, 2023 12:41 PM
> >> To: pyla venkata(TSIP TMIEC ODG Porting) <Venkata.Pyla@toshiba-
> >> tsip.com>; cip-dev@lists.cip-project.org
> >> Cc: dinesh kumar(TSIP TMIEC ODG Porting) <dinesh.kumar@toshiba-
> >> tsip.com>; hayashi kazuhiro(林 和宏 DME ○DIG□MPS○MP4)
> >> <kazuhiro3.hayashi@toshiba.co.jp>
> >> Subject: Re: [cip-dev] [isar-cip-core v2 2/2] images: Add dosfstools
> >> as DEPENDENCY to all images
> >>
> >> On 26.09.23 03:39, Venkata.Pyla@toshiba-tsip.com wrote:
> >>>
> >>>
> >>>> -----Original Message-----
> >>>> From: cip-dev@lists.cip-project.org <cip-dev@lists.cip-project.org>
> >>>> On Behalf Of Jan Kiszka via lists.cip-project.org
> >>>> Sent: Monday, September 25, 2023 10:43 PM
> >>>> To: pyla venkata(TSIP TMIEC ODG Porting) <Venkata.Pyla@toshiba-
> >>>> tsip.com>; cip-dev@lists.cip-project.org
> >>>> Cc: dinesh kumar(TSIP TMIEC ODG Porting)
> <dinesh.kumar@toshiba-
> >>>> tsip.com>; hayashi kazuhiro(林 和宏 DME ○DIG□MPS○MP4)
> >>>> <kazuhiro3.hayashi@toshiba.co.jp>
> >>>> Subject: Re: [cip-dev] [isar-cip-core v2 2/2] images: Add
> >>>> dosfstools as DEPENDENCY to all images
> >>>>
> >>>> On 25.09.23 18:58, venkata.pyla@toshiba-tsip.com wrote:
> >>>>> From: venkata pyla <venkata.pyla@toshiba-tsip.com>
> >>>>>
> >>>>> Signed-off-by: venkata pyla <venkata.pyla@toshiba-tsip.com>
> >>>>> ---
> >>>>>  recipes-core/images/cip-core-image-kernelci.bb |  1 +
> >>>>> recipes-core/images/cip-core-image-security.bb |  1 +
> >>>>>  recipes-core/images/cip-core-image.bb          |  1 +
> >>>>>  recipes-core/images/common-image.inc           | 13 +++++++++++++
> >>>>>  4 files changed, 16 insertions(+)  create mode 100644
> >>>>> recipes-core/images/common-image.inc
> >>>>>
> >>>>> diff --git a/recipes-core/images/cip-core-image-kernelci.bb
> >>>>> b/recipes-core/images/cip-core-image-kernelci.bb
> >>>>> index 479c14c..8a58e7b 100644
> >>>>> --- a/recipes-core/images/cip-core-image-kernelci.bb
> >>>>> +++ b/recipes-core/images/cip-core-image-kernelci.bb
> >>>>> @@ -10,6 +10,7 @@
> >>>>>  #
> >>>>>
> >>>>>  inherit image
> >>>>> +require common-image.inc
> >>>>>
> >>>>>  DESCRIPTION = "CIP Core image for KernelCI"
> >>>>>
> >>>>> diff --git a/recipes-core/images/cip-core-image-security.bb
> >>>>> b/recipes-core/images/cip-core-image-security.bb
> >>>>> index 3421ce5..f114974 100644
> >>>>> --- a/recipes-core/images/cip-core-image-security.bb
> >>>>> +++ b/recipes-core/images/cip-core-image-security.bb
> >>>>> @@ -10,6 +10,7 @@
> >>>>>  #
> >>>>>
> >>>>>  inherit image
> >>>>> +require common-image.inc
> >>>>>
> >>>>>  DESCRIPTION = "CIP Core image including security packages"
> >>>>>
> >>>>> diff --git a/recipes-core/images/cip-core-image.bb
> >>>>> b/recipes-core/images/cip-core-image.bb
> >>>>> index 0ec7220..711d3d3 100644
> >>>>> --- a/recipes-core/images/cip-core-image.bb
> >>>>> +++ b/recipes-core/images/cip-core-image.bb
> >>>>> @@ -10,6 +10,7 @@
> >>>>>  #
> >>>>>
> >>>>>  inherit image
> >>>>> +require common-image.inc
> >>>>>
> >>>>>  ISAR_RELEASE_CMD = "git -C ${LAYERDIR_cip-core} describe --tags
> >>>>> --dirty --
> >>>> always --match 'v[0-9].[0-9]*'"
> >>>>>  DESCRIPTION = "CIP Core image"
> >>>>> diff --git a/recipes-core/images/common-image.inc
> >>>>> b/recipes-core/images/common-image.inc
> >>>>> new file mode 100644
> >>>>> index 0000000..863f817
> >>>>> --- /dev/null
> >>>>> +++ b/recipes-core/images/common-image.inc
> >>>>> @@ -0,0 +1,13 @@
> >>>>> +#
> >>>>> +# CIP Core, generic profile
> >>>>> +#
> >>>>> +# Copyright (c) Toshiba Corporation 2023 # # Authors:
> >>>>> +#  Venkata Pyla <venkata.pyla@toshiba-tsip.com> # #
> >>>>> +SPDX-License-Identifier: MIT #
> >>>>> +
> >>>>> +# Install in build system for creating reproducible DOS
> >>>>> +filesystems DEPENDS += "dosfstools"
> >>>>
> >>>> Why this now? Patch 1 is adding it as IMAGES_BUILD_DEPS, and that
> >>>> should be enough as you correctly analyzed. Do we want that change
> >>>> rather in conf/distro/cip-core-common.inc?
> >>>
> >>> It is not required; I was confused then with your comment I thought
> >>> you are
> >> expecting this change for some reason.
> >>>
> >>> If you agree you can discard the Patch 2.
> >>
> >> OK, but the question remains on patch 1 if we only want to include
> >> the tool in the reproducible mode or unconditionally. In the latter
> >> case, my suggestion above would come into play.
> >
> > I didn’t understand your question properly then, I am pasting your comment
> again as below.
> 
> Your patch one currently only adds the self-built dosfstools when the user
> explicitly selects reproducible building. In other cases - simpler ones, granted -
> we apply reproducibility fixes unconditionally. Should we do that for
> dosfstools as well? That is my only question.

I understand now, we can enable dosfstools unconditionally also, maybe we can do that in distro configuration, 
here https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/master/conf/distro/cip-core-common.inc?

I will send v3 patch with this modification.


> 
> Jan
> 
> --
> Siemens AG, Technology
> Linux Expert Center
Jan Kiszka Sept. 26, 2023, 12:57 p.m. UTC | #7
On 26.09.23 13:51, Venkata.Pyla@toshiba-tsip.com wrote:
> 
> 
>> -----Original Message-----
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>> Sent: Tuesday, September 26, 2023 2:49 PM
>> To: pyla venkata(TSIP TMIEC ODG Porting) <Venkata.Pyla@toshiba-
>> tsip.com>; cip-dev@lists.cip-project.org
>> Cc: dinesh kumar(TSIP TMIEC ODG Porting) <dinesh.kumar@toshiba-
>> tsip.com>; hayashi kazuhiro(林 和宏 DME ○DIG□MPS○MP4)
>> <kazuhiro3.hayashi@toshiba.co.jp>
>> Subject: Re: [cip-dev] [isar-cip-core v2 2/2] images: Add dosfstools as
>> DEPENDENCY to all images
>>
>> On 26.09.23 09:41, Venkata.Pyla@toshiba-tsip.com wrote:
>>>
>>>
>>>> -----Original Message-----
>>>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>>> Sent: Tuesday, September 26, 2023 12:41 PM
>>>> To: pyla venkata(TSIP TMIEC ODG Porting) <Venkata.Pyla@toshiba-
>>>> tsip.com>; cip-dev@lists.cip-project.org
>>>> Cc: dinesh kumar(TSIP TMIEC ODG Porting) <dinesh.kumar@toshiba-
>>>> tsip.com>; hayashi kazuhiro(林 和宏 DME ○DIG□MPS○MP4)
>>>> <kazuhiro3.hayashi@toshiba.co.jp>
>>>> Subject: Re: [cip-dev] [isar-cip-core v2 2/2] images: Add dosfstools
>>>> as DEPENDENCY to all images
>>>>
>>>> On 26.09.23 03:39, Venkata.Pyla@toshiba-tsip.com wrote:
>>>>>
>>>>>
>>>>>> -----Original Message-----
>>>>>> From: cip-dev@lists.cip-project.org <cip-dev@lists.cip-project.org>
>>>>>> On Behalf Of Jan Kiszka via lists.cip-project.org
>>>>>> Sent: Monday, September 25, 2023 10:43 PM
>>>>>> To: pyla venkata(TSIP TMIEC ODG Porting) <Venkata.Pyla@toshiba-
>>>>>> tsip.com>; cip-dev@lists.cip-project.org
>>>>>> Cc: dinesh kumar(TSIP TMIEC ODG Porting)
>> <dinesh.kumar@toshiba-
>>>>>> tsip.com>; hayashi kazuhiro(林 和宏 DME ○DIG□MPS○MP4)
>>>>>> <kazuhiro3.hayashi@toshiba.co.jp>
>>>>>> Subject: Re: [cip-dev] [isar-cip-core v2 2/2] images: Add
>>>>>> dosfstools as DEPENDENCY to all images
>>>>>>
>>>>>> On 25.09.23 18:58, venkata.pyla@toshiba-tsip.com wrote:
>>>>>>> From: venkata pyla <venkata.pyla@toshiba-tsip.com>
>>>>>>>
>>>>>>> Signed-off-by: venkata pyla <venkata.pyla@toshiba-tsip.com>
>>>>>>> ---
>>>>>>>  recipes-core/images/cip-core-image-kernelci.bb |  1 +
>>>>>>> recipes-core/images/cip-core-image-security.bb |  1 +
>>>>>>>  recipes-core/images/cip-core-image.bb          |  1 +
>>>>>>>  recipes-core/images/common-image.inc           | 13 +++++++++++++
>>>>>>>  4 files changed, 16 insertions(+)  create mode 100644
>>>>>>> recipes-core/images/common-image.inc
>>>>>>>
>>>>>>> diff --git a/recipes-core/images/cip-core-image-kernelci.bb
>>>>>>> b/recipes-core/images/cip-core-image-kernelci.bb
>>>>>>> index 479c14c..8a58e7b 100644
>>>>>>> --- a/recipes-core/images/cip-core-image-kernelci.bb
>>>>>>> +++ b/recipes-core/images/cip-core-image-kernelci.bb
>>>>>>> @@ -10,6 +10,7 @@
>>>>>>>  #
>>>>>>>
>>>>>>>  inherit image
>>>>>>> +require common-image.inc
>>>>>>>
>>>>>>>  DESCRIPTION = "CIP Core image for KernelCI"
>>>>>>>
>>>>>>> diff --git a/recipes-core/images/cip-core-image-security.bb
>>>>>>> b/recipes-core/images/cip-core-image-security.bb
>>>>>>> index 3421ce5..f114974 100644
>>>>>>> --- a/recipes-core/images/cip-core-image-security.bb
>>>>>>> +++ b/recipes-core/images/cip-core-image-security.bb
>>>>>>> @@ -10,6 +10,7 @@
>>>>>>>  #
>>>>>>>
>>>>>>>  inherit image
>>>>>>> +require common-image.inc
>>>>>>>
>>>>>>>  DESCRIPTION = "CIP Core image including security packages"
>>>>>>>
>>>>>>> diff --git a/recipes-core/images/cip-core-image.bb
>>>>>>> b/recipes-core/images/cip-core-image.bb
>>>>>>> index 0ec7220..711d3d3 100644
>>>>>>> --- a/recipes-core/images/cip-core-image.bb
>>>>>>> +++ b/recipes-core/images/cip-core-image.bb
>>>>>>> @@ -10,6 +10,7 @@
>>>>>>>  #
>>>>>>>
>>>>>>>  inherit image
>>>>>>> +require common-image.inc
>>>>>>>
>>>>>>>  ISAR_RELEASE_CMD = "git -C ${LAYERDIR_cip-core} describe --tags
>>>>>>> --dirty --
>>>>>> always --match 'v[0-9].[0-9]*'"
>>>>>>>  DESCRIPTION = "CIP Core image"
>>>>>>> diff --git a/recipes-core/images/common-image.inc
>>>>>>> b/recipes-core/images/common-image.inc
>>>>>>> new file mode 100644
>>>>>>> index 0000000..863f817
>>>>>>> --- /dev/null
>>>>>>> +++ b/recipes-core/images/common-image.inc
>>>>>>> @@ -0,0 +1,13 @@
>>>>>>> +#
>>>>>>> +# CIP Core, generic profile
>>>>>>> +#
>>>>>>> +# Copyright (c) Toshiba Corporation 2023 # # Authors:
>>>>>>> +#  Venkata Pyla <venkata.pyla@toshiba-tsip.com> # #
>>>>>>> +SPDX-License-Identifier: MIT #
>>>>>>> +
>>>>>>> +# Install in build system for creating reproducible DOS
>>>>>>> +filesystems DEPENDS += "dosfstools"
>>>>>>
>>>>>> Why this now? Patch 1 is adding it as IMAGES_BUILD_DEPS, and that
>>>>>> should be enough as you correctly analyzed. Do we want that change
>>>>>> rather in conf/distro/cip-core-common.inc?
>>>>>
>>>>> It is not required; I was confused then with your comment I thought
>>>>> you are
>>>> expecting this change for some reason.
>>>>>
>>>>> If you agree you can discard the Patch 2.
>>>>
>>>> OK, but the question remains on patch 1 if we only want to include
>>>> the tool in the reproducible mode or unconditionally. In the latter
>>>> case, my suggestion above would come into play.
>>>
>>> I didn’t understand your question properly then, I am pasting your comment
>> again as below.
>>
>> Your patch one currently only adds the self-built dosfstools when the user
>> explicitly selects reproducible building. In other cases - simpler ones, granted -
>> we apply reproducibility fixes unconditionally. Should we do that for
>> dosfstools as well? That is my only question.
> 
> I understand now, we can enable dosfstools unconditionally also, maybe we can do that in distro configuration, 
> here https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/master/conf/distro/cip-core-common.inc?
> 

Yes, that was my idea as well.

> I will send v3 patch with this modification.
> 

Thanks in advance,
Jan
diff mbox series

Patch

diff --git a/recipes-core/images/cip-core-image-kernelci.bb b/recipes-core/images/cip-core-image-kernelci.bb
index 479c14c..8a58e7b 100644
--- a/recipes-core/images/cip-core-image-kernelci.bb
+++ b/recipes-core/images/cip-core-image-kernelci.bb
@@ -10,6 +10,7 @@ 
 #
 
 inherit image
+require common-image.inc
 
 DESCRIPTION = "CIP Core image for KernelCI"
 
diff --git a/recipes-core/images/cip-core-image-security.bb b/recipes-core/images/cip-core-image-security.bb
index 3421ce5..f114974 100644
--- a/recipes-core/images/cip-core-image-security.bb
+++ b/recipes-core/images/cip-core-image-security.bb
@@ -10,6 +10,7 @@ 
 #
 
 inherit image
+require common-image.inc
 
 DESCRIPTION = "CIP Core image including security packages"
 
diff --git a/recipes-core/images/cip-core-image.bb b/recipes-core/images/cip-core-image.bb
index 0ec7220..711d3d3 100644
--- a/recipes-core/images/cip-core-image.bb
+++ b/recipes-core/images/cip-core-image.bb
@@ -10,6 +10,7 @@ 
 #
 
 inherit image
+require common-image.inc
 
 ISAR_RELEASE_CMD = "git -C ${LAYERDIR_cip-core} describe --tags --dirty --always --match 'v[0-9].[0-9]*'"
 DESCRIPTION = "CIP Core image"
diff --git a/recipes-core/images/common-image.inc b/recipes-core/images/common-image.inc
new file mode 100644
index 0000000..863f817
--- /dev/null
+++ b/recipes-core/images/common-image.inc
@@ -0,0 +1,13 @@ 
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Toshiba Corporation 2023
+#
+# Authors:
+#  Venkata Pyla <venkata.pyla@toshiba-tsip.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+# Install in build system for creating reproducible DOS filesystems
+DEPENDS += "dosfstools"