Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Riyaz Faizullabhoy authored on 2016/03/08 03:18:18... | ... |
@@ -5,8 +5,8 @@ VERSION = $(shell cat VERSION) |
5 | 5 |
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 |
- # if we are building experimental we recommend yubico-piv-tool |
|
9 |
- echo 'yubico:Recommends=$(shell [ "$DOCKER_EXPERIMENTAL" ] && echo "yubico-piv-tool (>= 1.1.0~)")' >> debian/docker-engine.substvars |
|
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 |
|
10 | 10 |
dh_gencontrol |
11 | 11 |
|
12 | 12 |
override_dh_auto_build: |
... | ... |
@@ -60,12 +60,10 @@ Requires: device-mapper >= 1.02.90-2 |
60 | 60 |
%global with_selinux 1 |
61 | 61 |
%endif |
62 | 62 |
|
63 |
-%if 0%{?_experimental} |
|
64 |
-# yubico-piv-tool conditional |
|
63 |
+# yubico-piv-tool required |
|
65 | 64 |
%if 0%{?fedora} >= 20 || 0%{?centos} >= 7 || 0%{?rhel} >= 7 |
66 | 65 |
Requires: yubico-piv-tool >= 1.1.0 |
67 | 66 |
%endif |
68 |
-%endif |
|
69 | 67 |
|
70 | 68 |
# start if with_selinux |
71 | 69 |
%if 0%{?with_selinux} |
... | ... |
@@ -36,7 +36,7 @@ if [ "$(go env GOOS)" == "linux" ] ; then |
36 | 36 |
esac |
37 | 37 |
fi |
38 | 38 |
|
39 |
-if [ "$IAMSTATIC" == "true" ] && [ "$(go env GOHOSTOS)" == "linux" ] && [ "$DOCKER_EXPERIMENTAL" ]; then |
|
39 |
+if [ "$IAMSTATIC" == "true" ] && [ "$(go env GOHOSTOS)" == "linux" ]; then |
|
40 | 40 |
if [ "${GOOS}/${GOARCH}" == "darwin/amd64" ]; then |
41 | 41 |
export CGO_ENABLED=1 |
42 | 42 |
export CC=o64-clang |
... | ... |
@@ -60,7 +60,7 @@ To build the Docker daemon, you will additionally need: |
60 | 60 |
* btrfs-progs version 3.16.1 or later (unless using an older version is |
61 | 61 |
absolutely necessary, in which case 3.8 is the minimum) |
62 | 62 |
* libseccomp version 2.2.1 or later (for build tag seccomp) |
63 |
-* yubico-piv-tool version 1.1.0 or later (for experimental) |
|
63 |
+* yubico-piv-tool version 1.1.0 or later |
|
64 | 64 |
|
65 | 65 |
Be sure to also check out Docker's Dockerfile for the most up-to-date list of |
66 | 66 |
these build-time dependencies. |