From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>
Subject: [PATCH 01/23] hw/usb/ccid: remove references to NSS
Date: Tue, 1 Dec 2020 17:18:03 +0000 [thread overview]
Message-ID: <20201201171825.2243775-2-berrange@redhat.com> (raw)
In-Reply-To: <20201201171825.2243775-1-berrange@redhat.com>
The NSS package was previously pre-requisite for building CCID related
features, however, this became obsolete when the libcacard library was
spun off to a separate project:
commit 7b02f5447c64d1854468f758398c9f6fe9e5721f
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Sun Aug 30 11:48:40 2015 +0200
libcacard: use the standalone project
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
.travis.yml | 14 +++++++-------
docs/ccid.txt | 15 +++++++--------
scripts/coverity-scan/coverity-scan.docker | 1 -
tests/docker/dockerfiles/centos7.docker | 1 +
tests/docker/dockerfiles/centos8.docker | 1 +
tests/docker/dockerfiles/fedora.docker | 2 +-
tests/docker/dockerfiles/ubuntu.docker | 1 -
tests/docker/dockerfiles/ubuntu1804.docker | 1 -
tests/docker/dockerfiles/ubuntu2004.docker | 1 -
9 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 1f80bdb624..567e5195ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ addons:
- libattr1-dev
- libbrlapi-dev
- libcap-ng-dev
+ - libcacard-dev
- libgcc-7-dev
- libgnutls28-dev
- libgtk-3-dev
@@ -34,7 +35,6 @@ addons:
- liblttng-ust-dev
- libncurses5-dev
- libnfs-dev
- - libnss3-dev
- libpixman-1-dev
- libpng-dev
- librados-dev
@@ -249,6 +249,7 @@ jobs:
- libaio-dev
- libattr1-dev
- libbrlapi-dev
+ - libcacard-dev
- libcap-ng-dev
- libgnutls28-dev
- libgtk-3-dev
@@ -256,7 +257,6 @@ jobs:
- liblttng-ust-dev
- libnfs-dev
- libncurses5-dev
- - libnss3-dev
- libpixman-1-dev
- libpng-dev
- librados-dev
@@ -290,6 +290,7 @@ jobs:
- libaio-dev
- libattr1-dev
- libbrlapi-dev
+ - libcacard-dev
- libcap-ng-dev
- libgcrypt20-dev
- libgnutls28-dev
@@ -298,7 +299,6 @@ jobs:
- liblttng-ust-dev
- libncurses5-dev
- libnfs-dev
- - libnss3-dev
- libpixman-1-dev
- libpng-dev
- librados-dev
@@ -324,6 +324,7 @@ jobs:
- libaio-dev
- libattr1-dev
- libbrlapi-dev
+ - libcacard-dev
- libcap-ng-dev
- libgcrypt20-dev
- libgnutls28-dev
@@ -332,7 +333,6 @@ jobs:
- liblttng-ust-dev
- libncurses5-dev
- libnfs-dev
- - libnss3-dev
- libpixman-1-dev
- libpng-dev
- librados-dev
@@ -357,6 +357,7 @@ jobs:
- libaio-dev
- libattr1-dev
- libbrlapi-dev
+ - libcacard-dev
- libcap-ng-dev
- libgcrypt20-dev
- libgnutls28-dev
@@ -365,7 +366,6 @@ jobs:
- liblttng-ust-dev
- libncurses5-dev
- libnfs-dev
- - libnss3-dev
- libpixman-1-dev
- libpng-dev
- librados-dev
@@ -399,6 +399,7 @@ jobs:
apt_packages:
- libaio-dev
- libattr1-dev
+ - libcacard-dev
- libcap-ng-dev
- libgnutls28-dev
- libiscsi-dev
@@ -406,7 +407,6 @@ jobs:
- liblzo2-dev
- libncurses-dev
- libnfs-dev
- - libnss3-dev
- libpixman-1-dev
- libsdl2-dev
- libsdl2-image-dev
@@ -442,6 +442,7 @@ jobs:
- libaio-dev
- libattr1-dev
- libbrlapi-dev
+ - libcacard-dev
- libcap-ng-dev
- libgcrypt20-dev
- libgnutls28-dev
@@ -450,7 +451,6 @@ jobs:
- liblttng-ust-dev
- libncurses5-dev
- libnfs-dev
- - libnss3-dev
- libpixman-1-dev
- libpng-dev
- librados-dev
diff --git a/docs/ccid.txt b/docs/ccid.txt
index c7fda6d07d..4866ee4abd 100644
--- a/docs/ccid.txt
+++ b/docs/ccid.txt
@@ -34,15 +34,14 @@ reader and smart card (i.e. not backed by a physical device) using this device.
2. Building
-The cryptographic functions and access to the physical card is done via NSS.
-
-Installing NSS:
+The cryptographic functions and access to the physical card is done via the
+libcacard library, whose development package must be installed prior to
+building QEMU:
In redhat/fedora:
- yum install nss-devel
-In ubuntu/debian:
- apt-get install libnss3-dev
- (not tested on ubuntu)
+ yum install libcacard-devel
+In ubuntu:
+ apt-get install libcacard-dev
Configuring and building:
./configure --enable-smartcard && make
@@ -51,7 +50,7 @@ Configuring and building:
3. Using ccid-card-emulated with hardware
Assuming you have a working smartcard on the host with the current
-user, using NSS, qemu acts as another NSS client using ccid-card-emulated:
+user, using libcacard, QEMU acts as another client using ccid-card-emulated:
qemu -usb -device usb-ccid -device ccid-card-emulated
diff --git a/scripts/coverity-scan/coverity-scan.docker b/scripts/coverity-scan/coverity-scan.docker
index 501ac67233..ecff6ac5b4 100644
--- a/scripts/coverity-scan/coverity-scan.docker
+++ b/scripts/coverity-scan/coverity-scan.docker
@@ -93,7 +93,6 @@ ENV PACKAGES \
mingw64-SDL2 \
ncurses-devel \
nettle-devel \
- nss-devel \
numactl-devel \
perl \
perl-Test-Harness \
diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker
index 6f11af1989..d47c96135c 100644
--- a/tests/docker/dockerfiles/centos7.docker
+++ b/tests/docker/dockerfiles/centos7.docker
@@ -17,6 +17,7 @@ ENV PACKAGES \
glib2-devel \
gnutls-devel \
libaio-devel \
+ libcacard-devel \
libepoxy-devel \
libfdt-devel \
libgcrypt-devel \
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index 54bc6d54cd..bbd82421db 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -13,6 +13,7 @@ ENV PACKAGES \
git \
glib2-devel \
libaio-devel \
+ libcacard-devel \
libepoxy-devel \
libgcrypt-devel \
lzo-devel \
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 0b5053f2d0..19e7a3d28a 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -27,6 +27,7 @@ ENV PACKAGES \
libasan \
libattr-devel \
libblockdev-mpath-devel \
+ libcacard-devel \
libcap-ng-devel \
libcurl-devel \
libepoxy-devel \
@@ -77,7 +78,6 @@ ENV PACKAGES \
ncurses-devel \
nettle-devel \
ninja-build \
- nss-devel \
numactl-devel \
perl \
perl-Test-Harness \
diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
index b5ef7a8198..9dec1c4bc6 100644
--- a/tests/docker/dockerfiles/ubuntu.docker
+++ b/tests/docker/dockerfiles/ubuntu.docker
@@ -39,7 +39,6 @@ ENV PACKAGES \
libncurses5-dev \
libncursesw5-dev \
libnfs-dev \
- libnss3-dev \
libnuma-dev \
libpixman-1-dev \
libpng-dev \
diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
index 9b0a19ba5e..aacea8627a 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -26,7 +26,6 @@ ENV PACKAGES \
libncurses5-dev \
libncursesw5-dev \
libnfs-dev \
- libnss3-dev \
libnuma-dev \
libpixman-1-dev \
librados-dev \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index ae889d8482..52810d4e27 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -28,7 +28,6 @@ ENV PACKAGES flex bison \
libncurses5-dev \
libncursesw5-dev \
libnfs-dev \
- libnss3-dev \
libnuma-dev \
libpixman-1-dev \
librados-dev \
--
2.28.0
next prev parent reply other threads:[~2020-12-01 17:20 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-01 17:18 [PATCH 00/23] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Daniel P. Berrangé
2020-12-01 17:18 ` Daniel P. Berrangé [this message]
2020-12-01 17:18 ` [PATCH 02/23] tests/docker: don't use BUILDKIT in GitLab either Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 03/23] tests/docker: use project specific container registries Daniel P. Berrangé
2020-12-02 11:54 ` Gerd Hoffmann
2020-12-02 12:03 ` Daniel P. Berrangé
2021-01-13 21:17 ` Wainer dos Santos Moschetta
2020-12-01 17:18 ` [PATCH 04/23] tests/docker: use explicit docker.io registry Daniel P. Berrangé
2020-12-01 17:34 ` Philippe Mathieu-Daudé
2021-01-13 21:22 ` Wainer dos Santos Moschetta
2020-12-01 17:18 ` [PATCH 05/23] tests/docker: remove travis container Daniel P. Berrangé
2020-12-02 12:08 ` Thomas Huth
2021-01-13 21:26 ` Wainer dos Santos Moschetta
2020-12-01 17:18 ` [PATCH 06/23] tests/docker: remove FEATURES env var from templates Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 07/23] tests/docker: fix sorting in package lists Daniel P. Berrangé
2020-12-01 17:35 ` Philippe Mathieu-Daudé
2020-12-01 17:18 ` [PATCH 08/23] tests/docker: fix mistakes in centos " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 09/23] tests/docker: fix mistakes in fedora package list Daniel P. Berrangé
2020-12-01 17:36 ` Philippe Mathieu-Daudé
2020-12-01 17:18 ` [PATCH 10/23] tests/docker: fix mistakes in ubuntu package lists Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 11/23] tests/docker: remove mingw packages from Fedora Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 12/23] tests/docker: add script for automating container refresh Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 13/23] tests/docker: expand centos7 package list Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 14/23] tests/docker: expand centos8 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 15/23] tests/docker: expand fedora " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 16/23] tests/docker: expand ubuntu1804 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 17/23] tests/docker: expand ubuntu2004 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 18/23] tests/docker: auto-generate centos7 with lcitool Daniel P. Berrangé
2020-12-02 12:07 ` Gerd Hoffmann
2020-12-04 13:37 ` Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 19/23] tests/docker: auto-generate centos8 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 20/23] tests/docker: auto-generate fedora " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 21/23] tests/docker: auto-generate ubuntu1804 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 22/23] tests/docker: auto-generate ubuntu2004 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 23/23] tests/docker: remove ubuntu container Daniel P. Berrangé
2020-12-01 17:53 ` [PATCH 00/23] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Kashyap Chamarthy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201201171825.2243775-2-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.