Switched service startup dependencies, removed old basecoin build

build/Makefile

@@ -32,12 +32,12 @@ endif
 # Here comes the real deal
 ###
 
-binaries = tendermint basecoin ethermint trackomatron gaia basecoin-old
-build-binaries = build-tendermint build-basecoin build-ethermint build-trackomatron build-gaia build-basecoin-old
-package-rpm = package-rpm-tendermint package-rpm-basecoin package-rpm-ethermint package-rpm-trackomatron package-rpm-gaia package-rpm-basecoin-old
-install-rpm = install-rpm-tendermint install-rpm-basecoin install-rpm-ethermint install-rpm-trackomatron install-rpm-gaia package-rpm-basecoin-old
-package-deb = package-deb-tendermint package-deb-basecoin package-deb-ethermint package-deb-trackomatron package-deb-gaia package-deb-basecoin-old
-install-deb = install-deb-tendermint install-deb-basecoin install-deb-ethermint install-deb-trackomatron install-deb-gaia install-deb-basecoin-old
+binaries = tendermint basecoin ethermint trackomatron gaia
+build-binaries = build-tendermint build-basecoin build-ethermint build-trackomatron build-gaia
+package-rpm = package-rpm-tendermint package-rpm-basecoin package-rpm-ethermint package-rpm-trackomatron package-rpm-gaia
+install-rpm = install-rpm-tendermint install-rpm-basecoin install-rpm-ethermint install-rpm-trackomatron install-rpm-gaia
+package-deb = package-deb-tendermint package-deb-basecoin package-deb-ethermint package-deb-trackomatron package-deb-gaia
+install-deb = install-deb-tendermint install-deb-basecoin install-deb-ethermint install-deb-trackomatron install-deb-gaia
 
 all: $(binaries)
 build: $(build-binaries)
@@ -60,13 +60,12 @@ build-tendermint: git-branch
 	cp $(GOPATH)/src/github.com/tendermint/tendermint/build/tendermint $(GOPATH)/bin
 	@echo "*** Built tendermint"
 
-build-basecoin-old: git-branch
-	@echo "*** Building basecoin-old"
-	go get -d -u github.com/tendermint/basecoin/cmd/basecoin
-	cd $(GOPATH)/src/github.com/tendermint/basecoin && git checkout "$(GIT_BRANCH)" && git pull
-	$(MAKE) -C $(GOPATH)/src/github.com/tendermint/basecoin get_vendor_deps install
-	@echo "Workaround: basecoin-old  does not have a binary that gives the basecoin-old version number." && rm -rf $(GOPATH)/bin/basecoin-old && ln -s $(GOPATH)/bin/basecoin $(GOPATH)/bin/basecoin-old
-	@echo "*** Built basecoin"
+#build-basecoin: git-branch
+#	@echo "*** Building basecoin-old"
+#	go get -d -u github.com/tendermint/basecoin/cmd/basecoin
+#	cd $(GOPATH)/src/github.com/tendermint/basecoin && git checkout "$(GIT_BRANCH)" && git pull
+#	$(MAKE) -C $(GOPATH)/src/github.com/tendermint/basecoin get_vendor_deps install
+#	@echo "*** Built basecoin"
 
 build-ethermint: git-branch
 	@echo "*** Building ethermint"
