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

ostbuild: Don't run fakeroot if we are root 

For efficiency reasons, as well as a quick shortcut to avoid pulling
fakeroot into the gnomeos yocto layer.
This commit is contained in:
Colin Walters 2011-11-27 20:31:23 -05:00
parent 2f1490f766
commit 86adf002ff
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ostbuild/ostbuild-compile-one-impl
View File

@ -217,7 +217,11 @@ def make_artifact(name, from_files, fakeroot_temp=None, tempdir=None):
f.write(filename) f.write(filename)
f.write('\n') f.write('\n')
f.close() f.close()
args = ['fakeroot', '-i', fakeroot_temp, 'tar', '-c', '-z', '-C', tempdir, '-f', targz_name, '-T', filelist_temp] if fakeroot_temp:
args = ['fakeroot', '-i', fakeroot_temp]
else:
args = []
args.extend(['tar', '-c', '-z', '-C', tempdir, '-f', targz_name, '-T', filelist_temp])
run_sync(args) run_sync(args)
log("created: %s" % (os.path.abspath (targz_name), )) log("created: %s" % (os.path.abspath (targz_name), ))
@ -232,12 +236,19 @@ def phase_make_artifacts(builddir=None):
artifact_prefix='artifact-%s,%s' % (basename, version) artifact_prefix='artifact-%s,%s' % (basename, version)
(fd,fakeroot_temp)=tempfile.mkstemp(prefix='ostree-fakeroot-%s-' % (basename,)) if os.getuid() != 0:
os.close(fd) (fd,fakeroot_temp)=tempfile.mkstemp(prefix='ostree-fakeroot-%s-' % (basename,))
tempfiles.append(fakeroot_temp) os.close(fd)
tempfiles.append(fakeroot_temp)
else:
fakeroot_temp = None
tempdir = tempfile.mkdtemp(prefix='ostree-build-%s-' % (basename,)) tempdir = tempfile.mkdtemp(prefix='ostree-build-%s-' % (basename,))
tempfiles.append(tempdir) tempfiles.append(tempdir)
args = ['fakeroot', '-s', fakeroot_temp, 'make', 'install', 'DESTDIR=' + tempdir] if fakeroot_temp is not None:
args = ['fakeroot', '-s', fakeroot_temp]
else:
args = []
args.extend(['make', 'install', 'DESTDIR=' + tempdir])
run_sync(args, cwd=builddir) run_sync(args, cwd=builddir)
devel_files = set() devel_files = set()