summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel McGregor <daniel.mcgregor@vecima.com>2021-10-12 09:44:50 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-03 11:18:56 +0000
commitb967cce9f4bab7b3f9bd0551083bd007c4c055db (patch)
tree3cca3d7025fdfa77d2fd87e8b85ac37829dc2455
parentcf5c5636d80297ab1cf051cb1de8a4ebe8a73d54 (diff)
downloadpoky-b967cce9f4bab7b3f9bd0551083bd007c4c055db.tar.gz
bitbake.conf: Add gpg-agent as a host tool
If gpg is used, it will find the first gpg agent in the path, this may lead to issues where gpg comes from the host, and the agent comes from a gnupg-native due to package signing. The versions being out of sync causes gpg to fail. (From OE-Core rev: f9649bca64771e845a74475b621a3c91ca0a6901) Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 2b59fb9d52a405a32a1d069d4c5320b72fbd35ce) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f442a6593a..91f003d6dd 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -502,7 +502,7 @@ HOSTTOOLS += " \
502HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.utils.contains_any('IMAGE_CLASSES', 'testimage testsdk', True, False, d) or any(x in (d.getVar("BBINCLUDED") or "") for x in ["testimage.bbclass", "testsdk.bbclass"])) else ''}" 502HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.utils.contains_any('IMAGE_CLASSES', 'testimage testsdk', True, False, d) or any(x in (d.getVar("BBINCLUDED") or "") for x in ["testimage.bbclass", "testsdk.bbclass"])) else ''}"
503 503
504# Link to these if present 504# Link to these if present
505HOSTTOOLS_NONFATAL += "aws gcc-ar gpg ld.bfd ld.gold nc pigz sftp socat ssh sudo" 505HOSTTOOLS_NONFATAL += "aws gcc-ar gpg gpg-agent ld.bfd ld.gold nc pigz sftp socat ssh sudo"
506 506
507# Temporary add few more detected in bitbake world 507# Temporary add few more detected in bitbake world
508HOSTTOOLS_NONFATAL += "join nl size yes zcat" 508HOSTTOOLS_NONFATAL += "join nl size yes zcat"