Skip to contentSkip to conversation

Some cleanups to build deps

PATCH In review Daniel P. Berrangé 3 participants 7 messages Nov 4, 2020

lore
Share & tools
lore
#5 lore raw

PATCH 3/3 docker: remove libblockdev-mpath-devel package

In reply to Daniel P. Berrangé

This package was added in

commit 8ea5962f286272ac2533892c07f9b7e2a77d8819
Author: Philippe Mathieu-Daudé <[email protected]>
Date: Sat May 4 07:54:40 2019 +0200

tests/docker: Test more components on the Fedora default image

but this is never used by QEMU. The multipath support in QEMU requires the device-mapper-multipath-devel package instead, which is already present.

---
 scripts/coverity-scan/coverity-scan.docker | 1 -
 tests/docker/dockerfiles/fedora.docker     | 1 -
 2 files changed, 2 deletions(-)
scripts/coverity-scan/coverity-scan.docker +0 -1
index e49c5e8332..b2521e159f 100644
@@ -40,7 +40,6 @@ ENV PACKAGES \
     libaio-devel \
     libasan \
     libattr-devel \
-    libblockdev-mpath-devel \
     libcap-devel \
     libcap-ng-devel \
     libcurl-devel \
tests/docker/dockerfiles/fedora.docker +0 -1
index 0f5c76067b..9474b94060 100644
@@ -25,7 +25,6 @@ ENV PACKAGES \
     libaio-devel \
     libasan \
     libattr-devel \
-    libblockdev-mpath-devel \
     libcap-ng-devel \
     libcacard-devel \
     libcurl-devel \
Signature · 1 line
2.28.0
#3 lore raw

PATCH 2/3 tests: remove "bc" from package listing

In reply to Daniel P. Berrangé

There is no sign of 'bc' being used by any tests in the tree.

---
 scripts/coverity-scan/coverity-scan.docker         | 1 -
 tests/docker/dockerfiles/debian10.docker           | 1 -
 tests/docker/dockerfiles/fedora-win32-cross.docker | 1 -
 tests/docker/dockerfiles/fedora-win64-cross.docker | 1 -
 tests/docker/dockerfiles/fedora.docker             | 1 -
 5 files changed, 5 deletions(-)
scripts/coverity-scan/coverity-scan.docker +0 -1
index ecff6ac5b4..e49c5e8332 100644
@@ -18,7 +18,6 @@
 FROM fedora:30
 ENV PACKAGES \
     alsa-lib-devel \
-    bc \
     brlapi-devel \
     bzip2 \
     bzip2-devel \
tests/docker/dockerfiles/debian10.docker +0 -1
index 21cc671d71..9f52e2ceae 100644
@@ -17,7 +17,6 @@ RUN apt update && \
     DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
     DEBIAN_FRONTEND=noninteractive eatmydata \
     apt install -y --no-install-recommends \
-        bc \
         build-essential \
         ca-certificates \
         clang \
tests/docker/dockerfiles/fedora-win32-cross.docker +0 -1
index 5903e1b0b4..fccff862e1 100644
@@ -2,7 +2,6 @@ FROM fedora:32
 
 # Please keep this list sorted alphabetically
 ENV PACKAGES \
-    bc \
     bzip2 \
     diffutils \
     findutils \
tests/docker/dockerfiles/fedora-win64-cross.docker +0 -1
index 7f03cd8ffc..67dc33df63 100644
@@ -2,7 +2,6 @@ FROM fedora:32
 
 # Please keep this list sorted alphabetically
 ENV PACKAGES \
-    bc \
     bzip2 \
     diffutils \
     findutils \
tests/docker/dockerfiles/fedora.docker +0 -1
index 29859beee3..0f5c76067b 100644
@@ -2,7 +2,6 @@ FROM fedora:32
 
 # Please keep this list sorted alphabetically
 ENV PACKAGES \
-    bc \
     brlapi-devel \
     bzip2 \
     bzip2-devel \
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/3 hw/usb/ccid: remove references to NSS

In reply to Daniel P. Berrangé

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 <[email protected]>
Date: Sun Aug 30 11:48:40 2015 +0200

libcacard: use the standalone project

---
 .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 +-
 6 files changed, 17 insertions(+), 17 deletions(-)
