subject:"\[OE\-core\] \[PATCHv2 7\/9\] recipetool\: create\: Only include the expected SRC

Re: [OE-core] [PATCHv2 7/9] recipetool: create: Only include the expected SRC_URI checksums

2023-12-07 Thread Alexandre Belloni via lists.openembedded.org

Hello,

This one doesn't apply and I've skippedit, can you rebase?
I've applied all the other ones

On 06/12/2023 21:55:29+0100, Peter Kjellerstedt wrote:
> Rather than including all SRC_URI checksums, include the ones that are
> expected. These are the same as are output if no checksums are included
> when building the recipe.
> 
> Signed-off-by: Peter Kjellerstedt 
> ---
>  meta/lib/oeqa/selftest/cases/recipetool.py | 19 ---
>  scripts/lib/recipetool/create.py   |  4 +++-
>  2 files changed, 3 insertions(+), 20 deletions(-)
> 
> diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py 
> b/meta/lib/oeqa/selftest/cases/recipetool.py
> index 3a05343210..910bf0b4f6 100644
> --- a/meta/lib/oeqa/selftest/cases/recipetool.py
> +++ b/meta/lib/oeqa/selftest/cases/recipetool.py
> @@ -349,7 +349,6 @@ class RecipetoolCreateTests(RecipetoolBase):
>  checkvars['LICENSE'] = 'GPL-2.0-only'
>  checkvars['LIC_FILES_CHKSUM'] = 
> 'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263'
>  checkvars['SRC_URI'] = 
> 'https://github.com/logrotate/logrotate/releases/download/${PV}/logrotate-${PV}.tar.xz'
> -checkvars['SRC_URI[md5sum]'] = 'a560c57fac87c45b2fc17406cdf79288'
>  checkvars['SRC_URI[sha256sum]'] = 
> '2e6a401cac9024db2288297e3be1a8ab60e7401ba8e91225218aaf4a27e82a07'
>  self._test_recipe_contents(recipefile, checkvars, [])
>  
> @@ -407,7 +406,6 @@ class RecipetoolCreateTests(RecipetoolBase):
>  checkvars = {}
>  checkvars['LICENSE'] = set(['LGPL-2.1-only', 'MPL-1.1-only'])
>  checkvars['SRC_URI'] = 
> 'http://taglib.github.io/releases/taglib-${PV}.tar.gz'
> -checkvars['SRC_URI[md5sum]'] = 'cee7be0ccfc892fa433d6c837df9522a'
>  checkvars['SRC_URI[sha256sum]'] = 
> 'b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b'
>  checkvars['DEPENDS'] = set(['boost', 'zlib'])
>  inherits = ['cmake']
> @@ -470,7 +468,6 @@ class RecipetoolCreateTests(RecipetoolBase):
>  checkvars['LICENSE'] = set(['MIT'])
>  checkvars['LIC_FILES_CHKSUM'] = 
> 'file://LICENSE;md5=16a934f165e8c3245f241e77d401bb88'
>  checkvars['SRC_URI'] = 
> 'https://files.pythonhosted.org/packages/84/30/80932401906eaf787f2e9bd86dc458f1d2e75b064b4c187341f29516945c/python-magic-${PV}.tar.gz'
> -checkvars['SRC_URI[md5sum]'] = 'e384c95a47218f66c6501cd6dd45ff59'
>  checkvars['SRC_URI[sha256sum]'] = 
> 'f3765c0f582d2dfc72c15f3b5a82aecfae9498bd29ca840d72f37d7bd38bfcd5'
>  inherits = ['setuptools3']
>  self._test_recipe_contents(recipefile, checkvars, inherits)
> @@ -500,11 +497,7 @@ class RecipetoolCreateTests(RecipetoolBase):
>  checkvars['LICENSE'] = set(['BSD-3-Clause'])
>  checkvars['LIC_FILES_CHKSUM'] = 
> 'file://LICENSE;md5=702b1ef12cf66832a88f24c8f2ee9c19'
>  checkvars['SRC_URI'] = 
> 'https://files.pythonhosted.org/packages/a1/fb/f95560c6a5d4469d9c49e24cf1b5d4d21ffab5608251c6020a965fb7791c/webcolors-${PV}.tar.gz'
> -checkvars['SRC_URI[md5sum]'] = 'c9be30c5b0cf1cad32e4cbacbb2229e9'
> -checkvars['SRC_URI[sha1sum]'] = 
> 'c90b84fb65eed9b4c9dea7f08c657bfac0e820a5'
>  checkvars['SRC_URI[sha256sum]'] = 
> 'c225b674c83fa923be93d235330ce0300373d02885cef23238813b0d5668304a'
> -checkvars['SRC_URI[sha384sum]'] = 
> '45652af349660f19f68d01361dd5bda287789e5ea63608f52a8cea526ac04465614db2ea236103fb8456b1fcaea96ed7'
> -checkvars['SRC_URI[sha512sum]'] = 
> '074aaf135ac6b0025b88b731d1d6dfa4c539b4fff7195658cc58a4326bb9f0449a231685d312b4a1ec48ca535a838bfa5c680787fe0e61473a2a092c448937d0'
>  inherits = ['python_setuptools_build_meta']
>  
>  self._test_recipe_contents(recipefile, checkvars, inherits)
> @@ -534,11 +527,7 @@ class RecipetoolCreateTests(RecipetoolBase):
>  checkvars['LICENSE'] = set(['MIT'])
>  checkvars['LIC_FILES_CHKSUM'] = 
> 'file://LICENSE;md5=aab31f2ef7ba214a5a341eaa47a7f367'
>  checkvars['SRC_URI'] = 
> 'https://files.pythonhosted.org/packages/b9/f3/ef59cee614d5e0accf6fd0cbba025b93b272e626ca89fb70a3e9187c5d15/iso8601-${PV}.tar.gz'
> -checkvars['SRC_URI[md5sum]'] = '6e33910eba87066b3be7fcf3d59d16b5'
> -checkvars['SRC_URI[sha1sum]'] = 
> 'efd225b2c9fa7d9e4a1ec6ad94f3295cee982e61'
>  checkvars['SRC_URI[sha256sum]'] = 
> '6b1d3829ee8921c4301998c909f7829fa9ed3cbdac0d3b16af2d743aed1ba8df'
> -checkvars['SRC_URI[sha384sum]'] = 
> '255002433fe65c19adfd6b91494271b613cb25ef6a35ac77436de1e03d60cc07bf89fd716451b917f1435e4384860ef6'
> -checkvars['SRC_URI[sha512sum]'] = 
> 'db57ab2a25ef91e3bc479c8539d27e853cf1fbf60986820b8999ae15d7e566425a1e0cfba47d0f3b23aa703db0576db368e6c110ba2a2f46c9a34e8ee3611fb7'
>  inherits = ['python_poetry_core']
>  
>  self._test_recipe_contents(recipefile, checkvars, inherits)
> @@ -568,11 +557,7 @@ class RecipetoolCreateTests(RecipetoolBase):
>  checkvars['LICENSE'] = set(['PSF-2.0'])
>

