summaryrefslogtreecommitdiff
path: root/meta/classes/archiver.bbclass
diff options
context:
space:
mode:
authorKevin Strasser <kevin.strasser@linux.intel.com>2013-03-22 13:19:22 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-03 16:54:03 +0100
commit0c80286a3383b436a0a63a0b00eb357dd9dea4fb (patch)
tree394cb4b870afee712d6a5b0bc4ca7708762f2632 /meta/classes/archiver.bbclass
parent1416613e94af46c6e74532bca0f026d1540becbb (diff)
downloadopenembedded-core-0c80286a3383b436a0a63a0b00eb357dd9dea4fb.tar.gz
openembedded-core-0c80286a3383b436a0a63a0b00eb357dd9dea4fb.tar.bz2
openembedded-core-0c80286a3383b436a0a63a0b00eb357dd9dea4fb.zip
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] Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/archiver.bbclass')
-rw-r--r--meta/classes/archiver.bbclass4
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):