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

archiver: fix srpm archiving build errors

Browse Source 
srpm archiving doesn't need to be handled as a different case
when deciding what archive tasks to add.

When srpm is selected as the archiving type, the scripts and logs
archive staging directory ${WORKDIR}/script-logs is cleaned, and
its contents moved out to ${WORKDIR}.

Now that we are including ${WORKDIR}/script-logs in sstate-inputdirs,
the directory must be preserved.

[YOCTO #4032]

(From OE-Core rev: 0c80286a3383b436a0a63a0b00eb357dd9dea4fb)

Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kevin Strasser
2013-03-22 13:19:22 -07:00
committed by Richard Purdie
parent 805eede157
commit 3e4655d951
4 changed files with 24 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/archiver.bbclass
-4
View File
@@ -440,10 +440,6 @@ def archive_scripts_logs(d):
tarlog = archive_logs(d, logdir, True)
if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) == 'srpm':
if os.path.exists(work_dir+ '/' + tarlog):
os.remove(work_dir+ '/' + tarlog)
shutil.move(os.path.join(logdir, '..', tarlog), work_dir)
shutil.rmtree(os.path.join(work_dir,'script-logs'))
store_package(d, tarlog)
def dumpdata(d):