From 65318019cd8c6db19ae5d4526a0fa2d8c8ef25fa Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 11 Aug 2023 14:31:24 +0100 Subject: recipes/classes/scripts: Drop SRCPV usage in OE-Core Now that SRCPV isn't needed we can simplify things in a few places... (From OE-Core rev: 843f82a246a535c353e08072f252d1dc78217872) Signed-off-by: Richard Purdie --- scripts/lib/recipetool/create.py | 2 +- scripts/lib/scriptutils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/lib') diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index e99e0714bf..f9dda3c2f9 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py @@ -690,7 +690,7 @@ def create_recipe(args): srcpvprefix = 'svnr' else: srcpvprefix = scheme - lines_before.append('PV = "%s+%s${SRCPV}"' % (realpv or '1.0', srcpvprefix)) + lines_before.append('PV = "%s+%s"' % (realpv or '1.0', srcpvprefix)) pv_srcpv = True if not args.autorev and srcrev == '${AUTOREV}': if os.path.exists(os.path.join(srctree, '.git')): diff --git a/scripts/lib/scriptutils.py b/scripts/lib/scriptutils.py index f433106c9a..f23e53cba9 100644 --- a/scripts/lib/scriptutils.py +++ b/scripts/lib/scriptutils.py @@ -177,7 +177,7 @@ def fetch_url(tinfoil, srcuri, srcrev, destdir, logger, preserve_tmp=False, mirr f.write('BB_STRICT_CHECKSUM = "ignore"\n') f.write('SRC_URI = "%s"\n' % srcuri) f.write('SRCREV = "%s"\n' % srcrev) - f.write('PV = "0.0+${SRCPV}"\n') + f.write('PV = "0.0+"\n') f.write('WORKDIR = "%s"\n' % tmpworkdir) # Set S out of the way so it doesn't get created under the workdir f.write('S = "%s"\n' % os.path.join(tmpdir, 'emptysrc')) -- cgit v1.2.3-54-g00ecf