Browse code
Fix build-deb
This fixes the part of #12996 that I forgot. :angel:
This also fixes a minor path issue (there's no `libexec` in Debian), and fixes a minor bug with the `debVersion` parsing.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Tianon Gravi authored on 2015/05/07 08:39:10Showing 18 changed files
- hack/make/.build-deb/docker-core.bash-completion
- hack/make/.build-deb/docker-core.docker.default
- hack/make/.build-deb/docker-core.docker.init
- hack/make/.build-deb/docker-core.docker.upstart
- hack/make/.build-deb/docker-core.install
- hack/make/.build-deb/docker-core.manpages
- hack/make/.build-deb/docker-core.postinst
- hack/make/.build-deb/docker-core.udev
- hack/make/.build-deb/docker-engine.bash-completion
- hack/make/.build-deb/docker-engine.docker.default
- hack/make/.build-deb/docker-engine.docker.init
- hack/make/.build-deb/docker-engine.docker.upstart
- hack/make/.build-deb/docker-engine.install
- hack/make/.build-deb/docker-engine.manpages
- hack/make/.build-deb/docker-engine.postinst
- hack/make/.build-deb/docker-engine.udev
- hack/make/.build-deb/rules
- hack/make/build-deb
| 3 | 2 |
deleted file mode 100644 |
| ... | ... |
@@ -1,10 +0,0 @@ |
| 1 |
-#contrib/syntax/vim/doc/* /usr/share/vim/vimfiles/doc/ |
|
| 2 |
-#contrib/syntax/vim/ftdetect/* /usr/share/vim/vimfiles/ftdetect/ |
|
| 3 |
-#contrib/syntax/vim/syntax/* /usr/share/vim/vimfiles/syntax/ |
|
| 4 |
-contrib/*-integration usr/share/docker-engine/contrib/ |
|
| 5 |
-contrib/check-config.sh usr/share/docker-engine/contrib/ |
|
| 6 |
-contrib/completion/zsh/_docker usr/share/zsh/vendor-completions/ |
|
| 7 |
-contrib/init/systemd/docker.service lib/systemd/system/ |
|
| 8 |
-contrib/init/systemd/docker.socket lib/systemd/system/ |
|
| 9 |
-contrib/mk* usr/share/docker-engine/contrib/ |
|
| 10 |
-contrib/nuke-graph-directory.sh usr/share/docker-engine/contrib/ |
| 2 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,20 +0,0 @@ |
| 1 |
-#!/bin/sh |
|
| 2 |
-set -e |
|
| 3 |
- |
|
| 4 |
-case "$1" in |
|
| 5 |
- configure) |
|
| 6 |
- if [ -z "$2" ]; then |
|
| 7 |
- if ! getent group docker > /dev/null; then |
|
| 8 |
- groupadd --system docker |
|
| 9 |
- fi |
|
| 10 |
- fi |
|
| 11 |
- ;; |
|
| 12 |
- abort-*) |
|
| 13 |
- # How'd we get here?? |
|
| 14 |
- exit 1 |
|
| 15 |
- ;; |
|
| 16 |
- *) |
|
| 17 |
- ;; |
|
| 18 |
-esac |
|
| 19 |
- |
|
| 20 |
-#DEBHELPER# |
| 1 | 2 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,10 @@ |
| 0 |
+#contrib/syntax/vim/doc/* /usr/share/vim/vimfiles/doc/ |
|
| 1 |
+#contrib/syntax/vim/ftdetect/* /usr/share/vim/vimfiles/ftdetect/ |
|
| 2 |
+#contrib/syntax/vim/syntax/* /usr/share/vim/vimfiles/syntax/ |
|
| 3 |
+contrib/*-integration usr/share/docker-engine/contrib/ |
|
| 4 |
+contrib/check-config.sh usr/share/docker-engine/contrib/ |
|
| 5 |
+contrib/completion/zsh/_docker usr/share/zsh/vendor-completions/ |
|
| 6 |
+contrib/init/systemd/docker.service lib/systemd/system/ |
|
| 7 |
+contrib/init/systemd/docker.socket lib/systemd/system/ |
|
| 8 |
+contrib/mk* usr/share/docker-engine/contrib/ |
|
| 9 |
+contrib/nuke-graph-directory.sh usr/share/docker-engine/contrib/ |
| 0 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,20 @@ |
| 0 |
+#!/bin/sh |
|
| 1 |
+set -e |
|
| 2 |
+ |
|
| 3 |
+case "$1" in |
|
| 4 |
+ configure) |
|
| 5 |
+ if [ -z "$2" ]; then |
|
| 6 |
+ if ! getent group docker > /dev/null; then |
|
| 7 |
+ groupadd --system docker |
|
| 8 |
+ fi |
|
| 9 |
+ fi |
|
| 10 |
+ ;; |
|
| 11 |
+ abort-*) |
|
| 12 |
+ # How'd we get here?? |
|
| 13 |
+ exit 1 |
|
| 14 |
+ ;; |
|
| 15 |
+ *) |
|
| 16 |
+ ;; |
|
| 17 |
+esac |
|
| 18 |
+ |
|
| 19 |
+#DEBHELPER# |
| ... | ... |
@@ -21,8 +21,8 @@ override_dh_strip: |
| 21 | 21 |
override_dh_auto_install: |
| 22 | 22 |
mkdir -p debian/docker-engine/usr/bin |
| 23 | 23 |
cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary/docker)" debian/docker-engine/usr/bin/docker |
| 24 |
- mkdir -p debian/docker-engine/usr/libexec/docker |
|
| 25 |
- cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary/dockerinit)" debian/docker-engine/usr/libexec/docker/dockerinit |
|
| 24 |
+ mkdir -p debian/docker-engine/usr/lib/docker |
|
| 25 |
+ cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary/dockerinit)" debian/docker-engine/usr/lib/docker/dockerinit |
|
| 26 | 26 |
|
| 27 | 27 |
override_dh_installinit: |
| 28 | 28 |
# use "docker" as our service name, not "docker-engine" |
| ... | ... |
@@ -9,7 +9,7 @@ DEST=$1 |
| 9 | 9 |
|
| 10 | 10 |
# TODO consider using frozen images for the dockercore/builder-deb tags |
| 11 | 11 |
|
| 12 |
- debVersion="${VERSION//-/'~'}"
|
|
| 12 |
+ debVersion="${VERSION//-/~}"
|
|
| 13 | 13 |
# if we have a "-dev" suffix or have change in Git, let's make this package version more complex so it works better |
| 14 | 14 |
if [[ "$VERSION" == *-dev ]] || [ -n "$(git status --porcelain)" ]; then |
| 15 | 15 |
gitUnix="$(git log -1 --pretty='%at')" |