From: wansu.yoo <wansu.yoo@samsung.com>
Date: Tue, 12 Sep 2017 04:28:47 +0000 (+0900)
Subject: Revert "Re-ordered build binary"
X-Git-Tag: submit/tizen/20170912.072010~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=61b81fd36281609ce196d0b33e3150308b5b30ed;p=platform%2Fupstream%2Fdocker-engine.git

Revert "Re-ordered build binary"

This reverts commit d1aedf1a7cd61ed71651126849d3ec7334668cff.

Change-Id: I346f29ae7ba48e92a3284de17a931959caa24f4c
---

diff --git a/packaging/docker-engine.spec b/packaging/docker-engine.spec
index 8db2d17..a48849e 100755
--- a/packaging/docker-engine.spec
+++ b/packaging/docker-engine.spec
@@ -86,17 +86,19 @@ cd ../../
 
 
 %build
-cd .%docker_path/
+cd .%docker_path/engine
 export GOROOT=%{_builddir}/%{name}-%{version}/go
 export PATH=$PATH:%{_builddir}/%{name}-%{version}/go/bin
 export GOPATH=%{_builddir}/%{name}-%{version}
 export DOCKER_BUILDTAGS='exclude_graphdriver_btrfs exclude_graphdriver_devicemapper'
-export CGO_ENABLED=1
 
 go env
+echo 'docker daemon'
+export CGO_ENABLED=1
+AUTO_GOPATH=1 ./hack/make.sh dynbinary
 
 echo 'docker cli'
-cd ./cli
+cd ../cli
 make binary
 
 export BUILDTAGS=no_btrfs
@@ -108,10 +110,6 @@ echo 'runc build'
 cd ../../opencontainers/runc
 make all BUILDTAGS=""
 
-echo 'docker daemon'
-cd ../../docker/engine
-AUTO_GOPATH=1 ./hack/make.sh dynbinary
-
 %install
 rm -rf %{buildroot}
 # install binary