From: Jo-Philipp Wich Date: Wed, 11 May 2016 11:45:27 +0000 (+0200) Subject: Fix key-build permissions X-Git-Tag: v1~273 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=85d1c7075b0206c878e0c574129e47057eefa72f;p=buildbot.git Fix key-build permissions Don't use readonly permissions for key-build and key-build.pub as subsequent runs are unable to overwrite the files then. Signed-off-by: Jo-Philipp Wich --- diff --git a/phase1/master.cfg b/phase1/master.cfg index e9e9556..c6c7d47 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -308,8 +308,8 @@ EOT''' %(ts[0], ts[0], ts[1]) )) )) # install build key - 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)) + factory.addStep(FileDownload(mastersrc=home_dir+'/key-build', slavedest="key-build", mode=0600)) + factory.addStep(FileDownload(mastersrc=home_dir+'/key-build.pub', slavedest="key-build.pub", mode=0600)) # prepare dl factory.addStep(ShellCommand( diff --git a/phase2/master.cfg b/phase2/master.cfg index 41d50c8..21862d4 100644 --- a/phase2/master.cfg +++ b/phase2/master.cfg @@ -164,8 +164,8 @@ for arch in arches: command = ["tar", "--strip-components=1", "-C", "sdk/", "-vxjf", "sdk.tar.bz2"], 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(FileDownload(mastersrc=home_dir+'/key-build', slavedest="sdk/key-build", mode=0600)) + factory.addStep(FileDownload(mastersrc=home_dir+'/key-build.pub', slavedest="sdk/key-build.pub", mode=0600)) factory.addStep(ShellCommand( name = "mkdldir",