mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
recipes: Start WORKDIR -> UNPACKDIR transition
Replace references of WORKDIR with UNPACKDIR where it makes sense to do so in preparation for changing the default value of UNPACKDIR. (From OE-Core rev: 1f18b9a512800860d5153d89eb82b56388efad6f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -956,9 +956,9 @@ class DevtoolModifyTests(DevtoolBase):
|
||||
# others git:// in SRC_URI
|
||||
# cointains a patch
|
||||
testrecipe = 'hello-rs'
|
||||
bb_vars = get_bb_vars(['SRC_URI', 'FILE', 'WORKDIR', 'CARGO_HOME'], testrecipe)
|
||||
bb_vars = get_bb_vars(['SRC_URI', 'FILE', 'UNPACKDIR', 'CARGO_HOME'], testrecipe)
|
||||
recipefile = bb_vars['FILE']
|
||||
workdir = bb_vars['WORKDIR']
|
||||
unpackdir = bb_vars['UNPACKDIR']
|
||||
cargo_home = bb_vars['CARGO_HOME']
|
||||
src_uri = bb_vars['SRC_URI'].split()
|
||||
self.assertTrue(src_uri[0].startswith('git://'),
|
||||
@@ -1029,7 +1029,7 @@ class DevtoolModifyTests(DevtoolBase):
|
||||
self.assertEqual(parms['type'], 'git-dependency', 'git dependencies uri should have "type=git-dependency"')
|
||||
raw_url = raw_url.replace("git://", '%s://' % parms['protocol'])
|
||||
patch_line = '[patch."%s"]' % raw_url
|
||||
path_patched = os.path.join(workdir, parms['destsuffix'])
|
||||
path_patched = os.path.join(unpackdir, parms['destsuffix'])
|
||||
path_override_line = '%s = { path = "%s" }' % (parms['name'], path_patched)
|
||||
# Would have been better to use tomllib to read this file :/
|
||||
self.assertIn(patch_line, cargo_config_contents)
|
||||
|
||||
Reference in New Issue
Block a user