.travis.yml +7 -7
index a3d78171ca..2bd2cfd0ba 100644
@@ -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
@@ -268,6 +268,7 @@ jobs:
             - libaio-dev
             - libattr1-dev
             - libbrlapi-dev
+            - libcacard-dev
             - libcap-ng-dev
             - libgnutls28-dev
             - libgtk-3-dev
@@ -275,7 +276,6 @@ jobs:
             - liblttng-ust-dev
             - libnfs-dev
             - libncurses5-dev
-            - libnss3-dev
             - libpixman-1-dev
             - libpng-dev
             - librados-dev
@@ -335,6 +335,7 @@ jobs:
           - libaio-dev
           - libattr1-dev
           - libbrlapi-dev
+          - libcacard-dev
           - libcap-ng-dev
           - libgcrypt20-dev
           - libgnutls28-dev
@@ -343,7 +344,6 @@ jobs:
           - liblttng-ust-dev
           - libncurses5-dev
           - libnfs-dev
-          - libnss3-dev
           - libpixman-1-dev
           - libpng-dev
           - librados-dev
@@ -369,6 +369,7 @@ jobs:
           - libaio-dev
           - libattr1-dev
           - libbrlapi-dev
+          - libcacard-dev
           - libcap-ng-dev
           - libgcrypt20-dev
           - libgnutls28-dev
@@ -377,7 +378,6 @@ jobs:
           - liblttng-ust-dev
           - libncurses5-dev
           - libnfs-dev
-          - libnss3-dev
           - libpixman-1-dev
           - libpng-dev
           - librados-dev
@@ -402,6 +402,7 @@ jobs:
           - libaio-dev
           - libattr1-dev
           - libbrlapi-dev
+          - libcacard-dev
           - libcap-ng-dev
           - libgcrypt20-dev
           - libgnutls28-dev
@@ -410,7 +411,6 @@ jobs:
           - liblttng-ust-dev
           - libncurses5-dev
           - libnfs-dev
-          - libnss3-dev
           - libpixman-1-dev
           - libpng-dev
           - librados-dev
@@ -444,6 +444,7 @@ jobs:
         apt_packages:
           - libaio-dev
           - libattr1-dev
+          - libcacard-dev
           - libcap-ng-dev
           - libgnutls28-dev
           - libiscsi-dev
@@ -451,7 +452,6 @@ jobs:
           - liblzo2-dev
           - libncurses-dev
           - libnfs-dev
-          - libnss3-dev
           - libpixman-1-dev
           - libsdl2-dev
           - libsdl2-image-dev
@@ -487,6 +487,7 @@ jobs:
           - libaio-dev
           - libattr1-dev
           - libbrlapi-dev
+          - libcacard-dev
           - libcap-ng-dev
           - libgcrypt20-dev
           - libgnutls28-dev
@@ -495,7 +496,6 @@ jobs:
           - liblttng-ust-dev
           - libncurses5-dev
           - libnfs-dev
-          - libnss3-dev
           - libpixman-1-dev
           - libpng-dev
           - librados-dev
docs/ccid.txt +7 -8
index c7fda6d07d..1baf03e29b 100644
@@ -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
 
scripts/coverity-scan/coverity-scan.docker +0 -1
index 501ac67233..ecff6ac5b4 100644
@@ -93,7 +93,6 @@ ENV PACKAGES \
     mingw64-SDL2 \
     ncurses-devel \
     nettle-devel \
-    nss-devel \
     numactl-devel \
     perl \
     perl-Test-Harness \
tests/docker/dockerfiles/centos7.docker +1 -0
index 6f11af1989..d47c96135c 100644
@@ -17,6 +17,7 @@ ENV PACKAGES \
     glib2-devel \
     gnutls-devel \
     libaio-devel \
+    libcacard-devel \
     libepoxy-devel \
     libfdt-devel \
     libgcrypt-devel \
tests/docker/dockerfiles/centos8.docker +1 -0
index 54bc6d54cd..bbd82421db 100644
@@ -13,6 +13,7 @@ ENV PACKAGES \
     git \
     glib2-devel \
     libaio-devel \
+    libcacard-devel \
     libepoxy-devel \
     libgcrypt-devel \
     lzo-devel \
tests/docker/dockerfiles/fedora.docker +1 -1
index 0b5053f2d0..29859beee3 100644
@@ -28,6 +28,7 @@ ENV PACKAGES \
     libattr-devel \
     libblockdev-mpath-devel \
     libcap-ng-devel \
