X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=phase2%2Fmaster.cfg;h=eb88909e75231538911ec35864198348223c45ac;hb=33e3a260d2ae0b55632573d87d54cf18da94e03b;hp=ad84ab202fd185688a898c874fa959a31119f896;hpb=1f38155892e09505dce834178415d4bd55c853c4;p=buildbot.git

diff --git a/phase2/master.cfg b/phase2/master.cfg
index ad84ab2..eb88909 100644
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -79,10 +79,14 @@ if ini.has_option("rsync", "sdk_password"):
 if ini.has_option("rsync", "sdk_pattern"):
 	rsync_sdk_pat = ini.get("rsync", "sdk_pattern")
 
+gpg_home = "~/.gnupg"
 gpg_keyid = None
 gpg_comment = "Unattended build signature"
 gpg_passfile = "/dev/null"
 
+if ini.has_option("gpg", "home"):
+	gpg_home = ini.get("gpg", "home")
+
 if ini.has_option("gpg", "keyid"):
 	gpg_keyid = ini.get("gpg", "keyid")
 
@@ -122,7 +126,7 @@ with open(home_dir+'/source.git/feeds.conf.default', 'r') as f:
 			feeds.append(parts)
 			url = parts[2].strip().split(';')
 			branch = url[1] if len(url) > 1 else 'master'
-			c['change_source'].append(GitPoller(url[0], branch=branch, workdir='%s/%s.git' %(os.getcwd(), parts[1]), branch='master', pollinterval=300))
+			c['change_source'].append(GitPoller(url[0], branch=branch, workdir='%s/%s.git' %(os.getcwd(), parts[1]), pollinterval=300))
 
 
 ####### SCHEDULERS
@@ -274,7 +278,8 @@ for arch in arches:
 		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],
+			command = ["%s/signall.sh" %(home_dir), "%s/signing/%s.tar.gz" %(home_dir, arch[0]), gpg_keyid, gpg_comment],
+			env = {'GNUPGHOME': gpg_home, 'PASSFILE': gpg_passfile},
 			haltOnFailure = True
 		))