Browse code

Improve messaging and binary generation for pkcs11

Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>

Riyaz Faizullabhoy authored on 2016/03/16 08:25:44
Showing 3 changed files
... ...
@@ -71,7 +71,7 @@ RUN useradd --create-home --gid docker unprivilegeduser
71 71
 
72 72
 VOLUME /var/lib/docker
73 73
 WORKDIR /go/src/github.com/docker/docker
74
-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
74
+ENV DOCKER_BUILDTAGS apparmor seccomp selinux
75 75
 
76 76
 # Wrap all commands in the "docker-in-docker" script to allow nested containers
77 77
 ENTRYPOINT ["hack/dind"]
... ...
@@ -6,7 +6,7 @@ override_dh_gencontrol:
6 6
 	# if we're on Ubuntu, we need to Recommends: apparmor
7 7
 	echo 'apparmor:Recommends=$(shell dpkg-vendor --is Ubuntu && echo apparmor)' >> debian/docker-engine.substvars
8 8
 	# recommend yubico-piv-tool since we include pkcs11 by default
9
-	echo 'yubico:Recommends=$(echo "yubico-piv-tool (>= 1.1.0~)")' >> debian/docker-engine.substvars
9
+	echo 'yubico:Recommends="yubico-piv-tool (>= 1.1.0~)"' >> debian/docker-engine.substvars
10 10
 	dh_gencontrol
11 11
 
12 12
 override_dh_auto_build:
... ...
@@ -60,7 +60,7 @@ Requires: device-mapper >= 1.02.90-2
60 60
 %global with_selinux 1
61 61
 %endif
62 62
 
63
-# yubico-piv-tool required
63
+# yubico-piv-tool recommends
64 64
 %if 0%{?fedora} >= 20 || 0%{?centos} >= 7 || 0%{?rhel} >= 7
65 65
 Requires: yubico-piv-tool >= 1.1.0
66 66
 %endif