X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=phase2%2Fmaster.cfg;h=c2c9d9e29f200854e60e0c5d1070e16886084b1b;hb=f0cf3f27e24b54fe96eccbdda95f680ee21210ed;hp=4154c1d08b61d35acc9076fa99eb2d8c73e15a0c;hpb=c89bca2e79c62a8996be44427a31f9081aeb4c4e;p=buildbot.git

diff --git a/phase2/master.cfg b/phase2/master.cfg
index 4154c1d..c2c9d9e 100644
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -61,6 +61,20 @@ if ini.has_option("rsync", "source_url"):
 	rsync_src_url = ini.get("rsync", "source_url")
 	rsync_src_key = ini.get("rsync", "source_password")
 
+gpg_keyid = None
+gpg_comment = "Unattended build signature"
+gpg_passfile = "/dev/null"
+
+if ini.has_option("gpg", "keyid"):
+	gpg_keyid = ini.get("gpg", "keyid")
+
+if ini.has_option("gpg", "comment"):
+	gpg_comment = ini.get("gpg", "comment")
+
+if ini.has_option("gpg", "passfile"):
+	gpg_passfile = ini.get("gpg", "passfile")
+
+
 # find arches
 arches = [ ]
 archnames = [ ]
@@ -120,7 +134,9 @@ from buildbot.process.factory import BuildFactory
 from buildbot.steps.source import Git
 from buildbot.steps.shell import ShellCommand
 from buildbot.steps.shell import SetProperty
+from buildbot.steps.transfer import FileUpload
 from buildbot.steps.transfer import FileDownload
+from buildbot.steps.master import MasterShellCommand
 from buildbot.process.properties import WithProperties
 
 c['builders'] = []
@@ -211,6 +227,49 @@ for arch in arches:
 		workdir = "build/sdk",
 		command = ["make", WithProperties("-j%(nproc:~4)s"), "V=s", "IGNORE_ERRORS=n m y", "BUILD_LOG=1", "CONFIG_SIGNED_PACKAGES=y"]))
 
+	if gpg_keyid is not None:
+		factory.addStep(MasterShellCommand(
+			name = "signprepare",
+			description = "Preparing temporary signing directory",
+			command = ["mkdir", "-p", "%s/signing" %(home_dir)],
+			haltOnFailure = True
+		))
+
+		factory.addStep(ShellCommand(
+			name = "signpack",
+			description = "Packing files to sign",
+			workdir = "build/sdk",
+			command = "find bin/packages/%s/ -mindepth 2 -maxdepth 2 -type f -name Packages -print0 | xargs -0 tar -czf sign.tar.gz" %(arch[0]),
+			haltOnFailure = True
+		))
+
+		factory.addStep(FileUpload(
+			slavesrc = "sdk/sign.tar.gz",
+			masterdest = "%s/signing/%s.tar.gz" %(home_dir, arch[0]),
+			haltOnFailure = True
+		))
+
+		factory.addStep(MasterShellCommand(
+			name = "signfiles",
+			description = "Signing files",
+			command = ["%s/signall.sh" %(home_dir), "%s/signing/%s.tar.gz" %(home_dir, arch[0]), gpg_keyid, gpg_passfile, gpg_comment],
+			haltOnFailure = True
+		))
+
+		factory.addStep(FileDownload(
+			mastersrc = "%s/signing/%s.tar.gz" %(home_dir, arch[0]),
+			slavedest = "sdk/sign.tar.gz",
+			haltOnFailure = True
+		))
+
+		factory.addStep(ShellCommand(
+			name = "signunpack",
+			description = "Unpacking signed files",
+			workdir = "build/sdk",
+			command = ["tar", "-xzf", "sign.tar.gz"],
+			haltOnFailure = True
+		))
+
 	factory.addStep(ShellCommand(
 		name = "uploadprepare",
 		description = "Preparing package directory",