diff options
| author |   Kevin Strasser <kevin.strasser@linux.intel.com> | 2013-03-22 13:19:22 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-03 17:01:13 +0100 |
| commit | 3e4655d951d38b0f216b286bb49f8a0276ba112d (patch) | |
| tree | 0074e2fd5e784093534625e80d144e4cc5c28da2 /meta/classes/archiver.bbclass | |
| parent | 805eede15761ef792b14afc4168f7d47c821dfd6 (diff) | |
| download | openembedded-core-contrib-3e4655d951d38b0f216b286bb49f8a0276ba112d.tar.gz | |
archiver: fix srpm archiving build errors
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>
Diffstat (limited to 'meta/classes/archiver.bbclass')
| -rw-r--r-- | meta/classes/archiver.bbclass | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index ed07b2edb8..6749d61678 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -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): |