docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13038 from tianon/fix-build-deb 

Fix build-deb
This commit is contained in:
Tianon Gravi 2015-05-06 22:12:15 -07:00
parent a1aff84480 867eed8f35
commit 443437f5ea
10 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
hack/make/.build-deb/docker-core.bash-completion → hack/make/.build-deb/docker-engine.bash-completion
View File

0
hack/make/.build-deb/docker-core.docker.default → hack/make/.build-deb/docker-engine.docker.default
View File

0
hack/make/.build-deb/docker-core.docker.init → hack/make/.build-deb/docker-engine.docker.init
View File

0
hack/make/.build-deb/docker-core.docker.upstart → hack/make/.build-deb/docker-engine.docker.upstart
View File

0
hack/make/.build-deb/docker-core.install → hack/make/.build-deb/docker-engine.install
View File

0
hack/make/.build-deb/docker-core.manpages → hack/make/.build-deb/docker-engine.manpages
View File

0
hack/make/.build-deb/docker-core.postinst → hack/make/.build-deb/docker-engine.postinst
View File

0
hack/make/.build-deb/docker-core.udev → hack/make/.build-deb/docker-engine.udev
View File

4
hack/make/.build-deb/rules
View File

@ -21,8 +21,8 @@ override_dh_strip:
override_dh_auto_install: override_dh_auto_install:
mkdir -p debian/docker-engine/usr/bin mkdir -p debian/docker-engine/usr/bin
cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary/docker)" debian/docker-engine/usr/bin/docker cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary/docker)" debian/docker-engine/usr/bin/docker
mkdir -p debian/docker-engine/usr/libexec/docker mkdir -p debian/docker-engine/usr/lib/docker
cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary/dockerinit)" debian/docker-engine/usr/libexec/docker/dockerinit cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary/dockerinit)" debian/docker-engine/usr/lib/docker/dockerinit
override_dh_installinit: override_dh_installinit:
# use "docker" as our service name, not "docker-engine" # use "docker" as our service name, not "docker-engine"

2
hack/make/build-deb
View File

@ -9,7 +9,7 @@ DEST=$1
# TODO consider using frozen images for the dockercore/builder-deb tags # TODO consider using frozen images for the dockercore/builder-deb tags
debVersion="${VERSION//-/'~'}" debVersion="${VERSION//-/~}"
# if we have a "-dev" suffix or have change in Git, let's make this package version more complex so it works better # if we have a "-dev" suffix or have change in Git, let's make this package version more complex so it works better
if [[ "$VERSION" == *-dev ]] || [ -n "$(git status --porcelain)" ]; then if [[ "$VERSION" == *-dev ]] || [ -n "$(git status --porcelain)" ]; then
gitUnix="$(git log -1 --pretty='%at')" gitUnix="$(git log -1 --pretty='%at')"