From af79735338fb7e3eedca5997bca010e8a11c5ce6 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Sat, 28 Dec 2013 06:35:00 -0700 Subject: [PATCH] Replace FPM --vendor with --license, and give it the proper value of "Apache-2.0" Fixes #3372 Upstream-commit: cda146547e59ff875b3eb6202a87004a3f7ea96d Component: engine --- components/engine/hack/make/ubuntu | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/engine/hack/make/ubuntu b/components/engine/hack/make/ubuntu index 578f254558..8fa3149d4e 100644 --- a/components/engine/hack/make/ubuntu +++ b/components/engine/hack/make/ubuntu @@ -17,6 +17,7 @@ repeatability across servers. Docker is a great building block for automating distributed systems: large-scale web deployments, database clusters, continuous deployment systems, private PaaS, service-oriented architectures, etc." +PACKAGE_LICENSE="Apache-2.0" # Build docker as an ubuntu package using FPM and REPREPRO (sue me). # bundle_binary must be called first. @@ -104,7 +105,7 @@ EOF --replaces lxc-docker \ --replaces lxc-docker-virtual-package \ --url "$PACKAGE_URL" \ - --vendor "$PACKAGE_VENDOR" \ + --license "$PACKAGE_LICENSE" \ --config-files /etc/init/docker.conf \ --config-files /etc/init.d/docker \ --config-files /etc/default/docker \ @@ -118,7 +119,7 @@ EOF --description "$PACKAGE_DESCRIPTION" \ --maintainer "$PACKAGE_MAINTAINER" \ --url "$PACKAGE_URL" \ - --vendor "$PACKAGE_VENDOR" \ + --license "$PACKAGE_LICENSE" \ --config-files /etc/init/docker.conf \ --config-files /etc/init.d/docker \ --config-files /etc/default/docker \