2 files changed, 11 insertions, 5 deletions

diff --git a/meta-integrity/classes/sign_rpm_ext.bbclass b/meta-integrity/classes/sign_rpm_ext.bbclass
index 855d6b3..4da64bd 100644
--- a/meta-integrity/classes/sign_rpm_ext.bbclass
+++ b/meta-integrity/classes/sign_rpm_ext.bbclass
@@ -34,9 +34,4 @@ python () {
     if not gpg_path:
         gpg_path = d.getVar('TMPDIR', True) + '/.gnupg'
         d.setVar('GPG_PATH', gpg_path)
-
-    if len(gpg_path) > 80:
-        msg = "The default GPG_PATH {} of {} characters is too long. Due to GPG homedir path length limit, please set GPG_PATH shorter than 80 characters.".format(gpg_path, len(gpg_path))
-        raise bb.parse.SkipRecipe(msg)
-
 }
diff --git a/meta-signing-key/classes/user-key-store.bbclass b/meta-signing-key/classes/user-key-store.bbclass
index 982bd18..313f340 100644
--- a/meta-signing-key/classes/user-key-store.bbclass
+++ b/meta-signing-key/classes/user-key-store.bbclass
@@ -481,6 +481,15 @@ def check_gpg_key(basekeyname, keydirfunc, d):
         f.write('allow-loopback-pinentry\n')
         f.write('auto-expand-secmem\n')
         f.close()
+
+        bn = d.getVar('BUILDNAME', True)
+        socklist = ["yocto-native", "browser", "ssh", "extra"]
+        for sock in socklist:
+            f = open(os.path.join(gpg_path, 'S.gpg-agent.' + sock), 'w')
+            f.write('%Assuan%\n')
+            f.write('socket=/tmp/S.gpg-agent.%s-%s\n' % (sock, bn))
+            f.close()
+
     gpg_bin = d.getVar('GPG_BIN', True) or \
               bb.utils.which(os.getenv('PATH'), 'gpg')
     gpg_keyid = d.getVar(basekeyname + '_GPG_NAME', True)
@@ -500,6 +509,8 @@ def check_gpg_key(basekeyname, keydirfunc, d):
     if status:
         bb.fatal('Failed to import gpg key (%s): %s' % (gpg_key, output))
 
+check_gpg_key[vardepsexclude] = "BUILDNAME"
+
 python check_boot_public_key () {
     check_gpg_key('BOOT', uks_boot_keys_dir, d)
 }