@@ -119,13 +118,12 @@ prepare-files = rm -rf $(build_folder) && mkdir -p $(build_folder) && cp -r ./$(
 ##
 
 prepare-tendermint =
-prepare-basecoin-old = rm -f $(build_folder)/usr/bin/basecoin-old && cp $(GOPATH)/bin/basecli $(GOPATH)/bin/basecoin $(build_folder)/usr/bin
 prepare-ethermint = mkdir -p $(build_folder)/etc/ethermint && \
 	cp $(GOPATH)/src/github.com/tendermint/ethermint/setup/genesis.json $(build_folder)/etc/ethermint/genesis.json && \
 	cp -r $(GOPATH)/src/github.com/tendermint/ethermint/setup/keystore $(build_folder)/etc/ethermint
 prepare-trackomatron = rm -f $(build_folder)/usr/bin/trackomatron && cp $(GOPATH)/bin/tracko $(GOPATH)/bin/trackocli $(build_folder)/usr/bin
 prepare-gaia =
-prepare-basecoin = rm -f $(build_folder)/usr/bin/basecoin-old && cp $(GOPATH)/bin/basecli $(GOPATH)/bin/basecoin $(GOPATH)/bin/baseserver $(GOPATH)/bin/counter $(GOPATH)/bin/countercli $(GOPATH)/bin/eyes $(GOPATH)/bin/eyescli $(build_folder)/usr/bin
+prepare-basecoin = cp $(GOPATH)/bin/basecli $(GOPATH)/bin/basecoin $(GOPATH)/bin/baseserver $(GOPATH)/bin/counter $(GOPATH)/bin/countercli $(GOPATH)/bin/eyes $(GOPATH)/bin/eyescli $(build_folder)/usr/bin
 
 ###
 # Package the binary for CentOS/RedHat (RPM) and Debian/Ubuntu (DEB)

build/cosmos-sdk/DEBIAN/control

@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Greg Szabo <greg@philosobear.com>
 Build-Depends: debhelper (>=9)
-Depends: tendermint (>=0.10.0)
+Depends: tendermint (>=0.11.0)
 Standards-Version: 3.9.6
 Homepage: https://tendermint.com
 Package: cosmos-sdk

build/cosmos-sdk/etc/systemd/system/cosmos-sdk-server.service

@@ -18,6 +18,6 @@ ExecReload=/bin/kill -HUP $MAINPID
 KillSignal=SIGTERM
 
 [Install]
-WantedBy=multi-user.target cosmos-sdk.service
+WantedBy=multi-user.target
 Also=cosmos-sdk.service
 

build/cosmos-sdk/etc/systemd/system/cosmos-sdk.service

@@ -24,6 +24,6 @@ ExecReload=/bin/kill -HUP $MAINPID
 KillSignal=SIGTERM
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target cosmos-sdk-server.service
 Also=cosmos-sdk-server.service
 

build/ethermint/DEBIAN/control

@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Greg Szabo <greg@philosobear.com>
 Build-Depends: debhelper (>=9)
-Depends: tendermint (>=0.10.0)
+Depends: tendermint (>=0.11.0)
 Standards-Version: 3.9.6
 Homepage: https://tendermint.com
 Package: ethermint

build/ethermint/etc/systemd/system/ethermint-server.service

@@ -3,7 +3,8 @@ Description=Ethermint server
 Requires=network-online.target
 BindTo=ethermint.service
 PartOf=ethermint.service
-After=network-online.target ethermint.service
+Before=ethermint.service
+After=network-online.target
 PropagatesReloadTo=ethermint.service
 ReloadPropagatedFrom=ethermint.service
 

build/ethermint/etc/systemd/system/ethermint.service

@@ -7,8 +7,7 @@ BindTo=ethermint-server.service
 #propagates stop and restart (one-way)
 PartOf=ethermint-server.service
 #order
-Before=ethermint-server.service
-After=network-online.target
+After=network-online.target ethermint-server.service
 #propagates reload
 PropagatesReloadTo=ethermint-server.service
 ReloadPropagatedFrom=ethermint-server.service
@@ -23,6 +22,6 @@ ExecReload=/bin/kill -HUP $MAINPID
 KillSignal=SIGTERM
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target ethermint-server.service
 Also=ethermint-server.service
 

build/gaia/DEBIAN/control

@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Greg Szabo <greg@philosobear.com>
 Build-Depends: debhelper (>=9)
-Depends: tendermint (>=0.10.0)
+Depends: tendermint (>=0.11.0)
 Standards-Version: 3.9.6
 Homepage: https://cosmos.network
 Package: gaia

build/gaia/etc/systemd/system/gaia-server.service

@@ -3,7 +3,8 @@ Description=Gaia server
 Requires=network-online.target
 BindTo=gaia.service
 PartOf=gaia.service
-After=network-online.target gaia.service
+Before=gaia.service
+After=network-online.target
 PropagatesReloadTo=gaia.service
 ReloadPropagatedFrom=gaia.service
 
@@ -18,6 +19,6 @@ ExecReload=/bin/kill -HUP $MAINPID
 KillSignal=SIGTERM
 
 [Install]
-WantedBy=multi-user.target gaia.service
+WantedBy=multi-user.target
 Also=gaia.service
 

build/gaia/etc/systemd/system/gaia.service

@@ -7,8 +7,7 @@ BindTo=gaia-server.service
 #propagates stop and restart (one-way)
 PartOf=gaia-server.service
 #order
-Before=gaia-server.service
-After=network-online.target
+After=network-online.target gaia-server.service
 #propagates reload
 PropagatesReloadTo=gaia-server.service
 ReloadPropagatedFrom=gaia-server.service
@@ -23,6 +22,6 @@ ExecReload=/bin/kill -HUP $MAINPID
 KillSignal=SIGTERM
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target gaia-server.service
 Also=gaia-server.service
 

build/trackomatron/DEBIAN/control

@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Greg Szabo <greg@philosobear.com>
 Build-Depends: debhelper (>=9)
-Depends: tendermint (>=0.10.0)
+Depends: tendermint (>=0.11.0)
 Standards-Version: 3.9.6
 Homepage: https://tendermint.com
 Package: trackomatron

build/trackomatron/etc/systemd/system/trackomatron-server.service

@@ -3,7 +3,8 @@ Description=Trackomatron server
 Requires=network-online.target
 BindTo=trackomatron.service
 PartOf=trackomatron.service
-After=network-online.target trackomatron.service
+Before=trackomatron.service
+After=network-online.target
 PropagatesReloadTo=trackomatron.service
 ReloadPropagatedFrom=trackomatron.service
 
@@ -18,6 +19,6 @@ ExecReload=/bin/kill -HUP $MAINPID
 KillSignal=SIGTERM
 
 [Install]
-WantedBy=multi-user.target trackomatron.service
+WantedBy=multi-user.target
 Also=trackomatron.service
 

build/trackomatron/etc/systemd/system/trackomatron.service

@@ -7,8 +7,7 @@ BindTo=trackomatron-server.service
 #propagates stop and restart (one-way)
 PartOf=trackomatron-server.service
 #order
-Before=trackomatron-server.service
-After=network-online.target
+After=network-online.target trackomatron-server.service
 #propagates reload
 PropagatesReloadTo=trackomatron-server.service
 ReloadPropagatedFrom=trackomatron-server.service
@@ -23,6 +22,6 @@ ExecReload=/bin/kill -HUP $MAINPID
 KillSignal=SIGTERM
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target trackomatron-server.service
 Also=trackomatron-server.service