From 86adf002ffd1ccf527a3bb82a43f0cda4548bf53 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 27 Nov 2011 20:31:23 -0500 Subject: [PATCH] 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. --- src/ostbuild/ostbuild-compile-one-impl | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/ostbuild/ostbuild-compile-one-impl b/src/ostbuild/ostbuild-compile-one-impl index f71c1e19..fce90f31 100755 --- a/src/ostbuild/ostbuild-compile-one-impl +++ b/src/ostbuild/ostbuild-compile-one-impl @@ -217,7 +217,11 @@ def make_artifact(name, from_files, fakeroot_temp=None, tempdir=None): f.write(filename) f.write('\n') 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) 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) - (fd,fakeroot_temp)=tempfile.mkstemp(prefix='ostree-fakeroot-%s-' % (basename,)) - os.close(fd) - tempfiles.append(fakeroot_temp) + if os.getuid() != 0: + (fd,fakeroot_temp)=tempfile.mkstemp(prefix='ostree-fakeroot-%s-' % (basename,)) + os.close(fd) + tempfiles.append(fakeroot_temp) + else: + fakeroot_temp = None tempdir = tempfile.mkdtemp(prefix='ostree-build-%s-' % (basename,)) 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) devel_files = set()