From e487d02a8ed99eb83a7be8e500350dbb35f59e1e Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 18 Jul 2012 15:39:11 +0200 Subject: [PATCH] add support for building in schroot --- auto_debuild.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/auto_debuild.py b/auto_debuild.py index aa0b28f..08a9a79 100755 --- a/auto_debuild.py +++ b/auto_debuild.py @@ -42,8 +42,14 @@ def automakeRules(config): return r # utility functions -def getArchitecture(): - p = subprocess.Popen(['dpkg-architecture', '-qDEB_BUILD_ARCH'], stdout=subprocess.PIPE) +def commandInBuildEnv(config, command): + schroot = config.get('schroot') + if schroot is not None: command = ['schroot', '-c', schroot, '--'] + command + return command + +def getArchitecture(config): + cmd = commandInBuildEnv(config, ['dpkg-architecture', '-qDEB_BUILD_ARCH']) + p = subprocess.Popen(cmd, stdout=subprocess.PIPE) res = p.communicate()[0] # get only stdout if p.returncode != 0: raise Exception("Querying dpkg for the architecture failed") return res[0:len(res)-1] # chop of the \n at the end @@ -63,7 +69,7 @@ def createDebianFiles(config): dbgPackage = config.get('dbgPackage', False) packageArchitecture = config.get('architecture', 'any') # we return the list of files generated - arch = getArchitecture() + arch = getArchitecture(config) files = [] # source format file if not os.path.exists('debian/source'): os.mkdir('debian/source') @@ -133,26 +139,24 @@ def createDebianFiles(config): # return list of files affected return files -def buildDebianPackage(): - subprocess.check_call(['dpkg-checkbuilddeps']) - subprocess.check_call(['debian/rules', 'clean']) - subprocess.check_call(['debian/rules', 'build']) - subprocess.check_call(['fakeroot', 'debian/rules', 'binary']) - subprocess.check_call(['debian/rules', 'clean']) +def buildDebianPackage(config): + commands = ['dpkg-checkbuilddeps', 'debian/rules clean', 'debian/rules build', 'fakeroot debian/rules binary', 'debian/rules clean'] + command = ['bash', '-c', ' && '.join(commands)] + subprocess.check_call(commandInBuildEnv(config, command)) # if we are called directly as script if __name__ == "__main__": # generate debian files import imp - config = imp.load_source('config', 'debian/auto-debuild.conf') + config = imp.load_source('config', 'debian/auto-debuild.conf').__dict__ os.remove('debian/auto-debuild.confc') - files = createDebianFiles(config.__dict__) + files = createDebianFiles(config) # check if a file is overwritten for file in files: if os.path.exists(file): if raw_input("Do you want to overwrite %s (y/N)? " % file).lower() != "y": sys.exit(1) # run compilation - buildDebianPackage() + buildDebianPackage(config) # install files subprocess.check_call(['sudo', 'dpkg', '--install'] + files) -- 2.30.2