# Macro to define and start the quality agent.
# Long term goal is to improve the commited code.
-MACRO_QUALITY_AGENT = /usr/lib/pakfire/quality-agent
+MACRO_QUALITY_AGENT = BUILDROOT=%{BUILDROOT} /usr/lib/pakfire/quality-agent
# XXX to be moved to some place else
#export QUALITY_AGENT_NO_DIRECTORY_CHECK
b.build()
except Error:
raise BuildError, _("Build command has failed.")
- finally:
- b.cleanup()
+
+ # If the build was successful, cleanup all temporary files.
+ b.cleanup()
@staticmethod
def shell(pkg, **kwargs):
}
#self.settings.update(settings)
- self.buildroot = "/buildroot"
-
# Lock the buildroot
self._lock = None
self.lock()
logging.debug("Cleaning environemnt.")
# Remove the build directory and buildroot.
- dirs = ("build", self.buildroot, "result")
+ dirs = ("build", "result")
for d in dirs:
d = self.chrootPath(d)
"TERM" : os.environ.get("TERM", "dumb"),
"PS1" : "\u:\w\$ ",
- "BUILDROOT" : self.buildroot,
- "PARALLELISMFLAGS" : "-j%s" % util.calc_parallelism(),
-
# Set the container that we can detect, if we are inside a
# chroot.
"container" : "pakfire-builder",
# Open package file.
self.pkg = packages.Makefile(self.pakfire, self.filename)
- #self.buildroot = "/tmp/pakfire_buildroot/%s" % util.random_string(20)
- self.buildroot = "/buildroot"
-
self._environ = {
- "BUILDROOT" : self.buildroot,
- "LANG" : "C",
+ "LANG" : "C",
+ "PARALLELISMFLAGS" : "-j%s" % util.calc_parallelism(),
}
+ @property
+ def buildroot(self):
+ return self.pkg.buildroot
+
@property
def distro(self):
return self.pakfire.distro
self.filename = os.path.abspath(filename)
# Open and parse the makefile.
- # XXX pass environment to lexer
self.lexer = lexer.RootLexer.open(self.filename,
environ=self.pakfire.environ)
def vendor(self):
return self.lexer.get_var("DISTRO_VENDOR")
+ @property
+ def buildroot(self):
+ return self.lexer.get_var("BUILDROOT")
+
@property
def build_host(self):
return socket.gethostname()