+    libcacard-devel \
     libcurl-devel \
     libepoxy-devel \
     libfdt-devel \
@@ -77,7 +78,6 @@ ENV PACKAGES \
     ncurses-devel \
     nettle-devel \
     ninja-build \
-    nss-devel \
     numactl-devel \
     perl \
     perl-Test-Harness \
Signature · 1 line
2.28.0
#0 lore raw

cover Some cleanups to build deps

In looking at using libvirt-ci to generate the docker files I noticed some wierd build deps in current package lists. This cleans them up.

Daniel P. Berrangé (3):
hw/usb/ccid: remove references to NSS
tests: remove "bc" from package listing
docker: remove libblockdev-mpath-devel package

 .travis.yml                                       | 14 +++++++-------
 docs/ccid.txt                                     | 15 +++++++--------
 scripts/coverity-scan/coverity-scan.docker        |  3 ---
 tests/docker/dockerfiles/centos7.docker           |  1 +
 tests/docker/dockerfiles/centos8.docker           |  1 +
 tests/docker/dockerfiles/debian10.docker          |  1 -
 .../docker/dockerfiles/fedora-win32-cross.docker  |  1 -
 .../docker/dockerfiles/fedora-win64-cross.docker  |  1 -
 tests/docker/dockerfiles/fedora.docker            |  4 +---
 9 files changed, 17 insertions(+), 24 deletions(-)
Signature · 1 line
2.28.0
#4 lore raw

Re: [PATCH 2/3] tests: remove "bc" from package listing

In reply to Daniel P. Berrangé
Quoted 10 lines · Daniel P. Berrangé

There is no sign of 'bc' being used by any tests in the tree.

---
 scripts/coverity-scan/coverity-scan.docker         | 1 -
 tests/docker/dockerfiles/debian10.docker           | 1 -
 tests/docker/dockerfiles/fedora-win32-cross.docker | 1 -
 tests/docker/dockerfiles/fedora-win64-cross.docker | 1 -
 tests/docker/dockerfiles/fedora.docker             | 1 -
 5 files changed, 5 deletions(-)

I added it to be able to rebuild easily the blobs consumed by our tests:

commit 1bbf2d010fc0e5f0a9c5e1967368c44bc64e086a

Author: Philippe Mathieu-Daudé <[email protected]>
Date:   Mon Mar 16 17:21:28 2020 +0000

tests/docker: Install tools to cross-debug and build Linux kernels

We often run Linux kernels to test QEMU. We sometimes need to build them manually to use non-default features. We only miss the tiny 'bc' tool.

The ncurses library is helpful to run 'make menuconfig'.

Finally, gdb-multiarch allow us to debug a TCG guest when its architecture is different than the host.

I think this is related to the question of what we can include to the repository for testing... If we can not add binary and don't have how to produce them, it becomes complicated.

Reviewed-by on v1 3/3
#6 lore raw

Re: [PATCH 3/3] docker: remove libblockdev-mpath-devel package

In reply to Daniel P. Berrangé
Quoted 12 lines · Daniel P. Berrangé

This package was added in

commit 8ea5962f286272ac2533892c07f9b7e2a77d8819
Author: Philippe Mathieu-Daudé <[email protected]>
Date: Sat May 4 07:54:40 2019 +0200

tests/docker: Test more components on the Fedora default image

but this is never used by QEMU. The multipath support in QEMU requires the device-mapper-multipath-devel package instead, which is already present.

Quoted 5 lines
---
 scripts/coverity-scan/coverity-scan.docker | 1 -
 tests/docker/dockerfiles/fedora.docker     | 1 -
 2 files changed, 2 deletions(-)
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] hw/usb/ccid: remove references to NSS

In reply to Daniel P. Berrangé
Quoted 19 lines · Daniel P. Berrangé

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 <[email protected]>
Date: Sun Aug 30 11:48:40 2015 +0200

libcacard: use the standalone project

---
 .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 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

...

Quoted 27 lines
docs/ccid.txt +6 -7
index c7fda6d07d..1baf03e29b 100644
@@ -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

docs/ccid.txt Configuring and building: · line 53

Quoted 5 lines
docs/ccid.txt +1 -1
@@ -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:

Maybe replace 'qemu' by 'QEMU' (another instance line 125).

Otherwise:

Thanks.