diff --git a/build/Makefile b/build/Makefile index 2433fede..a47644b6 100644 --- a/build/Makefile +++ b/build/Makefile @@ -35,12 +35,12 @@ endif # Here comes the real deal ### -binaries = tendermint basecoin ethermint gaia -build-binaries = build-tendermint build-basecoin build-ethermint build-gaia -package-rpm = package-rpm-tendermint package-rpm-basecoin package-rpm-ethermint package-rpm-gaia -install-rpm = install-rpm-tendermint install-rpm-basecoin install-rpm-ethermint install-rpm-gaia -package-deb = package-deb-tendermint package-deb-basecoin package-deb-ethermint package-deb-gaia -install-deb = install-deb-tendermint install-deb-basecoin install-deb-ethermint install-deb-gaia +binaries = tendermint basecoind ethermint gaia +build-binaries = build-tendermint build-basecoind build-ethermint build-gaia +package-rpm = package-rpm-tendermint package-rpm-basecoind package-rpm-ethermint package-rpm-gaia +install-rpm = install-rpm-tendermint install-rpm-basecoind install-rpm-ethermint install-rpm-gaia +package-deb = package-deb-tendermint package-deb-basecoind package-deb-ethermint package-deb-gaia +install-deb = install-deb-tendermint install-deb-basecoind install-deb-ethermint install-deb-gaia all: $(binaries) build: $(build-binaries) @@ -83,13 +83,13 @@ build-gaia: git-branch gopath-setup export PATH=$(GOPATH)/bin:$(PATH) && $(MAKE) -C $(GOPATH)/src/github.com/cosmos/gaia get_vendor_deps install @echo "*** Built gaia" -build-basecoin: git-branch gopath-setup - @echo "*** Building basecoin from cosmos-sdk" +build-basecoind: git-branch gopath-setup + @echo "*** Building basecoind from cosmos-sdk" go get -d -u github.com/cosmos/cosmos-sdk/examples/basecoin/cmd/basecoind cd $(GOPATH)/src/github.com/cosmos/cosmos-sdk && git checkout "$(GIT_BRANCH)" && git pull export PATH=$(GOPATH)/bin:$(PATH) && $(MAKE) -C $(GOPATH)/src/github.com/cosmos/cosmos-sdk get_tools get_vendor_deps build - cp $(GOPATH)/src/github.com/cosmos/cosmos-sdk/build/basecoind $(GOPATH)/bin/basecoin - @echo "*** Built basecoin from cosmos-sdk" + cp $(GOPATH)/src/github.com/cosmos/cosmos-sdk/build/basecoind $(GOPATH)/bin/basecoind + @echo "*** Built basecoind from cosmos-sdk" ### # Prepare package files @@ -119,7 +119,7 @@ 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-gaia = -prepare-basecoin = cp $(GOPATH)/bin/basecoin $(build_folder)/usr/bin +prepare-basecoind = cp $(GOPATH)/bin/basecoind $(build_folder)/usr/bin ### # Package the binary for CentOS/RedHat (RPM) and Debian/Ubuntu (DEB) @@ -199,7 +199,7 @@ install-rpm-%: version-% cp ./RPM-GPG-KEY-Tendermint tmp/s3/7/os/x86_64/ cp ./tendermint.repo tmp/s3/7/os/x86_64/ rm -f tmp/s3/7/os/x86_64/repodata/*.bz2 tmp/s3/7/os/x86_64/repodata/*.gz tmp/s3/7/os/x86_64/repodata/repomd.xml.asc - createrepo tmp/s3/7/os/x86_64/Packages -u https://tendermint-packages.interblock.io/$(DEVOPS_PATH)centos/7/os/x86_64/Packages -o tmp/s3/7/os/x86_64 --update -S --repo Tendermint --content tendermint --content basecoin --content ethermint + createrepo tmp/s3/7/os/x86_64/Packages -u https://tendermint-packages.interblock.io/$(DEVOPS_PATH)centos/7/os/x86_64/Packages -o tmp/s3/7/os/x86_64 --update -S --repo Tendermint --content tendermint --content basecoind --content ethermint gpg --batch --passphrase "$(GPG_PASSPHRASE)" --detach-sign -a tmp/s3/7/os/x86_64/repodata/repomd.xml aws s3 sync tmp/s3/ s3://tendermint-packages/$(DEVOPS_PATH)centos/ --delete --acl public-read @echo "*** Uploaded $* to AWS $(DEVOPS_PATH)CentOS repository" @@ -281,7 +281,7 @@ distclean: clean rm -rf $(GOPATH)/src/github.com/cosmos/cosmos-sdk rm -rf $(GOPATH)/src/github.com/tendermint/ethermint rm -rf $(GOPATH)/bin/tendermint - rm -rf $(GOPATH)/bin/basecoin + rm -rf $(GOPATH)/bin/basecoind rm -rf $(GOPATH)/bin/ethermint rm -rf $(GOPATH)/bin/gaia diff --git a/build/basecoin/DEBIAN/changelog b/build/basecoin/DEBIAN/changelog deleted file mode 100644 index e316bcd3..00000000 --- a/build/basecoin/DEBIAN/changelog +++ /dev/null @@ -1,6 +0,0 @@ -basecoin (@VERSION@) @STABILITY@; urgency=medium - - * Automatic build. See https://github.com/tendermint/basecoin for more information. - - -- Greg Szabo @DATETIMESTAMP@ - diff --git a/build/basecoin/DEBIAN/control b/build/basecoin/DEBIAN/control deleted file mode 100644 index e7409126..00000000 --- a/build/basecoin/DEBIAN/control +++ /dev/null @@ -1,14 +0,0 @@ -Source: basecoin -Section: net -Priority: optional -Maintainer: Greg Szabo -Build-Depends: debhelper (>=9) -Standards-Version: 3.9.6 -Homepage: https://tendermint.com -Package: basecoin -Architecture: amd64 -Version: @VERSION@ -Installed-Size: @INSTALLEDSIZE@ -Description: basecoin is a Proof-of-Stake cryptocurrency and framework - Basecoin is an ABCI application designed to be used with the Tendermint consensus engine to form a Proof-of-Stake cryptocurrency. It also provides a general purpose framework for extending the feature-set of the cryptocurrency by implementing plugins. - diff --git a/build/basecoin/etc/systemd/system-preset/50-basecoin.preset b/build/basecoin/etc/systemd/system-preset/50-basecoin.preset deleted file mode 100644 index b35369c2..00000000 --- a/build/basecoin/etc/systemd/system-preset/50-basecoin.preset +++ /dev/null @@ -1,2 +0,0 @@ -disable basecoin.service - diff --git a/build/basecoind/DEBIAN/changelog b/build/basecoind/DEBIAN/changelog new file mode 100644 index 00000000..260718ea --- /dev/null +++ b/build/basecoind/DEBIAN/changelog @@ -0,0 +1,6 @@ +basecoind (@VERSION@) @STABILITY@; urgency=medium + + * Automatic build. See https://github.com/cosmos/cosmos-sdk for more information. + + -- Greg Szabo @DATETIMESTAMP@ + diff --git a/build/basecoin/DEBIAN/compat b/build/basecoind/DEBIAN/compat similarity index 100% rename from build/basecoin/DEBIAN/compat rename to build/basecoind/DEBIAN/compat diff --git a/build/basecoind/DEBIAN/control b/build/basecoind/DEBIAN/control new file mode 100644 index 00000000..c15d4911 --- /dev/null +++ b/build/basecoind/DEBIAN/control @@ -0,0 +1,14 @@ +Source: basecoind +Section: net +Priority: optional +Maintainer: Greg Szabo +Build-Depends: debhelper (>=9) +Standards-Version: 3.9.6 +Homepage: https://tendermint.com +Package: basecoind +Architecture: amd64 +Version: @VERSION@ +Installed-Size: @INSTALLEDSIZE@ +Description: basecoind is a Proof-of-Stake cryptocurrency and framework + Basecoind is an ABCI application designed to be used with the Tendermint consensus engine to form a Proof-of-Stake cryptocurrency. It also provides a general purpose framework for extending the feature-set of the cryptocurrency by implementing plugins. + diff --git a/build/basecoin/DEBIAN/copyright b/build/basecoind/DEBIAN/copyright similarity index 91% rename from build/basecoin/DEBIAN/copyright rename to build/basecoind/DEBIAN/copyright index 22340c79..fe449650 100644 --- a/build/basecoin/DEBIAN/copyright +++ b/build/basecoind/DEBIAN/copyright @@ -1,6 +1,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: basecoin -Source: https://github.com/tendermint/basecoin +Upstream-Name: basecoind +Source: https://github.com/cosmos/cosmos-sdk Files: * Copyright: 2017 All In Bits, Inc. diff --git a/build/basecoin/DEBIAN/postinst b/build/basecoind/DEBIAN/postinst similarity index 83% rename from build/basecoin/DEBIAN/postinst rename to build/basecoind/DEBIAN/postinst index 9bdc5867..d7d8f441 100644 --- a/build/basecoin/DEBIAN/postinst +++ b/build/basecoind/DEBIAN/postinst @@ -1,5 +1,5 @@ #!/bin/sh -# postinst script for basecoin +# postinst script for basecoind # set -e @@ -19,8 +19,8 @@ set -e case "$1" in configure) - chown basecoin.basecoin /etc/basecoin - sudo -Hu basecoin basecoin node init --home /etc/basecoin 2B24DEE2364762300168DF19B6C18BCE2D399EA2 + chown basecoind.basecoind /etc/basecoind + sudo -Hu basecoind basecoind node init --home /etc/basecoind 2B24DEE2364762300168DF19B6C18BCE2D399EA2 systemctl daemon-reload ;; diff --git a/build/basecoin/DEBIAN/postrm b/build/basecoind/DEBIAN/postrm similarity index 100% rename from build/basecoin/DEBIAN/postrm rename to build/basecoind/DEBIAN/postrm diff --git a/build/basecoin/DEBIAN/preinst b/build/basecoind/DEBIAN/preinst similarity index 79% rename from build/basecoin/DEBIAN/preinst rename to build/basecoind/DEBIAN/preinst index 8fc1ec82..53124c0c 100644 --- a/build/basecoin/DEBIAN/preinst +++ b/build/basecoind/DEBIAN/preinst @@ -1,5 +1,5 @@ #!/bin/sh -# preinst script for basecoin +# preinst script for basecoind # set -e @@ -15,9 +15,9 @@ set -e case "$1" in install|upgrade) - if ! grep -q '^basecoin:' /etc/passwd ; then - useradd -k /dev/null -r -m -b /etc basecoin - chmod 755 /etc/basecoin + if ! grep -q '^basecoind:' /etc/passwd ; then + useradd -k /dev/null -r -m -b /etc basecoind + chmod 755 /etc/basecoind fi ;; diff --git a/build/basecoin/DEBIAN/prerm b/build/basecoind/DEBIAN/prerm similarity index 94% rename from build/basecoin/DEBIAN/prerm rename to build/basecoind/DEBIAN/prerm index 389f4026..18ef4207 100644 --- a/build/basecoin/DEBIAN/prerm +++ b/build/basecoind/DEBIAN/prerm @@ -18,7 +18,7 @@ set -e case "$1" in remove|upgrade|deconfigure) - systemctl stop basecoin 2> /dev/null || : + systemctl stop basecoind 2> /dev/null || : ;; failed-upgrade) diff --git a/build/basecoind/etc/systemd/system-preset/50-basecoind.preset b/build/basecoind/etc/systemd/system-preset/50-basecoind.preset new file mode 100644 index 00000000..358334fc --- /dev/null +++ b/build/basecoind/etc/systemd/system-preset/50-basecoind.preset @@ -0,0 +1,2 @@ +disable basecoind.service + diff --git a/build/basecoin/etc/systemd/system/basecoin.service b/build/basecoind/etc/systemd/system/basecoind.service similarity index 82% rename from build/basecoin/etc/systemd/system/basecoin.service rename to build/basecoind/etc/systemd/system/basecoind.service index 27878ff7..438acfa6 100644 --- a/build/basecoin/etc/systemd/system/basecoin.service +++ b/build/basecoind/etc/systemd/system/basecoind.service @@ -1,10 +1,10 @@ [Unit] -Description=Basecoin +Description=Basecoind Requires=network-online.target After=network-online.target [Service] -Environment="BCHOME=/etc/basecoin" +Environment="BCHOME=/etc/basecoind" Restart=on-failure User=basecoin Group=basecoin diff --git a/build/basecoin/usr/share/basecoin/key.json b/build/basecoind/usr/share/basecoind/key.json similarity index 100% rename from build/basecoin/usr/share/basecoin/key.json rename to build/basecoind/usr/share/basecoind/key.json diff --git a/build/basecoin/usr/share/basecoin/key2.json b/build/basecoind/usr/share/basecoind/key2.json similarity index 100% rename from build/basecoin/usr/share/basecoin/key2.json rename to build/basecoind/usr/share/basecoind/key2.json diff --git a/build/spectemplates/basecoin.data b/build/spectemplates/basecoin.data deleted file mode 100644 index b5e0f372..00000000 --- a/build/spectemplates/basecoin.data +++ /dev/null @@ -1,5 +0,0 @@ -PACKAGE_SUMMARY="basecoin is a Proof-of-Stake cryptocurrency and framework" -PACKAGE_URL="https://cosmos.network/" -PACKAGE_ADDITIONAL_HEADER="Provides: basecoin" -PACKAGE_DESCRIPTION="Basecoin is an ABCI application designed to be used with the Tendermint consensus engine to form a Proof-of-Stake cryptocurrency. It also provides a general purpose framework for extending the feature-set of the cryptocurrency by implementing plugins." - diff --git a/build/spectemplates/basecoind.data b/build/spectemplates/basecoind.data new file mode 100644 index 00000000..36b172ec --- /dev/null +++ b/build/spectemplates/basecoind.data @@ -0,0 +1,5 @@ +PACKAGE_SUMMARY="basecoind is a Proof-of-Stake cryptocurrency and framework" +PACKAGE_URL="https://cosmos.network/" +PACKAGE_ADDITIONAL_HEADER="Provides: basecoind" +PACKAGE_DESCRIPTION="Basecoind is an ABCI application designed to be used with the Tendermint consensus engine to form a Proof-of-Stake cryptocurrency. It also provides a general purpose framework for extending the feature-set of the cryptocurrency by implementing plugins." +