diff --git a/easybuild/framework/easyblock.py b/easybuild/framework/easyblock.py index d731c20f83..f0a6e81c50 100644 --- a/easybuild/framework/easyblock.py +++ b/easybuild/framework/easyblock.py @@ -1447,9 +1447,11 @@ def package_step(self): """Package software (e.g. into an RPM).""" rpmname = "nxprog-%s-%s" % (self.name, self.version) os.chdir("/tmp") - deplist="" - deplist+=" ".join(["--dependency " + i for i in (map(">".join, [(self.toolchain.name, self.toolchain.version)]))]) - deplist+=" ".join(["--dependency " + i for i in (map(lambda x:x["name"] + ">" + x["version"], self.cfg.dependencies()))]) + toolchaindep = "=".join([self.toolchain.name, self.toolchain.version]) + deplist = " ".join(["--dependency", toolchaindep]) + deplist += " ".join(["--dependency" + i + for i in (map(lambda x:x["name"] + "=" + x["version"], self.cfg.dependencies())) + ]) cmd = "fpm --workdir /tmp -t rpm -n %s -s dir %s %s" % (rpmname, deplist, self.installdir) (out, _) = run_cmd(cmd, log_all=True, simple=False) @@ -1811,8 +1813,6 @@ def prepare_step_spec(initial): return steps - - def run_all_steps(self, run_test_cases): """ Build and install this software.