diff options
| author | Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> | 2016-03-07 10:18:18 -0800 |
|---|---|---|
| committer | Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> | 2016-03-07 17:17:15 -0800 |
| commit | 2c3e9e57949d23b4453b21339da56f0424ecbe42 (patch) | |
| tree | 5c33f3e2bdeaee3f7a612a75ffc2086af2dfee30 | |
| parent | 37fa75b3447007bb8ea311f02610bb383b0db77f (diff) | |
| download | docker-2c3e9e57949d23b4453b21339da56f0424ecbe42.tar.gz | |
Update packaging for yubico
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
| -rwxr-xr-x | hack/make/.build-deb/rules | 4 | ||||
| -rw-r--r-- | hack/make/.build-rpm/docker-engine.spec | 4 | ||||
| -rw-r--r-- | hack/make/binary | 2 | ||||
| -rw-r--r-- | project/PACKAGERS.md | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/hack/make/.build-deb/rules b/hack/make/.build-deb/rules index 15b848e322..1588a33cb8 100755 --- a/hack/make/.build-deb/rules +++ b/hack/make/.build-deb/rules @@ -5,8 +5,8 @@ VERSION = $(shell cat VERSION) override_dh_gencontrol: # if we're on Ubuntu, we need to Recommends: apparmor echo 'apparmor:Recommends=$(shell dpkg-vendor --is Ubuntu && echo apparmor)' >> debian/docker-engine.substvars - # if we are building experimental we recommend yubico-piv-tool - echo 'yubico:Recommends=$(shell [ "$DOCKER_EXPERIMENTAL" ] && echo "yubico-piv-tool (>= 1.1.0~)")' >> debian/docker-engine.substvars + # recommend yubico-piv-tool since we include pkcs11 by default + echo 'yubico:Recommends=$(echo "yubico-piv-tool (>= 1.1.0~)")' >> debian/docker-engine.substvars dh_gencontrol override_dh_auto_build: diff --git a/hack/make/.build-rpm/docker-engine.spec b/hack/make/.build-rpm/docker-engine.spec index 92b2b1adcf..ce952548f9 100644 --- a/hack/make/.build-rpm/docker-engine.spec +++ b/hack/make/.build-rpm/docker-engine.spec @@ -60,12 +60,10 @@ Requires: device-mapper >= 1.02.90-2 %global with_selinux 1 %endif -%if 0%{?_experimental} -# yubico-piv-tool conditional +# yubico-piv-tool required %if 0%{?fedora} >= 20 || 0%{?centos} >= 7 || 0%{?rhel} >= 7 Requires: yubico-piv-tool >= 1.1.0 %endif -%endif # start if with_selinux %if 0%{?with_selinux} diff --git a/hack/make/binary b/hack/make/binary index 6e9fbb478a..cbf7d99fc0 100644 --- a/hack/make/binary +++ b/hack/make/binary @@ -36,7 +36,7 @@ if [ "$(go env GOOS)" == "linux" ] ; then esac fi -if [ "$IAMSTATIC" == "true" ] && [ "$(go env GOHOSTOS)" == "linux" ] && [ "$DOCKER_EXPERIMENTAL" ]; then +if [ "$IAMSTATIC" == "true" ] && [ "$(go env GOHOSTOS)" == "linux" ]; then if [ "${GOOS}/${GOARCH}" == "darwin/amd64" ]; then export CGO_ENABLED=1 export CC=o64-clang diff --git a/project/PACKAGERS.md b/project/PACKAGERS.md index b3f60472fd..75b299cac8 100644 --- a/project/PACKAGERS.md +++ b/project/PACKAGERS.md @@ -60,7 +60,7 @@ To build the Docker daemon, you will additionally need: * btrfs-progs version 3.16.1 or later (unless using an older version is absolutely necessary, in which case 3.8 is the minimum) * libseccomp version 2.2.1 or later (for build tag seccomp) -* yubico-piv-tool version 1.1.0 or later (for experimental) +* yubico-piv-tool version 1.1.0 or later Be sure to also check out Docker's Dockerfile for the most up-to-date list of these build-time dependencies. |