From 56335fb3c922a112d71456c5199c7350c14fb676 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Fri, 14 Feb 2020 11:29:18 +0100 Subject: [PATCH] fixes for installing from ref repo --- cmsBuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmsBuild b/cmsBuild index 1e19bdd..ada1489 100755 --- a/cmsBuild +++ b/cmsBuild @@ -205,7 +205,7 @@ def install_reference(pkg): args = {"cmsroot": pkg.options.workDir, "refroot": pkg.options.reference, "cmsplatf": pkg.options.architecture} args['pkgdir'] = join(pkg.options.architecture, *pkg_parts) tmp_path = join(pkg.options.tempdir, "reference", pkg.pkgName()) - makedirs(tmp_path) + makedirs(join(tmp_path,"BUILDROOT")) tmp_spec = join(tmp_path, "package.spec") spec = open(tmp_spec, "w") infoReg = re.compile("^(Name|Version|Release|Group|License|Packager|Vendor|Summary)\s*:.*") @@ -219,7 +219,7 @@ def install_reference(pkg): spec.write("Prefix: %s\n" % pkg.options.installDir) spec.write(REFERENCE_PACKAGE_POST % args) spec.close() - command = "%s; rpmbuild -bb --define '_topdir %s' %s" % (rpmEnvironmentScript, tmp_path, tmp_spec) + command = "%s; rpmbuild -bb --buildroot %s/BUILDROOT --define '_topdir %s' %s" % (rpmEnvironmentScript, tmp_path, tmp_path, tmp_spec) error, output = getstatusoutput(command) if error: log("Command:\n %(command)s failed with the following message: %(output)s" % locals(), DEBUG)