| Message ID | 20220930232826.82753-5-kieran.bingham@ideasonboard.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series |
|
| Related | show |
Hi Kieran, Thank you for the patch. On Sat, Oct 01, 2022 at 12:28:25AM +0100, Kieran Bingham via libcamera-devel wrote: > Add the SPDX header, and a reference to the upstream source for > this helper script. > > Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > --- > This is kept separate to highlight this is a modification from the original. > > utils/semver | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/utils/semver b/utils/semver > index 5b25f40ba48c..e9d092d94446 100755 > --- a/utils/semver > +++ b/utils/semver > @@ -1,5 +1,8 @@ > #!/usr/bin/env bash > > +# SPDX-License-Identifier: Apache-2.0 Could you submit this change upstream ? > +# https://github.com/fsaintjacques/semver-tool This part will likely not be accepted upstream, and I think we could leave it out from here, as it's available from the git log. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Out of curiosity (you know me), I've looked at the Apache 2.0 license. It states the following: 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and (b) You must cause any modified files to carry prominent notices stating that You changed the files; and (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. 4. (a) should be fine, there's a copy of the license in the LICENSE directory, and the SPDX tag specifying the license. 4. (c) should be fine too, as interestingly enough, there's no copyright or attribution notice anywhere in the upstream repository. Otherwise it may be a pain, if such notices were present in a COPYRIGHT file in the root directory of the project for instance, copying just the semver script would cause an annoying problem. 4. (d) is fine too, there's no NOTICE file. This leaves 4. (b), which seems to require a prominent notice that we have added an SPDX tag. The world sounds crazy sometimes. > + > set -o errexit -o nounset -o pipefail > > NAT='0|[1-9][0-9]*'
Hi Kieran On Sat, Oct 01, 2022 at 12:28:25AM +0100, Kieran Bingham via libcamera-devel wrote: > Add the SPDX header, and a reference to the upstream source for > this helper script. > > Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Thanks j > --- > This is kept separate to highlight this is a modification from the original. > > utils/semver | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/utils/semver b/utils/semver > index 5b25f40ba48c..e9d092d94446 100755 > --- a/utils/semver > +++ b/utils/semver > @@ -1,5 +1,8 @@ > #!/usr/bin/env bash > > +# SPDX-License-Identifier: Apache-2.0 > +# https://github.com/fsaintjacques/semver-tool > + > set -o errexit -o nounset -o pipefail > > NAT='0|[1-9][0-9]*' > -- > 2.34.1 >
Quoting Laurent Pinchart (2022-10-01 00:57:39) > Hi Kieran, > > Thank you for the patch. > > On Sat, Oct 01, 2022 at 12:28:25AM +0100, Kieran Bingham via libcamera-devel wrote: > > Add the SPDX header, and a reference to the upstream source for > > this helper script. > > > > Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > > --- > > This is kept separate to highlight this is a modification from the original. > > > > utils/semver | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/utils/semver b/utils/semver > > index 5b25f40ba48c..e9d092d94446 100755 > > --- a/utils/semver > > +++ b/utils/semver > > @@ -1,5 +1,8 @@ > > #!/usr/bin/env bash > > Blank line removed to match upstream proposal too. > > +# SPDX-License-Identifier: Apache-2.0 > > Could you submit this change upstream ? > Submitted. https://github.com/fsaintjacques/semver-tool/pull/73 > > +# https://github.com/fsaintjacques/semver-tool > Removed. > This part will likely not be accepted upstream, and I think we could > leave it out from here, as it's available from the git log. > > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > Out of curiosity (you know me), I've looked at the Apache 2.0 license. > It states the following: > > 4. Redistribution. You may reproduce and distribute copies of the > Work or Derivative Works thereof in any medium, with or without > modifications, and in Source or Object form, provided that You > meet the following conditions: > > (a) You must give any other recipients of the Work or > Derivative Works a copy of this License; and > > (b) You must cause any modified files to carry prominent notices > stating that You changed the files; and > > (c) You must retain, in the Source form of any Derivative Works > that You distribute, all copyright, patent, trademark, and > attribution notices from the Source form of the Work, > excluding those notices that do not pertain to any part of > the Derivative Works; and > > (d) If the Work includes a "NOTICE" text file as part of its > distribution, then any Derivative Works that You distribute must > include a readable copy of the attribution notices contained > within such NOTICE file, excluding those notices that do not > pertain to any part of the Derivative Works, in at least one > of the following places: within a NOTICE text file distributed > as part of the Derivative Works; within the Source form or > documentation, if provided along with the Derivative Works; or, > within a display generated by the Derivative Works, if and > wherever such third-party notices normally appear. The contents > of the NOTICE file are for informational purposes only and > do not modify the License. You may add Your own attribution > notices within Derivative Works that You distribute, alongside > or as an addendum to the NOTICE text from the Work, provided > that such additional attribution notices cannot be construed > as modifying the License. > > You may add Your own copyright statement to Your modifications and > may provide additional or different license terms and conditions > for use, reproduction, or distribution of Your modifications, or > for any such Derivative Works as a whole, provided Your use, > reproduction, and distribution of the Work otherwise complies with > the conditions stated in this License. > > 4. (a) should be fine, there's a copy of the license in the LICENSE directory, > and the SPDX tag specifying the license. 4. (c) should be fine too, as > interestingly enough, there's no copyright or attribution notice > anywhere in the upstream repository. Otherwise it may be a pain, if such > notices were present in a COPYRIGHT file in the root directory of the > project for instance, copying just the semver script would cause an > annoying problem. 4. (d) is fine too, there's no NOTICE file. > > This leaves 4. (b), which seems to require a prominent notice that we > have added an SPDX tag. The world sounds crazy sometimes. > > > + > > set -o errexit -o nounset -o pipefail > > > > NAT='0|[1-9][0-9]*' > > -- > Regards, > > Laurent Pinchart
diff --git a/utils/semver b/utils/semver index 5b25f40ba48c..e9d092d94446 100755 --- a/utils/semver +++ b/utils/semver @@ -1,5 +1,8 @@ #!/usr/bin/env bash +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/fsaintjacques/semver-tool + set -o errexit -o nounset -o pipefail NAT='0|[1-9][0-9]*'
Add the SPDX header, and a reference to the upstream source for this helper script. Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> --- This is kept separate to highlight this is a modification from the original. utils/semver | 3 +++ 1 file changed, 3 insertions(+)