diff options
| -rw-r--r-- | meta-signing-key/classes/user-key-store.bbclass | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/meta-signing-key/classes/user-key-store.bbclass b/meta-signing-key/classes/user-key-store.bbclass index 313f340..55876d0 100644 --- a/meta-signing-key/classes/user-key-store.bbclass +++ b/meta-signing-key/classes/user-key-store.bbclass | |||
| @@ -482,13 +482,16 @@ def check_gpg_key(basekeyname, keydirfunc, d): | |||
| 482 | f.write('auto-expand-secmem\n') | 482 | f.write('auto-expand-secmem\n') |
| 483 | f.close() | 483 | f.close() |
| 484 | 484 | ||
| 485 | if len(gpg_path) > 80: | ||
| 485 | bn = d.getVar('BUILDNAME', True) | 486 | bn = d.getVar('BUILDNAME', True) |
| 486 | socklist = ["yocto-native", "browser", "ssh", "extra"] | 487 | suffixlist = ["yocto-native", "browser", "ssh", "extra"] |
| 487 | for sock in socklist: | 488 | for suffix in suffixlist: |
| 488 | f = open(os.path.join(gpg_path, 'S.gpg-agent.' + sock), 'w') | 489 | socket = os.path.join(gpg_path, 'S.gpg-agent.' + suffix) |
| 489 | f.write('%Assuan%\n') | 490 | if not os.path.exists(socket): |
| 490 | f.write('socket=/tmp/S.gpg-agent.%s-%s\n' % (sock, bn)) | 491 | f = open(socket, 'w') |
| 491 | f.close() | 492 | f.write('%Assuan%\n') |
| 493 | f.write('socket=/tmp/S.gpg-agent.%s-%s\n' % (suffix, bn)) | ||
| 494 | f.close() | ||
| 492 | 495 | ||
| 493 | gpg_bin = d.getVar('GPG_BIN', True) or \ | 496 | gpg_bin = d.getVar('GPG_BIN', True) or \ |
| 494 | bb.utils.which(os.getenv('PATH'), 'gpg') | 497 | bb.utils.which(os.getenv('PATH'), 'gpg') |