[OE-core] [PATCHv2 7/9] recipetool: create: Only include the expected SRC_URI checksums

2023-12-06 Thread Peter Kjellerstedt

Rather than including all SRC_URI checksums, include the ones that are
expected. These are the same as are output if no checksums are included
when building the recipe.

Signed-off-by: Peter Kjellerstedt 
---
 meta/lib/oeqa/selftest/cases/recipetool.py | 19 ---
 scripts/lib/recipetool/create.py   |  4 +++-
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py 
b/meta/lib/oeqa/selftest/cases/recipetool.py
index 3a05343210..910bf0b4f6 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -349,7 +349,6 @@ class RecipetoolCreateTests(RecipetoolBase):
 checkvars['LICENSE'] = 'GPL-2.0-only'
 checkvars['LIC_FILES_CHKSUM'] = 
'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263'
 checkvars['SRC_URI'] = 
'https://github.com/logrotate/logrotate/releases/download/${PV}/logrotate-${PV}.tar.xz'
-checkvars['SRC_URI[md5sum]'] = 'a560c57fac87c45b2fc17406cdf79288'
 checkvars['SRC_URI[sha256sum]'] = 
'2e6a401cac9024db2288297e3be1a8ab60e7401ba8e91225218aaf4a27e82a07'
 self._test_recipe_contents(recipefile, checkvars, [])
 
@@ -407,7 +406,6 @@ class RecipetoolCreateTests(RecipetoolBase):
 checkvars = {}
 checkvars['LICENSE'] = set(['LGPL-2.1-only', 'MPL-1.1-only'])
 checkvars['SRC_URI'] = 
'http://taglib.github.io/releases/taglib-${PV}.tar.gz'
-checkvars['SRC_URI[md5sum]'] = 'cee7be0ccfc892fa433d6c837df9522a'
 checkvars['SRC_URI[sha256sum]'] = 
'b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b'
 checkvars['DEPENDS'] = set(['boost', 'zlib'])
 inherits = ['cmake']
@@ -470,7 +468,6 @@ class RecipetoolCreateTests(RecipetoolBase):
 checkvars['LICENSE'] = set(['MIT'])
 checkvars['LIC_FILES_CHKSUM'] = 
'file://LICENSE;md5=16a934f165e8c3245f241e77d401bb88'
 checkvars['SRC_URI'] = 
