summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2023-12-07 18:48:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-12-08 16:58:34 +0000
commit45d2f8d4bc2ca7c16379334a93ea172a538a6bb2 (patch)
tree0080ef1670f6b8db0000cf981abd4d705ca9ef8e
parentdecf6e66dfe3d688c93b3ff811077c46cb9883bb (diff)
downloadpoky-45d2f8d4bc2ca7c16379334a93ea172a538a6bb2.tar.gz
recipetool: create: Only include the expected SRC_URI checksums
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. (From OE-Core rev: c2af83eb5e8573480179b6c0bcce50606b547099) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/cases/recipetool.py2
-rw-r--r--scripts/lib/recipetool/create.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py
index 20dd41f492..08da029e6e 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -349,7 +349,6 @@ class RecipetoolCreateTests(RecipetoolBase):
349 checkvars['LICENSE'] = 'GPL-2.0-only' 349 checkvars['LICENSE'] = 'GPL-2.0-only'
350 checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263' 350 checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263'
351 checkvars['SRC_URI'] = 'https://github.com/logrotate/logrotate/releases/download/${PV}/logrotate-${PV}.tar.xz' 351 checkvars['SRC_URI'] = 'https://github.com/logrotate/logrotate/releases/download/${PV}/logrotate-${PV}.tar.xz'
352 checkvars['SRC_URI[md5sum]'] = 'a560c57fac87c45b2fc17406cdf79288'
353 checkvars['SRC_URI[sha256sum]'] = '2e6a401cac9024db2288297e3be1a8ab60e7401ba8e91225218aaf4a27e82a07' 352 checkvars['SRC_URI[sha256sum]'] = '2e6a401cac9024db2288297e3be1a8ab60e7401ba8e91225218aaf4a27e82a07'
354 self._test_recipe_contents(recipefile, checkvars, []) 353 self._test_recipe_contents(recipefile, checkvars, [])
355 354
@@ -407,7 +406,6 @@ class RecipetoolCreateTests(RecipetoolBase):
407 checkvars = {} 406 checkvars = {}
408 checkvars['LICENSE'] = set(['LGPL-2.1-only', 'MPL-1.1-only']) 407 checkvars['LICENSE'] = set(['LGPL-2.1-only', 'MPL-1.1-only'])
409 checkvars['SRC_URI'] = 'http://taglib.github.io/releases/taglib-${PV}.tar.gz' 408 checkvars['SRC_URI'] = 'http://taglib.github.io/releases/taglib-${PV}.tar.gz'
410 checkvars['SRC_URI[md5sum]'] = 'cee7be0ccfc892fa433d6c837df9522a'
411 checkvars['SRC_URI[sha256sum]'] = 'b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b' 409 checkvars['SRC_URI[sha256sum]'] = 'b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b'
412 checkvars['DEPENDS'] = set(['boost', 'zlib']) 410 checkvars['DEPENDS'] = set(['boost', 'zlib'])
413 inherits = ['cmake'] 411 inherits = ['cmake']
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 6e15326c55..d2997cc242 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -706,8 +706,10 @@ def create_recipe(args):
706 if not srcuri: 706 if not srcuri:
707 lines_before.append('# No information for SRC_URI yet (only an external source tree was specified)') 707 lines_before.append('# No information for SRC_URI yet (only an external source tree was specified)')
708 lines_before.append('SRC_URI = "%s"' % srcuri) 708 lines_before.append('SRC_URI = "%s"' % srcuri)
709 shown_checksums = ["%ssum" % s for s in bb.fetch2.SHOWN_CHECKSUM_LIST]
709 for key, value in sorted(checksums.items()): 710 for key, value in sorted(checksums.items()):
710 lines_before.append('SRC_URI[%s] = "%s"' % (key, value)) 711 if key in shown_checksums:
712 lines_before.append('SRC_URI[%s] = "%s"' % (key, value))
711 if srcuri and supports_srcrev(srcuri): 713 if srcuri and supports_srcrev(srcuri):
712 lines_before.append('') 714 lines_before.append('')
713 lines_before.append('# Modify these as desired') 715 lines_before.append('# Modify these as desired')