Canonicalize home_dir, download key-build.pub as well

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 165c554e3b854e19656132db4a93cbbe4ced3fad..4a990137fdd0034d07bec900683bc1a2797e6f87 100644 (file)
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -47,7 +47,7 @@ c['mergeRequests'] = True
 
 ####### CHANGESOURCES
 
-home_dir = ini.get("general", "homedir")
+home_dir = os.path.abspath(ini.get("general", "homedir"))
 
 repo_url = ini.get("repo", "url")
 
@@ -308,7 +308,8 @@ EOT''' %(ts[0], ts[0], ts[1]) ))
        ))
 
        # install build key
-       factory.addStep(FileDownload(mastersrc=home_dir+'/key-build', slavedest="key-build", mode=0600))
+       factory.addStep(FileDownload(mastersrc=home_dir+'/key-build', slavedest="key-build", mode=0400))
+       factory.addStep(FileDownload(mastersrc=home_dir+'/key-build.pub', slavedest="key-build.pub", mode=0400))
 
        # prepare dl
        factory.addStep(ShellCommand(

diff --git a/phase2/master.cfg b/phase2/master.cfg
index 246ef92e6e5a2401e1f41ce9c4e1319ebd5e8053..0ad5f361f6e0983c0ac2f8773a37ad0e48aa0e10 100644 (file)
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -47,7 +47,7 @@ c['mergeRequests'] = True
 
 ####### CHANGESOURCES
 
-home_dir = ini.get("general", "homedir")
+home_dir = os.path.abspath(ini.get("general", "homedir"))
 
 repo_url = ini.get("repo", "url")
 
@@ -165,6 +165,7 @@ for arch in arches:
                haltOnFailure = True))
 
        factory.addStep(FileDownload(mastersrc=home_dir+'/key-build', slavedest="sdk/key-build", mode=0400))
+       factory.addStep(FileDownload(mastersrc=home_dir+'/key-build.pub', slavedest="sdk/key-build.pub", mode=0400))
 
        factory.addStep(ShellCommand(
                name = "mkdldir",