'https://files.pythonhosted.org/packages/84/30/80932401906eaf787f2e9bd86dc458f1d2e75b064b4c187341f29516945c/python-magic-${PV}.tar.gz'
-checkvars['SRC_URI[md5sum]'] = 'e384c95a47218f66c6501cd6dd45ff59'
 checkvars['SRC_URI[sha256sum]'] = 
'f3765c0f582d2dfc72c15f3b5a82aecfae9498bd29ca840d72f37d7bd38bfcd5'
 inherits = ['setuptools3']
 self._test_recipe_contents(recipefile, checkvars, inherits)
@@ -500,11 +497,7 @@ class RecipetoolCreateTests(RecipetoolBase):
 checkvars['LICENSE'] = set(['BSD-3-Clause'])
 checkvars['LIC_FILES_CHKSUM'] = 
'file://LICENSE;md5=702b1ef12cf66832a88f24c8f2ee9c19'
 checkvars['SRC_URI'] = 
'https://files.pythonhosted.org/packages/a1/fb/f95560c6a5d4469d9c49e24cf1b5d4d21ffab5608251c6020a965fb7791c/webcolors-${PV}.tar.gz'
-checkvars['SRC_URI[md5sum]'] = 'c9be30c5b0cf1cad32e4cbacbb2229e9'
-checkvars['SRC_URI[sha1sum]'] = 
'c90b84fb65eed9b4c9dea7f08c657bfac0e820a5'
 checkvars['SRC_URI[sha256sum]'] = 
'c225b674c83fa923be93d235330ce0300373d02885cef23238813b0d5668304a'
-checkvars['SRC_URI[sha384sum]'] = 
'45652af349660f19f68d01361dd5bda287789e5ea63608f52a8cea526ac04465614db2ea236103fb8456b1fcaea96ed7'
-checkvars['SRC_URI[sha512sum]'] = 
'074aaf135ac6b0025b88b731d1d6dfa4c539b4fff7195658cc58a4326bb9f0449a231685d312b4a1ec48ca535a838bfa5c680787fe0e61473a2a092c448937d0'
 inherits = ['python_setuptools_build_meta']
 
 self._test_recipe_contents(recipefile, checkvars, inherits)
@@ -534,11 +527,7 @@ class RecipetoolCreateTests(RecipetoolBase):
 checkvars['LICENSE'] = set(['MIT'])
 checkvars['LIC_FILES_CHKSUM'] = 
'file://LICENSE;md5=aab31f2ef7ba214a5a341eaa47a7f367'
 checkvars['SRC_URI'] = 
'https://files.pythonhosted.org/packages/b9/f3/ef59cee614d5e0accf6fd0cbba025b93b272e626ca89fb70a3e9187c5d15/iso8601-${PV}.tar.gz'
-checkvars['SRC_URI[md5sum]'] = '6e33910eba87066b3be7fcf3d59d16b5'
-checkvars['SRC_URI[sha1sum]'] = 
'efd225b2c9fa7d9e4a1ec6ad94f3295cee982e61'
 checkvars['SRC_URI[sha256sum]'] = 
'6b1d3829ee8921c4301998c909f7829fa9ed3cbdac0d3b16af2d743aed1ba8df'
-checkvars['SRC_URI[sha384sum]'] = 
'255002433fe65c19adfd6b91494271b613cb25ef6a35ac77436de1e03d60cc07bf89fd716451b917f1435e4384860ef6'
-checkvars['SRC_URI[sha512sum]'] = 
'db57ab2a25ef91e3bc479c8539d27e853cf1fbf60986820b8999ae15d7e566425a1e0cfba47d0f3b23aa703db0576db368e6c110ba2a2f46c9a34e8ee3611fb7'
 inherits = ['python_poetry_core']
 
 self._test_recipe_contents(recipefile, checkvars, inherits)
@@ -568,11 +557,7 @@ class RecipetoolCreateTests(RecipetoolBase):
 checkvars['LICENSE'] = set(['PSF-2.0'])
 checkvars['LIC_FILES_CHKSUM'] = 
'file://LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2'
 checkvars['SRC_URI'] = 
'https://files.pythonhosted.org/packages/1f/7a/8b94bb016069caa12fc9f587b28080ac33b4fbb8ca369b98bc0a4828543e/typing_extensions-${PV}.tar.gz'
-checkvars['SRC_URI[md5sum]'] =

Re: [OE-core] [PATCHv2 7/9] recipetool: create: Only include the expected SRC_URI checksums

[OE-core] [PATCHv2 7/9] recipetool: create: Only include the expected SRC_URI checksums

2 matches

Site Navigation

Mail list logo

Footer information