beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3374 from tianon/fpm-license-vendor

Browse source 
Replace FPM --vendor with --license, and give it the proper value of "Apache-2.0"
This commit is contained in:
Tianon Gravi 2014-01-01 14:42:47 -08:00
commit 5f55784224
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hack/make/ubuntu
View file

@ -17,6 +17,7 @@ repeatability across servers.
Docker is a great building block for automating distributed systems: Docker is a great building block for automating distributed systems:
large-scale web deployments, database clusters, continuous deployment systems, large-scale web deployments, database clusters, continuous deployment systems,
private PaaS, service-oriented architectures, etc." private PaaS, service-oriented architectures, etc."
PACKAGE_LICENSE="Apache-2.0"
# Build docker as an ubuntu package using FPM and REPREPRO (sue me). # Build docker as an ubuntu package using FPM and REPREPRO (sue me).
# bundle_binary must be called first. # bundle_binary must be called first.
@ -104,7 +105,7 @@ EOF
--replaces lxc-docker \ --replaces lxc-docker \
--replaces lxc-docker-virtual-package \ --replaces lxc-docker-virtual-package \
--url "$PACKAGE_URL" \ --url "$PACKAGE_URL" \
--vendor "$PACKAGE_VENDOR" \ --license "$PACKAGE_LICENSE" \
--config-files /etc/init/docker.conf \ --config-files /etc/init/docker.conf \
--config-files /etc/init.d/docker \ --config-files /etc/init.d/docker \
--config-files /etc/default/docker \ --config-files /etc/default/docker \
@ -118,7 +119,7 @@ EOF
--description "$PACKAGE_DESCRIPTION" \ --description "$PACKAGE_DESCRIPTION" \
--maintainer "$PACKAGE_MAINTAINER" \ --maintainer "$PACKAGE_MAINTAINER" \
--url "$PACKAGE_URL" \ --url "$PACKAGE_URL" \
--vendor "$PACKAGE_VENDOR" \ --license "$PACKAGE_LICENSE" \
--config-files /etc/init/docker.conf \ --config-files /etc/init/docker.conf \
--config-files /etc/init.d/docker \ --config-files /etc/init.d/docker \
--config-files /etc/default/docker \ --config-files /etc/default/docker \