| Message ID | 20240816185307.15808-1-reatmon@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master/scarthgap,v2] trusted-firmware-a: Update to v2.11 release tag | expand |
On Fri, Aug 16, 2024 at 01:53:07PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: > From: Kamlesh Gurudasani <kamlesh@ti.com> > > Update to latest release tag, i.e. v2.11. > > Also update the LIC_FILES_CHKSUM since the license file changed since > the last SRCREV change. Changed in what way? It is recommended to briefly describe license changes in the commit log - it forces one to review the changes to ensure there are no license incompatibilities or even in the worst case complete re-licensing of the product. In this case the changes were not too bad, but apparently the list of licenses did change - see this discussion: https://lists.yoctoproject.org/g/meta-arm/topic/106488067#msg6004 > Commit: > https://git.trustedfirmware.org/TF-A/trusted-firmware-a/+/f2735ebccf5173f74c0458736ec526276106097e > > Tag: > https://git.trustedfirmware.org/TF-A/trusted-firmware-a/+/refs/tags/v2.11 > > Signed-off-by: Kamlesh Gurudasani <kamlesh@ti.com> > Tested-by: Manorit Chawdhry <m-chawdhry@ti.com> > Signed-off-by: Ryan Eatmon <reatmon@ti.com> > --- > .../recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc > index 291259c0..157bdbc5 100644 > --- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc > +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc > @@ -1,5 +1,6 @@ > -PV:k3 = "2.10+git" > -SRCREV_tfa:k3 = "00f1ec6b8740ccd403e641131e294aabacf2a48b" > +PV:k3 = "2.11+git" > +SRCREV_tfa:k3 = "f2735ebccf5173f74c0458736ec526276106097e" > +LIC_FILES_CHKSUM:k3 = "file://docs/license.rst;md5=b5fbfdeb6855162dded31fadcd5d4dc5" > SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" > COMPATIBLE_MACHINE:k3 = "k3" > TFA_BUILD_TARGET:k3 = "all" > -- > 2.17.1
On 8/27/2024 2:38 PM, Denys Dmytriyenko wrote: > On Fri, Aug 16, 2024 at 01:53:07PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: >> From: Kamlesh Gurudasani <kamlesh@ti.com> >> >> Update to latest release tag, i.e. v2.11. >> >> Also update the LIC_FILES_CHKSUM since the license file changed since >> the last SRCREV change. > > Changed in what way? It is recommended to briefly describe license changes in > the commit log - it forces one to review the changes to ensure there are no > license incompatibilities or even in the worst case complete re-licensing of > the product. The license file for that project is a little goofy. It has a big overall license, but then breaks out some specific features/blocks of code and lists additional license for those sections. And that's what they changed. They added some new items to that list. I thought about pushing back on the project and using the begins/ends concept to selectively extract the main license, but then I thought about it realized that was not a good idea. I'm open to suggestions about how to word a commit to handle this kind of thing in the future. Here is the license file: https://git.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/refs/tags/v2.11/docs/license.rst And here is the change that impacts this patch: https://git.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/584052c7f80b406666b9597447eeccef4d6deca4%5E%21/docs/license.rst > In this case the changes were not too bad, but apparently the list of licenses > did change - see this discussion: > > https://lists.yoctoproject.org/g/meta-arm/topic/106488067#msg6004 > > >> Commit: >> https://git.trustedfirmware.org/TF-A/trusted-firmware-a/+/f2735ebccf5173f74c0458736ec526276106097e >> >> Tag: >> https://git.trustedfirmware.org/TF-A/trusted-firmware-a/+/refs/tags/v2.11 >> >> Signed-off-by: Kamlesh Gurudasani <kamlesh@ti.com> >> Tested-by: Manorit Chawdhry <m-chawdhry@ti.com> >> Signed-off-by: Ryan Eatmon <reatmon@ti.com> >> --- >> .../recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc >> index 291259c0..157bdbc5 100644 >> --- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc >> +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc >> @@ -1,5 +1,6 @@ >> -PV:k3 = "2.10+git" >> -SRCREV_tfa:k3 = "00f1ec6b8740ccd403e641131e294aabacf2a48b" >> +PV:k3 = "2.11+git" >> +SRCREV_tfa:k3 = "f2735ebccf5173f74c0458736ec526276106097e" >> +LIC_FILES_CHKSUM:k3 = "file://docs/license.rst;md5=b5fbfdeb6855162dded31fadcd5d4dc5" >> SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" >> COMPATIBLE_MACHINE:k3 = "k3" >> TFA_BUILD_TARGET:k3 = "all" >> -- >> 2.17.1
On 8/27/2024 5:08 PM, Ryan Eatmon via lists.yoctoproject.org wrote: > > > On 8/27/2024 2:38 PM, Denys Dmytriyenko wrote: >> On Fri, Aug 16, 2024 at 01:53:07PM -0500, Ryan Eatmon via >> lists.yoctoproject.org wrote: >>> From: Kamlesh Gurudasani <kamlesh@ti.com> >>> >>> Update to latest release tag, i.e. v2.11. >>> >>> Also update the LIC_FILES_CHKSUM since the license file changed since >>> the last SRCREV change. >> >> Changed in what way? It is recommended to briefly describe license >> changes in >> the commit log - it forces one to review the changes to ensure there >> are no >> license incompatibilities or even in the worst case complete >> re-licensing of >> the product. > > The license file for that project is a little goofy. It has a big > overall license, but then breaks out some specific features/blocks of > code and lists additional license for those sections. And that's what > they changed. They added some new items to that list. > > I thought about pushing back on the project and using the begins/ends > concept to selectively extract the main license, but then I thought > about it realized that was not a good idea. > > I'm open to suggestions about how to word a commit to handle this kind > of thing in the future. > > Here is the license file: > > https://git.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/refs/tags/v2.11/docs/license.rst > > And here is the change that impacts this patch: > > https://git.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/584052c7f80b406666b9597447eeccef4d6deca4%5E%21/docs/license.rst The license file above lists these licenses: BSD-3-Clause plus _FreeBSD: http://www.freebsd.org _Linux MIT license: https://raw.githubusercontent.com/torvalds/linux/master/LICENSES/preferred/MIT _SCC: http://www.simple-cc.org/ _Open Profile for DICE: https://pigweed.googlesource.com/open-dice/ _Apache License 2.0: https://www.apache.org/licenses/LICENSE-2.0.txt But the recipe[1][2] only lists this: LICENSE = "BSD-3-Clause & MIT" Does that mean the base recipe is also "not compliant" and should be updated? [1] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bb > >> In this case the changes were not too bad, but apparently the list of >> licenses >> did change - see this discussion: >> >> https://lists.yoctoproject.org/g/meta-arm/topic/106488067#msg6004 >> >> >>> Commit: >>> https://git.trustedfirmware.org/TF-A/trusted-firmware-a/+/f2735ebccf5173f74c0458736ec526276106097e >>> >>> Tag: >>> https://git.trustedfirmware.org/TF-A/trusted-firmware-a/+/refs/tags/v2.11 >>> >>> Signed-off-by: Kamlesh Gurudasani <kamlesh@ti.com> >>> Tested-by: Manorit Chawdhry <m-chawdhry@ti.com> >>> Signed-off-by: Ryan Eatmon <reatmon@ti.com> >>> --- >>> .../recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc | 5 +++-- >>> 1 file changed, 3 insertions(+), 2 deletions(-) >>> >>> diff --git >>> a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc >>> index 291259c0..157bdbc5 100644 >>> --- >>> a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc >>> +++ >>> b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc >>> @@ -1,5 +1,6 @@ >>> -PV:k3 = "2.10+git" >>> -SRCREV_tfa:k3 = "00f1ec6b8740ccd403e641131e294aabacf2a48b" >>> +PV:k3 = "2.11+git" >>> +SRCREV_tfa:k3 = "f2735ebccf5173f74c0458736ec526276106097e" >>> +LIC_FILES_CHKSUM:k3 = >>> "file://docs/license.rst;md5=b5fbfdeb6855162dded31fadcd5d4dc5" >>> SRC_URI:k3 = >>> "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" >>> COMPATIBLE_MACHINE:k3 = "k3" >>> TFA_BUILD_TARGET:k3 = "all" >>> -- >>> 2.17.1 > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#17954): https://lists.yoctoproject.org/g/meta-ti/message/17954 > Mute This Topic: https://lists.yoctoproject.org/mt/107937926/6551054 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Tue, Aug 27, 2024 at 05:14:07PM -0500, Ryan Eatmon wrote: > > > On 8/27/2024 5:08 PM, Ryan Eatmon via lists.yoctoproject.org wrote: > > > > > >On 8/27/2024 2:38 PM, Denys Dmytriyenko wrote: > >>On Fri, Aug 16, 2024 at 01:53:07PM -0500, Ryan Eatmon via > >>lists.yoctoproject.org wrote: > >>>From: Kamlesh Gurudasani <kamlesh@ti.com> > >>> > >>>Update to latest release tag, i.e. v2.11. > >>> > >>>Also update the LIC_FILES_CHKSUM since the license file changed since > >>>the last SRCREV change. > >> > >>Changed in what way? It is recommended to briefly describe > >>license changes in > >>the commit log - it forces one to review the changes to ensure > >>there are no > >>license incompatibilities or even in the worst case complete > >>re-licensing of > >>the product. > > > >The license file for that project is a little goofy. It has a big > >overall license, but then breaks out some specific features/blocks > >of code and lists additional license for those sections. And > >that's what they changed. They added some new items to that list. > > > >I thought about pushing back on the project and using the > >begins/ends concept to selectively extract the main license, but > >then I thought about it realized that was not a good idea. > > > >I'm open to suggestions about how to word a commit to handle this > >kind of thing in the future. > > > >Here is the license file: > > > >https://git.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/refs/tags/v2.11/docs/license.rst > > > >And here is the change that impacts this patch: > > > >https://git.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/584052c7f80b406666b9597447eeccef4d6deca4%5E%21/docs/license.rst > > The license file above lists these licenses: > > BSD-3-Clause > plus > _FreeBSD: http://www.freebsd.org > _Linux MIT license: https://raw.githubusercontent.com/torvalds/linux/master/LICENSES/preferred/MIT > _SCC: http://www.simple-cc.org/ > _Open Profile for DICE: https://pigweed.googlesource.com/open-dice/ > _Apache License 2.0: https://www.apache.org/licenses/LICENSE-2.0.txt > > > > But the recipe[1][2] only lists this: > > LICENSE = "BSD-3-Clause & MIT" > > Does that mean the base recipe is also "not compliant" and should be > updated? > > [1] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc > [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bb > > > > > >>In this case the changes were not too bad, but apparently the > >>list of licenses > >>did change - see this discussion: > >> > >>https://lists.yoctoproject.org/g/meta-arm/topic/106488067#msg6004 Have you looked at our upstream meta-arm discussion I linked here? > >>>Commit: > >>>https://git.trustedfirmware.org/TF-A/trusted-firmware-a/+/f2735ebccf5173f74c0458736ec526276106097e > >>> > >>>Tag: > >>>https://git.trustedfirmware.org/TF-A/trusted-firmware-a/+/refs/tags/v2.11 > >>> > >>>Signed-off-by: Kamlesh Gurudasani <kamlesh@ti.com> > >>>Tested-by: Manorit Chawdhry <m-chawdhry@ti.com> > >>>Signed-off-by: Ryan Eatmon <reatmon@ti.com> > >>>--- > >>> .../recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc | 5 +++-- > >>> 1 file changed, 3 insertions(+), 2 deletions(-) > >>> > >>>diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc > >>>index 291259c0..157bdbc5 100644 > >>>--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc > >>>+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc > >>>@@ -1,5 +1,6 @@ > >>>-PV:k3 = "2.10+git" > >>>-SRCREV_tfa:k3 = "00f1ec6b8740ccd403e641131e294aabacf2a48b" > >>>+PV:k3 = "2.11+git" > >>>+SRCREV_tfa:k3 = "f2735ebccf5173f74c0458736ec526276106097e" > >>>+LIC_FILES_CHKSUM:k3 = > >>>"file://docs/license.rst;md5=b5fbfdeb6855162dded31fadcd5d4dc5" > >>> SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" > >>> COMPATIBLE_MACHINE:k3 = "k3" > >>> TFA_BUILD_TARGET:k3 = "all" > >>>-- > >>>2.17.1
On 8/28/2024 11:06 AM, Denys Dmytriyenko wrote: > On Tue, Aug 27, 2024 at 05:14:07PM -0500, Ryan Eatmon wrote: >> >> >> On 8/27/2024 5:08 PM, Ryan Eatmon via lists.yoctoproject.org wrote: >>> >>> >>> On 8/27/2024 2:38 PM, Denys Dmytriyenko wrote: >>>> On Fri, Aug 16, 2024 at 01:53:07PM -0500, Ryan Eatmon via >>>> lists.yoctoproject.org wrote: >>>>> From: Kamlesh Gurudasani <kamlesh@ti.com> >>>>> >>>>> Update to latest release tag, i.e. v2.11. >>>>> >>>>> Also update the LIC_FILES_CHKSUM since the license file changed since >>>>> the last SRCREV change. >>>> >>>> Changed in what way? It is recommended to briefly describe >>>> license changes in >>>> the commit log - it forces one to review the changes to ensure >>>> there are no >>>> license incompatibilities or even in the worst case complete >>>> re-licensing of >>>> the product. >>> >>> The license file for that project is a little goofy. It has a big >>> overall license, but then breaks out some specific features/blocks >>> of code and lists additional license for those sections. And >>> that's what they changed. They added some new items to that list. >>> >>> I thought about pushing back on the project and using the >>> begins/ends concept to selectively extract the main license, but >>> then I thought about it realized that was not a good idea. >>> >>> I'm open to suggestions about how to word a commit to handle this >>> kind of thing in the future. >>> >>> Here is the license file: >>> >>> https://git.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/refs/tags/v2.11/docs/license.rst >>> >>> And here is the change that impacts this patch: >>> >>> https://git.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/584052c7f80b406666b9597447eeccef4d6deca4%5E%21/docs/license.rst >> >> The license file above lists these licenses: >> >> BSD-3-Clause >> plus >> _FreeBSD: http://www.freebsd.org >> _Linux MIT license: https://raw.githubusercontent.com/torvalds/linux/master/LICENSES/preferred/MIT >> _SCC: http://www.simple-cc.org/ >> _Open Profile for DICE: https://pigweed.googlesource.com/open-dice/ >> _Apache License 2.0: https://www.apache.org/licenses/LICENSE-2.0.txt >> >> >> >> But the recipe[1][2] only lists this: >> >> LICENSE = "BSD-3-Clause & MIT" >> >> Does that mean the base recipe is also "not compliant" and should be >> updated? >> >> [1] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc >> [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bb >> >> >>> >>>> In this case the changes were not too bad, but apparently the >>>> list of licenses >>>> did change - see this discussion: >>>> >>>> https://lists.yoctoproject.org/g/meta-arm/topic/106488067#msg6004 > > Have you looked at our upstream meta-arm discussion I linked here? > Nope. I had not seen that. In the future if this occurs again, I will be sure to update all of the various license variables and note what the change was in the commit message. > >>>>> Commit: >>>>> https://git.trustedfirmware.org/TF-A/trusted-firmware-a/+/f2735ebccf5173f74c0458736ec526276106097e >>>>> >>>>> Tag: >>>>> https://git.trustedfirmware.org/TF-A/trusted-firmware-a/+/refs/tags/v2.11 >>>>> >>>>> Signed-off-by: Kamlesh Gurudasani <kamlesh@ti.com> >>>>> Tested-by: Manorit Chawdhry <m-chawdhry@ti.com> >>>>> Signed-off-by: Ryan Eatmon <reatmon@ti.com> >>>>> --- >>>>> .../recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc | 5 +++-- >>>>> 1 file changed, 3 insertions(+), 2 deletions(-) >>>>> >>>>> diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc >>>>> index 291259c0..157bdbc5 100644 >>>>> --- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc >>>>> +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc >>>>> @@ -1,5 +1,6 @@ >>>>> -PV:k3 = "2.10+git" >>>>> -SRCREV_tfa:k3 = "00f1ec6b8740ccd403e641131e294aabacf2a48b" >>>>> +PV:k3 = "2.11+git" >>>>> +SRCREV_tfa:k3 = "f2735ebccf5173f74c0458736ec526276106097e" >>>>> +LIC_FILES_CHKSUM:k3 = >>>>> "file://docs/license.rst;md5=b5fbfdeb6855162dded31fadcd5d4dc5" >>>>> SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" >>>>> COMPATIBLE_MACHINE:k3 = "k3" >>>>> TFA_BUILD_TARGET:k3 = "all" >>>>> -- >>>>> 2.17.1
diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc index 291259c0..157bdbc5 100644 --- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc @@ -1,5 +1,6 @@ -PV:k3 = "2.10+git" -SRCREV_tfa:k3 = "00f1ec6b8740ccd403e641131e294aabacf2a48b" +PV:k3 = "2.11+git" +SRCREV_tfa:k3 = "f2735ebccf5173f74c0458736ec526276106097e" +LIC_FILES_CHKSUM:k3 = "file://docs/license.rst;md5=b5fbfdeb6855162dded31fadcd5d4dc5" SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" COMPATIBLE_MACHINE:k3 = "k3" TFA_BUILD_TARGET:k3 = "all"