packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ostbuild: Drop use of link cache, it's gone now

This commit is contained in:
Colin Walters 2012-05-05 09:54:42 -04:00
parent e213e2b5df
commit ba1c75c61b
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ostbuild/pyostbuild/builtin_chroot_compile_one.py
View File

@ -71,9 +71,6 @@ class OstbuildChrootCompileOne(builtins.Builtin):
for ref,rev in zip(refs_to_resolve, resolved_refs): for ref,rev in zip(refs_to_resolve, resolved_refs):
ref_to_rev[ref] = rev ref_to_rev[ref] = rev
link_cache_dir = os.path.join(self.workdir, 'link-cache')
fileutil.ensure_dir(link_cache_dir)
sha = hashlib.sha256() sha = hashlib.sha256()
(fd, tmppath) = tempfile.mkstemp(suffix='.txt', prefix='ostbuild-buildroot-') (fd, tmppath) = tempfile.mkstemp(suffix='.txt', prefix='ostbuild-buildroot-')
@ -116,12 +113,9 @@ class OstbuildChrootCompileOne(builtins.Builtin):
log("composing buildroot from %d parents (last: %r)" % (len(checkout_trees), log("composing buildroot from %d parents (last: %r)" % (len(checkout_trees),
checkout_trees[-1][0])) checkout_trees[-1][0]))
link_cache_dir = os.path.join(self.workdir, 'link-cache')
fileutil.ensure_dir(link_cache_dir)
run_sync(['ostree', '--repo=' + self.repo, run_sync(['ostree', '--repo=' + self.repo,
'checkout', '--link-cache=' + link_cache_dir, 'checkout', '--user-mode', '--union',
'--user-mode', '--union', '--from-file=' + tmppath, rootdir_tmp]) '--from-file=' + tmppath, rootdir_tmp])
os.unlink(tmppath); os.unlink(tmppath);

6
src/ostbuild/pyostbuild/builtin_compose.py
View File

@ -68,12 +68,8 @@ class OstbuildCompose(builtins.Builtin):
f.write('\0') f.write('\0')
f.close() f.close()
link_cache_dir = os.path.join(self.workdir, 'link-cache')
fileutil.ensure_dir(link_cache_dir)
run_sync(['ostree', '--repo=' + self.repo, run_sync(['ostree', '--repo=' + self.repo,
'checkout', '--link-cache=' + link_cache_dir, 'checkout', '--user-mode', '--no-triggers',
'--user-mode', '--no-triggers',
'--union', '--from-stdin', compose_rootdir], '--union', '--from-stdin', compose_rootdir],
stdin=open(tmppath)) stdin=open(tmppath))
os.unlink(tmppath) os.unlink(tmppath)