mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-07 16:59:22 +00:00
Code Issues Projects Releases Wiki Activity

base.bbclass: drop compatibility moving of sources into workdir

Browse Source 
Potentially there could be a grace period for fixing recipes (with warnings, etc),
on the other hand, changes to git unpacking destination would already
break various layers, so we might as well make this a hard qa error and drop
the magic at the same time.

I commit to sending fixes for layers included in autobuilder testing
(meta-oe/arm/intel/virt/agl/aws/mingw/etc).

SOURCE_BASEDIR is at the same time adjusted to be calculated relative
to UNPACKDIR (previously it only worked if S was set to
WORKDIR/something/otherthing, and that is no longer working). It is also
no longer removed from the filesystem, as content of unpackdir is managed elsewhere.

(From OE-Core rev: 53e9ea30aaf48292307b4cff6964bead74c69fff)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2025-06-16 11:49:59 +02:00
committed by Richard Purdie
parent 4dd321f8b8
commit 0ad5fb3431
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes-global/base.bbclass
+3 -10
View File
@@ -183,23 +183,16 @@ python base_do_unpack() {
basedir = None
unpackdir = d.getVar('UNPACKDIR')
workdir = d.getVar('WORKDIR')
if sourcedir.startswith(workdir) and not sourcedir.startswith(unpackdir):
basedir = sourcedir.replace(workdir, '').strip("/").split('/')[0]
if sourcedir.startswith(unpackdir):
basedir = sourcedir.replace(unpackdir, '').strip("/").split('/')[0]
if basedir:
bb.utils.remove(workdir + '/' + basedir, True)
d.setVar("SOURCE_BASEDIR", workdir + '/' + basedir)
d.setVar("SOURCE_BASEDIR", unpackdir + '/' + basedir)
try:
fetcher = bb.fetch2.Fetch(src_uri, d)
fetcher.unpack(d.getVar('UNPACKDIR'))
except bb.fetch2.BBFetchException as e:
bb.fatal("Bitbake Fetcher Error: " + repr(e))
if basedir and os.path.exists(unpackdir + '/' + basedir):
# Compatibility magic to ensure ${WORKDIR}/git and ${WORKDIR}/${BP}
# as often used in S work as expected.
shutil.move(unpackdir + '/' + basedir, workdir + '/' + basedir)
}
SSTATETASKS += "do_deploy_source_date_epoch"