From 41b5b5f6796276013f7487fdc0da365b7338bb2e Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 27 Jun 2017 16:59:05 -0700 Subject: [PATCH] profiles: disable smartcard in gnupg for the boards This avoids a dependency loop and pulling in libusb-compat. The option is still enabled for the SDK, where it might be useful. --- .../coreos-overlay/profiles/coreos/base/package.use.mask | 4 ++-- .../profiles/coreos/targets/sdk/package.use.mask | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask index ea7e03f881..53d3e82b68 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask @@ -1,5 +1,5 @@ -# We don't ship GnuTLS by default -app-crypt/gnupg gnutls +# We don't ship GnuTLS by default, and smartcard has a dep loop +app-crypt/gnupg gnutls smartcard # We don't need integration with cvs, perl, or subversion in git, so we can dev-vcs/git cvs perl subversion diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use.mask index ee1e75e18a..8e6ec6044f 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use.mask @@ -1,3 +1,6 @@ +# Allow smartcard support in the SDK for image signing +app-crypt/gnupg -smartcard + # hardened and sanitize are masked for arm64, cross compilers should agree cross-aarch64-cros-linux-gnu/gcc hardened sanitize cross-aarch64-cros-linux-gnu/glibc hardened