mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-05 20:27:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

archiver: stamp-base is dead, remove it

Browse Source 
stamp-base was only ever used by the shared workdir code in gcc. This
turned out to be problematic and has been replaced by other approaches
which don't need specialist bitbake knowledge.

stamp-base will likely get removed from bitbake but for now, remove it
from archiver to simplfy the code since gcc no longer uses it.

This stops people getting confused by the obsolete code paths which I'm
getting a lot of questions about.

(From OE-Core rev: 4b9f70f03cbefe9db758500e3ad89f7a8ff8226e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2015-09-23 22:36:07 +01:00
parent ce7bc121c5
commit 99fc78653a
1 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
meta/classes/archiver.bbclass
View File

@@ -99,27 +99,6 @@ python () {
d.appendVarFlag('do_package_write_rpm', 'depends', ' %s:do_ar_patched' % pn)
elif ar_src == "configured":
d.appendVarFlag('do_package_write_rpm', 'depends', ' %s:do_ar_configured' % pn)
# The gcc staff uses shared source
flag = d.getVarFlag("do_unpack", "stamp-base", True)
if flag:
if ar_src in [ 'original', 'patched' ]:
ar_outdir = os.path.join(d.getVar('ARCHIVER_TOPDIR', True), 'work-shared')
d.setVar('ARCHIVER_OUTDIR', ar_outdir)
d.setVarFlag('do_ar_original', 'stamp-base', flag)
d.setVarFlag('do_ar_patched', 'stamp-base', flag)
d.setVarFlag('do_unpack_and_patch', 'stamp-base', flag)
d.setVarFlag('do_ar_original', 'vardepsexclude', 'PN PF ARCHIVER_OUTDIR WORKDIR')
d.setVarFlag('do_unpack_and_patch', 'vardepsexclude', 'PN PF ARCHIVER_OUTDIR WORKDIR')
d.setVarFlag('do_ar_patched', 'vardepsexclude', 'PN PF ARCHIVER_OUTDIR WORKDIR')
d.setVarFlag('create_diff_gz', 'vardepsexclude', 'PF')
d.setVarFlag('create_tarball', 'vardepsexclude', 'PF')
flag_clean = d.getVarFlag('do_unpack', 'stamp-base-clean', True)
if flag_clean:
d.setVarFlag('do_ar_original', 'stamp-base-clean', flag_clean)
d.setVarFlag('do_ar_patched', 'stamp-base-clean', flag_clean)
d.setVarFlag('do_unpack_and_patch', 'stamp-base-clean', flag_clean)
}
# Take all the sources for a recipe and puts them in WORKDIR/archiver-work/.
@@ -179,12 +158,7 @@ python do_ar_patched() {
ar_outdir = d.getVar('ARCHIVER_OUTDIR', True)
bb.note('Archiving the patched source...')
d.setVar('WORKDIR', d.getVar('ARCHIVER_WORKDIR', True))
# The gcc staff uses shared source
flag = d.getVarFlag('do_unpack', 'stamp-base', True)
if flag:
create_tarball(d, d.getVar('S', True), 'patched', ar_outdir, 'gcc')
else:
create_tarball(d, d.getVar('S', True), 'patched', ar_outdir)
create_tarball(d, d.getVar('S', True), 'patched', ar_outdir)
}
python do_ar_configured() {
@@ -222,17 +196,14 @@ python do_ar_configured() {
create_tarball(d, srcdir, 'configured', ar_outdir)
}
def create_tarball(d, srcdir, suffix, ar_outdir, pf=None):
def create_tarball(d, srcdir, suffix, ar_outdir):
"""
create the tarball from srcdir
"""
import tarfile
bb.utils.mkdirhier(ar_outdir)
if pf:
tarname = os.path.join(ar_outdir, '%s-%s.tar.gz' % (pf, suffix))
else:
tarname = os.path.join(ar_outdir, '%s-%s.tar.gz' % \
tarname = os.path.join(ar_outdir, '%s-%s.tar.gz' % \
(d.getVar('PF', True), suffix))
srcdir = srcdir.rstrip('/')