[PATCH] python3-scons: Fix license file collision

[PATCH] python3-scons: Fix license file collision

[Richard Purdie]

Downloading a file called "LICENSE" into DL_DIR is 'problematic' and collides with the
file from other versions of the recipe at best.

Rename it to something more specific to avoid collision problems.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-devtools/python/python3-scons_3.1.2.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/python/python3-scons_3.1.2.bb b/meta/recipes-devtools/python/python3-scons_3.1.2.bb
index aa7a2a8300d..ce117a92d4f 100644
--- a/meta/recipes-devtools/python/python3-scons_3.1.2.bb
+++ b/meta/recipes-devtools/python/python3-scons_3.1.2.bb
@@ -1,10 +1,10 @@
 SUMMARY = "Software Construction tool (make/autotools replacement)"
 SECTION = "devel/python"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=e14e1b33428df24a40a782ae142785d0"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-python3-scons-${PV};md5=e14e1b33428df24a40a782ae142785d0"
 
 # pypi package does not have a valid license file
-SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;name=license"
+SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;downloadfilename=LICENSE-python3-scons-${PV};name=license"
 
 SRC_URI[md5sum] = "f9c4ad06dcf1427be95472eaf380c81a"
 SRC_URI[sha256sum] = "8aaa483c303efeb678e6f7c776c8444a482f8ddc3ad891f8b6cdd35264da9a1f"
-- 
2.25.0

Re: [PATCH] python3-scons: Fix license file collision

[Tim Orling]

[-- Attachment #1: Type: text/plain, Size: 1900 bytes --]

Thank you. It bothered me but I didn’t think if this rather simple solution.

On Sat, Feb 29, 2020 at 8:16 AM Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> Downloading a file called "LICENSE" into DL_DIR is 'problematic' and
> collides with the
> file from other versions of the recipe at best.
>
> Rename it to something more specific to avoid collision problems.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/recipes-devtools/python/python3-scons_3.1.2.bb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/python/python3-scons_3.1.2.bb
> b/meta/recipes-devtools/python/python3-scons_3.1.2.bb
> index aa7a2a8300d..ce117a92d4f 100644
> --- a/meta/recipes-devtools/python/python3-scons_3.1.2.bb
> +++ b/meta/recipes-devtools/python/python3-scons_3.1.2.bb
> @@ -1,10 +1,10 @@
>  SUMMARY = "Software Construction tool (make/autotools replacement)"
>  SECTION = "devel/python"
>  LICENSE = "MIT"
> -LIC_FILES_CHKSUM =
> "file://${WORKDIR}/LICENSE;md5=e14e1b33428df24a40a782ae142785d0"
> +LIC_FILES_CHKSUM =
> "file://${WORKDIR}/LICENSE-python3-scons-${PV};md5=e14e1b33428df24a40a782ae142785d0"
>
>  # pypi package does not have a valid license file
> -SRC_URI += "
> https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;name=license"
> +SRC_URI += "
> https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;downloadfilename=LICENSE-python3-scons-${PV};name=license
> "
>
>  SRC_URI[md5sum] = "f9c4ad06dcf1427be95472eaf380c81a"
>  SRC_URI[sha256sum] =
> "8aaa483c303efeb678e6f7c776c8444a482f8ddc3ad891f8b6cdd35264da9a1f"
> --
> 2.25.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 3306 bytes --]

Re: [PATCH] python3-scons: Fix license file collision

[Peter Kjellerstedt]

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org <openembedded-core-bounces@lists.openembedded.org> On Behalf Of Richard Purdie
> Sent: den 29 februari 2020 17:16
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH] python3-scons: Fix license file collision
> 
> Downloading a file called "LICENSE" into DL_DIR is 'problematic' and collides with the
> file from other versions of the recipe at best.
> 
> Rename it to something more specific to avoid collision problems.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/recipes-devtools/python/python3-scons_3.1.2.bb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-devtools/python/python3-scons_3.1.2.bb b/meta/recipes-devtools/python/python3-scons_3.1.2.bb
> index aa7a2a8300d..ce117a92d4f 100644
> --- a/meta/recipes-devtools/python/python3-scons_3.1.2.bb
> +++ b/meta/recipes-devtools/python/python3-scons_3.1.2.bb
> @@ -1,10 +1,10 @@
>  SUMMARY = "Software Construction tool (make/autotools replacement)"
>  SECTION = "devel/python"
>  LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=e14e1b33428df24a40a782ae142785d0"
> +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-python3-scons-${PV};md5=e14e1b33428df24a40a782ae142785d0"
> 
>  # pypi package does not have a valid license file
> -SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;name=license"
> +SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;downloadfilename=LICENSE-python3-scons-${PV};name=license"

Any reason to not use "${BP}" instead of "python3-scons-${PV}" above?
Or should I send a cleanup patch?

> 
>  SRC_URI[md5sum] = "f9c4ad06dcf1427be95472eaf380c81a"
>  SRC_URI[sha256sum] = "8aaa483c303efeb678e6f7c776c8444a482f8ddc3ad891f8b6cdd35264da9a1f"
> --
> 2.25.0

//Peter

Re: [PATCH] python3-scons: Fix license file collision

[Richard Purdie]

On Tue, 2020-03-03 at 11:21 +0000, Peter Kjellerstedt wrote:
> >  SUMMARY = "Software Construction tool (make/autotools replacement)"
> >  SECTION = "devel/python"
> >  LICENSE = "MIT"
> > -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=e14e1b33428df24a40a782ae142785d0"
> > +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-python3-scons-${PV};md5=e14e1b33428df24a40a782ae142785d0"
> > 
> >  # pypi package does not have a valid license file
> > -SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;name=license"
> > +SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;downloadfilename=LICENSE-python3-scons-${PV};name=license"
> 
> Any reason to not use "${BP}" instead of "python3-scons-${PV}" above?
> Or should I send a cleanup patch?

No reason. I tend to find BP a little harder to read I guess but its
just a personal preference.

Cheers,

Richard