From 516e872346109725cd1cac86e138abd7e885ecc6 Mon Sep 17 00:00:00 2001 From: Greg Szabo Date: Wed, 12 Jul 2017 18:05:50 +0000 Subject: [PATCH] Package build refactor: removed dependency on rpmbuild for DEB packages, cleaned up folder structure --- {devops/rpmbuild => build}/.gitignore | 0 build/LICENSE | 204 ++++++++++++++++++ {devops/rpmbuild => build}/Makefile | 113 ++++++---- .../RPM-GPG-KEY-Tendermint | 0 {devops/rpmbuild/repofiles => build}/Release | 0 .../repofiles => build}/Release_amd64 | 0 {devops/rpmbuild/extrafiles => build}/_gpg | 0 .../basecoin/DEBIAN}/changelog | 0 .../basecoin/DEBIAN}/compat | 0 .../basecoin/DEBIAN}/control | 0 .../basecoin/DEBIAN}/copyright | 0 .../basecoin/DEBIAN}/postinst | 0 .../basecoin/DEBIAN}/postrm | 0 .../basecoin/DEBIAN}/preinst | 0 .../basecoin/DEBIAN}/prerm | 0 .../systemd/system-preset/50-basecoin.preset | 0 .../systemd/system/basecoin-server.service | 0 .../etc/systemd/system/basecoin.service | 0 .../basecoin/usr/share/basecoin/key.json | 0 .../basecoin/usr/share/basecoin/key2.json | 0 .../ethermint/DEBIAN}/changelog | 0 .../ethermint/DEBIAN}/compat | 0 .../ethermint/DEBIAN}/control | 0 .../ethermint/DEBIAN}/copyright | 0 .../ethermint/DEBIAN}/postinst | 0 .../ethermint/DEBIAN}/postrm | 0 .../ethermint/DEBIAN}/preinst | 0 .../ethermint/DEBIAN}/prerm | 0 .../systemd/system-preset/50-ethermint.preset | 0 .../systemd/system/ethermint-server.service | 0 .../etc/systemd/system/ethermint.service | 0 .../gaia/DEBIAN}/changelog | 0 .../DEBIAN-gaia => build/gaia/DEBIAN}/compat | 0 .../DEBIAN-gaia => build/gaia/DEBIAN}/control | 0 .../gaia/DEBIAN}/copyright | 0 .../gaia/DEBIAN}/postinst | 0 .../DEBIAN-gaia => build/gaia/DEBIAN}/postrm | 0 .../DEBIAN-gaia => build/gaia/DEBIAN}/preinst | 0 .../DEBIAN-gaia => build/gaia/DEBIAN}/prerm | 0 .../etc/systemd/system-preset/50-gaia.preset | 0 .../etc/systemd/system/gaia-server.service | 0 .../gaia/etc/systemd/system/gaia.service | 0 .../gaia/usr/share/gaia/key.json | 0 .../gaia/usr/share/gaia/key2.json | 0 build/rpmmacros | 6 + {devops/rpmbuild => build}/sign | 0 .../spectemplates/basecoin.spec | 23 +- .../spectemplates/ethermint.spec | 23 +- .../spectemplates/gaia.spec | 27 +-- .../spectemplates/tendermint.spec | 13 +- .../spectemplates/trackomatron.spec | 23 +- .../repofiles => build}/tendermint.repo | 0 .../tendermint/DEBIAN}/changelog | 0 .../tendermint/DEBIAN}/compat | 0 .../tendermint/DEBIAN}/control | 0 .../tendermint/DEBIAN}/copyright | 0 .../trackomatron/DEBIAN}/changelog | 0 .../trackomatron/DEBIAN}/compat | 0 .../trackomatron/DEBIAN}/control | 0 .../trackomatron/DEBIAN}/copyright | 0 .../trackomatron/DEBIAN}/postinst | 0 .../trackomatron/DEBIAN}/postrm | 0 .../trackomatron/DEBIAN}/preinst | 0 .../trackomatron/DEBIAN}/prerm | 0 .../system-preset/50-trackomatron.preset | 0 .../system/trackomatron-server.service | 0 .../etc/systemd/system/trackomatron.service | 0 .../usr/share/trackomatron/key.json | 0 .../usr/share/trackomatron/key2.json | 0 devops/rpmbuild/repofiles/tendermint-dev.repo | 12 -- devops/rpmbuild/rpmmacros | 6 - 71 files changed, 313 insertions(+), 137 deletions(-) rename {devops/rpmbuild => build}/.gitignore (100%) create mode 100644 build/LICENSE rename {devops/rpmbuild => build}/Makefile (78%) rename {devops/rpmbuild/repofiles => build}/RPM-GPG-KEY-Tendermint (100%) rename {devops/rpmbuild/repofiles => build}/Release (100%) rename {devops/rpmbuild/repofiles => build}/Release_amd64 (100%) rename {devops/rpmbuild/extrafiles => build}/_gpg (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-basecoin => build/basecoin/DEBIAN}/changelog (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-basecoin => build/basecoin/DEBIAN}/compat (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-basecoin => build/basecoin/DEBIAN}/control (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-basecoin => build/basecoin/DEBIAN}/copyright (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-basecoin => build/basecoin/DEBIAN}/postinst (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-basecoin => build/basecoin/DEBIAN}/postrm (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-basecoin => build/basecoin/DEBIAN}/preinst (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-basecoin => build/basecoin/DEBIAN}/prerm (100%) rename {devops/rpmbuild/extrafiles => build}/basecoin/etc/systemd/system-preset/50-basecoin.preset (100%) rename {devops/rpmbuild/extrafiles => build}/basecoin/etc/systemd/system/basecoin-server.service (100%) rename {devops/rpmbuild/extrafiles => build}/basecoin/etc/systemd/system/basecoin.service (100%) rename {devops/rpmbuild/extrafiles => build}/basecoin/usr/share/basecoin/key.json (100%) rename {devops/rpmbuild/extrafiles => build}/basecoin/usr/share/basecoin/key2.json (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-ethermint => build/ethermint/DEBIAN}/changelog (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-ethermint => build/ethermint/DEBIAN}/compat (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-ethermint => build/ethermint/DEBIAN}/control (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-ethermint => build/ethermint/DEBIAN}/copyright (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-ethermint => build/ethermint/DEBIAN}/postinst (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-ethermint => build/ethermint/DEBIAN}/postrm (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-ethermint => build/ethermint/DEBIAN}/preinst (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-ethermint => build/ethermint/DEBIAN}/prerm (100%) rename {devops/rpmbuild/extrafiles => build}/ethermint/etc/systemd/system-preset/50-ethermint.preset (100%) rename {devops/rpmbuild/extrafiles => build}/ethermint/etc/systemd/system/ethermint-server.service (100%) rename {devops/rpmbuild/extrafiles => build}/ethermint/etc/systemd/system/ethermint.service (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-gaia => build/gaia/DEBIAN}/changelog (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-gaia => build/gaia/DEBIAN}/compat (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-gaia => build/gaia/DEBIAN}/control (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-gaia => build/gaia/DEBIAN}/copyright (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-gaia => build/gaia/DEBIAN}/postinst (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-gaia => build/gaia/DEBIAN}/postrm (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-gaia => build/gaia/DEBIAN}/preinst (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-gaia => build/gaia/DEBIAN}/prerm (100%) rename {devops/rpmbuild/extrafiles => build}/gaia/etc/systemd/system-preset/50-gaia.preset (100%) rename {devops/rpmbuild/extrafiles => build}/gaia/etc/systemd/system/gaia-server.service (100%) rename {devops/rpmbuild/extrafiles => build}/gaia/etc/systemd/system/gaia.service (100%) rename {devops/rpmbuild/extrafiles => build}/gaia/usr/share/gaia/key.json (100%) rename {devops/rpmbuild/extrafiles => build}/gaia/usr/share/gaia/key2.json (100%) create mode 100644 build/rpmmacros rename {devops/rpmbuild => build}/sign (100%) rename {devops/rpmbuild => build}/spectemplates/basecoin.spec (75%) rename {devops/rpmbuild => build}/spectemplates/ethermint.spec (65%) rename {devops/rpmbuild => build}/spectemplates/gaia.spec (67%) rename {devops/rpmbuild => build}/spectemplates/tendermint.spec (68%) rename {devops/rpmbuild => build}/spectemplates/trackomatron.spec (75%) rename {devops/rpmbuild/repofiles => build}/tendermint.repo (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-tendermint => build/tendermint/DEBIAN}/changelog (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-tendermint => build/tendermint/DEBIAN}/compat (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-tendermint => build/tendermint/DEBIAN}/control (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-tendermint => build/tendermint/DEBIAN}/copyright (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-trackomatron => build/trackomatron/DEBIAN}/changelog (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-trackomatron => build/trackomatron/DEBIAN}/compat (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-trackomatron => build/trackomatron/DEBIAN}/control (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-trackomatron => build/trackomatron/DEBIAN}/copyright (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-trackomatron => build/trackomatron/DEBIAN}/postinst (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-trackomatron => build/trackomatron/DEBIAN}/postrm (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-trackomatron => build/trackomatron/DEBIAN}/preinst (100%) rename {devops/rpmbuild/extrafiles/DEBIAN-trackomatron => build/trackomatron/DEBIAN}/prerm (100%) rename {devops/rpmbuild/extrafiles => build}/trackomatron/etc/systemd/system-preset/50-trackomatron.preset (100%) rename {devops/rpmbuild/extrafiles => build}/trackomatron/etc/systemd/system/trackomatron-server.service (100%) rename {devops/rpmbuild/extrafiles => build}/trackomatron/etc/systemd/system/trackomatron.service (100%) rename {devops/rpmbuild/extrafiles => build}/trackomatron/usr/share/trackomatron/key.json (100%) rename {devops/rpmbuild/extrafiles => build}/trackomatron/usr/share/trackomatron/key2.json (100%) delete mode 100644 devops/rpmbuild/repofiles/tendermint-dev.repo delete mode 100644 devops/rpmbuild/rpmmacros diff --git a/devops/rpmbuild/.gitignore b/build/.gitignore similarity index 100% rename from devops/rpmbuild/.gitignore rename to build/.gitignore diff --git a/build/LICENSE b/build/LICENSE new file mode 100644 index 000000000..bb66bb350 --- /dev/null +++ b/build/LICENSE @@ -0,0 +1,204 @@ +Tendermint Core +License: Apache2.0 + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2016 All in Bits, Inc + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/devops/rpmbuild/Makefile b/build/Makefile similarity index 78% rename from devops/rpmbuild/Makefile rename to build/Makefile index 23493343c..5d6ae1e9f 100644 --- a/devops/rpmbuild/Makefile +++ b/build/Makefile @@ -46,12 +46,11 @@ install: $(install-rpm) $(install-deb) $(binaries): %: build-% package-rpm-% package-deb-% ### -# Building the binaries is not in the spec file, because in the spec file you already need to know the version number +# Build the binaries ### git-branch: - $(eval $GIT_BRANCH=$(shell test -z "$(GIT_BRANCH)" && echo "master" || echo "$(GIT_BRANCH)" )) - + $(eval GIT_BRANCH=$(shell echo $${GIT_BRANCH:-master})) build-tendermint: git-branch @echo "*** Building tendermint" @@ -81,7 +80,7 @@ build-trackomatron: git-branch go get -d -u go github.com/tendermint/trackomatron/cmd/tracko cd $(GOPATH)/src/github.com/tendermint/trackomatron && git checkout "$(GIT_BRANCH)" && git pull $(MAKE) -C $(GOPATH)/src/github.com/tendermint/trackomatron get_vendor_deps install - @echo "Workaround: trackomatron package has tracko as the binary - trackomatron needed to get the version number" && rm -rf $(GOPATH)/bin/trackomatron && ln -s $(GOPATH)/bin/tracko $(GOPATH)/bin/trackomatron + @echo "Workaround: trackomatron package has tracko as the binary - trackomatron needed for proper packaging" && rm -rf $(GOPATH)/bin/trackomatron && ln -s $(GOPATH)/bin/tracko $(GOPATH)/bin/trackomatron @echo "*** Built trackomatron" build-gaia: git-branch @@ -91,49 +90,87 @@ build-gaia: git-branch $(MAKE) -C $(GOPATH)/src/github.com/cosmos/gaia get_vendor_deps install @echo "*** Built gaia" +### +# Prepare package build +### + +# set app_version version-%: $(GOPATH)/bin/% if [ -z "$(BUILD_NUMBER)" ]; then echo "BUILD_NUMBER not set" ; false ; fi $(eval $*_version=$(shell $< version | cut -d- -f1 )) -prepare-spec-%: version-% - mkdir -p {SPECS,tmp} - echo "Version: $($*_version)" > SPECS/$*.spec - echo "Release: $(BUILD_NUMBER)" >> SPECS/$*.spec - cat spectemplates/$*.spec >> SPECS/$*.spec +folder-%: version-% + $(eval build_folder=BUILD/$*-$($*_version)-$(BUILD_NUMBER)) + +# Copy files - generic +prepare-files-%: folder-% + rm -rf $(build_folder) + mkdir -p $(build_folder) + cp -r ./$*/* $(build_folder) + mkdir -p $(build_folder)/usr/bin + cp $(GOPATH)/bin/$* $(build_folder)/usr/bin + +prepare-custom-tendermint: prepare-files-tendermint + +prepare-custom-basecoin: prepare-files-basecoin + cp $(GOPATH)/bin/basecli $(build_folder)/usr/bin + +prepare-custom-ethermint: prepare-files-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-custom-trackomatron: prepare-files-trackomatron + rm -f $(build_folder)/usr/bin/trackomatron + cp $(GOPATH)/bin/tracko $(GOPATH)/bin/trackocli $(build_folder)/usr/bin + +prepare-custom-gaia: prepare-files-gaia + +### +# Package the binary for CentOS/RedHat (RPM) and Debian/Ubuntu (DEB) +### -package-rpm-%: prepare-spec-% +# Depends on rpmbuild, sorry, this can only be built on CentOS/RedHat machines. +package-rpm-%: prepare-custom-% @echo "*** Packaging RPM $* version $($*_version)" - script + + rm -rf $(build_folder)/DEBIAN + mkdir -p $(build_folder)/usr/share/licenses/$* + cp ./LICENSE $(build_folder)/usr/share/licenses/$*/LICENSE + chmod -Rf a+rX,u+w,g-w,o-w $(build_folder) + + mkdir -p {SPECS,tmp} + + cp ./spectemplates/$*.spec SPECS + sed -i "s/@VERSION@/$($*_version)/" SPECS/$*.spec + sed -i "s/@BUILD_NUMBER@/$(BUILD_NUMBER)/" SPECS/$*.spec + rpmbuild -bb SPECS/$*.spec ./sign RPMS/x86_64/$*-$($*_version)-$(BUILD_NUMBER).x86_64.rpm rpm -Kv RPMS/x86_64/$*-$($*_version)-$(BUILD_NUMBER).x86_64.rpm @echo "*** Packaged RPM $* version $($*_version)" -package-deb-%: version-% +package-deb-%: prepare-custom-% @echo "*** Packaging DEB $* version $($*_version)-$(BUILD_NUMBER)" - echo "BUILD/$*-$($*_version) folder is generated by package-rpm-$*" - test -d BUILD/$*-$($*_version) - rm -rf BUILD/$*-$($*_version)-$(BUILD_NUMBER) tmp/_gpg tmp/_gpgbuilder tmp/debian-binary tmp/control.tar.gz tmp/data.tar.xz - cp -r BUILD/$*-$($*_version) BUILD/$*-$($*_version)-$(BUILD_NUMBER) - - cp -r extrafiles/DEBIAN-$* BUILD/$*-$($*_version)-$(BUILD_NUMBER)/DEBIAN - sed -i "s/@VERSION@/$($*_version)-$(BUILD_NUMBER)/" BUILD/$*-$($*_version)-$(BUILD_NUMBER)/DEBIAN/changelog - sed -i "s/@STABILITY@/stable/" BUILD/$*-$($*_version)-$(BUILD_NUMBER)/DEBIAN/changelog - sed -i "s/@DATETIMESTAMP@/`date +%a,\ %d\ %b\ %Y\ %T\ %z`/" BUILD/$*-$($*_version)-$(BUILD_NUMBER)/DEBIAN/changelog - sed -i "s/@VERSION@/$($*_version)-$(BUILD_NUMBER)/" BUILD/$*-$($*_version)-$(BUILD_NUMBER)/DEBIAN/control - - rm -rf BUILD/$*-$($*_version)-$(BUILD_NUMBER)/usr/share/licenses - mkdir -p BUILD/$*-$($*_version)-$(BUILD_NUMBER)/usr/share/doc/$* - cp BUILD/$*-$($*_version)-$(BUILD_NUMBER)/DEBIAN/copyright BUILD/$*-$($*_version)-$(BUILD_NUMBER)/usr/share/doc/$* - gzip -c BUILD/$*-$($*_version)-$(BUILD_NUMBER)/DEBIAN/changelog > BUILD/$*-$($*_version)-$(BUILD_NUMBER)/usr/share/doc/$*/changelog.Debian.gz - gzip -c BUILD/$*-$($*_version)-$(BUILD_NUMBER)/DEBIAN/changelog > BUILD/$*-$($*_version)-$(BUILD_NUMBER)/usr/share/doc/$*/changelog.Debian.amd64.gz - - sed -i "s/@INSTALLEDSIZE@/`du -ks BUILD/$*-$($*_version)-$(BUILD_NUMBER) | cut -f 1`/" BUILD/$*-$($*_version)-$(BUILD_NUMBER)/DEBIAN/control - cd BUILD/$*-$($*_version)-$(BUILD_NUMBER) && tar --owner=root --group=root -cvJf ../../tmp/data.tar.xz --exclude DEBIAN * - cd BUILD/$*-$($*_version)-$(BUILD_NUMBER)/DEBIAN && tar --owner=root --group=root -cvzf ../../../tmp/control.tar.gz * + + mkdir -p $(build_folder)/usr/share/doc/$* + cp $(build_folder)/DEBIAN/copyright $(build_folder)/usr/share/doc/$* + chmod -Rf a+rX,u+w,g-w,o-w $(build_folder) + + sed -i "s/@VERSION@/$($*_version)-$(BUILD_NUMBER)/" $(build_folder)/DEBIAN/changelog + sed -i "s/@STABILITY@/stable/" $(build_folder)/DEBIAN/changelog + sed -i "s/@DATETIMESTAMP@/`date +%a,\ %d\ %b\ %Y\ %T\ %z`/" $(build_folder)/DEBIAN/changelog + sed -i "s/@VERSION@/$($*_version)-$(BUILD_NUMBER)/" $(build_folder)/DEBIAN/control + + gzip -c $(build_folder)/DEBIAN/changelog > $(build_folder)/usr/share/doc/$*/changelog.Debian.gz + gzip -c $(build_folder)/DEBIAN/changelog > $(build_folder)/usr/share/doc/$*/changelog.Debian.amd64.gz + sed -i "s/@INSTALLEDSIZE@/`du -ks $(build_folder) | cut -f 1`/" $(build_folder)/DEBIAN/control + + cd $(build_folder) && tar --owner=root --group=root -cvJf ../../tmp/data.tar.xz --exclude DEBIAN * + cd $(build_folder)/DEBIAN && tar --owner=root --group=root -cvzf ../../../tmp/control.tar.gz * echo "2.0" > tmp/debian-binary - cp extrafiles/_gpg tmp/ + cp ./_gpg tmp/ cd tmp && sed -i "s/@DATETIMESTAMP@/`date +%a\ %b\ %d\ %T\ %Y`/" _gpg cd tmp && sed -i "s/@BINMD5@/`md5sum debian-binary | cut -d\ -f1`/" _gpg cd tmp && sed -i "s/@BINSHA1@/`sha1sum debian-binary | cut -d\ -f1`/" _gpg @@ -157,8 +194,8 @@ install-rpm-%: version-% aws s3 sync s3://tendermint-packages/centos/ tmp/s3/ --delete mkdir -p tmp/s3/7/os/x86_64/Packages cp RPMS/x86_64/$*-$($*_version)-$(BUILD_NUMBER).x86_64.rpm tmp/s3/7/os/x86_64/Packages - cp repofiles/RPM-GPG-KEY-Tendermint tmp/s3/7/os/x86_64/ - cp repofiles/tendermint.repo tmp/s3/7/os/x86_64/ + 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 http://tendermint-packages.s3-website-us-west-1.amazonaws.com/centos/7/os/x86_64/Packages -o tmp/s3/7/os/x86_64 --update -S --repo Tendermint --content tendermint --content basecoin --content ethermint gpg --batch --passphrase "$(GPG_PASSPHRASE)" --detach-sign -a tmp/s3/7/os/x86_64/repodata/repomd.xml @@ -174,7 +211,7 @@ install-deb-%: version-% test ! -f tmp/debian-s3/pool/$*-$($*_version)-$(BUILD_NUMBER)_amd64.deb mkdir -p tmp/debian-s3/pool tmp/debian-s3/dists/stable/main/binary-amd64 cp RPMS/$*-$($*_version)-$(BUILD_NUMBER)_amd64.deb tmp/debian-s3/pool - cp repofiles/Release_amd64 tmp/debian-s3/dists/stable/main/binary-amd64/Release + cp ./Release_amd64 tmp/debian-s3/dists/stable/main/binary-amd64/Release #Packages / Packages.gz @@ -193,7 +230,7 @@ install-deb-%: version-% #main / Release / InRelease / Release.gpg - cp repofiles/Release tmp/debian-s3/dists/stable/main/Release + cp ./Release tmp/debian-s3/dists/stable/main/Release rm -f tmp/debian-s3/dists/stable/main/InRelease rm -f tmp/debian-s3/dists/stable/main/Release.gpg @@ -211,7 +248,7 @@ install-deb-%: version-% #stable / Release / InRelease / Release.gpg - cp repofiles/Release tmp/debian-s3/dists/stable/Release + cp ./Release tmp/debian-s3/dists/stable/Release rm -f tmp/debian-s3/dists/stable/InRelease rm -f tmp/debian-s3/dists/stable/Release.gpg diff --git a/devops/rpmbuild/repofiles/RPM-GPG-KEY-Tendermint b/build/RPM-GPG-KEY-Tendermint similarity index 100% rename from devops/rpmbuild/repofiles/RPM-GPG-KEY-Tendermint rename to build/RPM-GPG-KEY-Tendermint diff --git a/devops/rpmbuild/repofiles/Release b/build/Release similarity index 100% rename from devops/rpmbuild/repofiles/Release rename to build/Release diff --git a/devops/rpmbuild/repofiles/Release_amd64 b/build/Release_amd64 similarity index 100% rename from devops/rpmbuild/repofiles/Release_amd64 rename to build/Release_amd64 diff --git a/devops/rpmbuild/extrafiles/_gpg b/build/_gpg similarity index 100% rename from devops/rpmbuild/extrafiles/_gpg rename to build/_gpg diff --git a/devops/rpmbuild/extrafiles/DEBIAN-basecoin/changelog b/build/basecoin/DEBIAN/changelog similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-basecoin/changelog rename to build/basecoin/DEBIAN/changelog diff --git a/devops/rpmbuild/extrafiles/DEBIAN-basecoin/compat b/build/basecoin/DEBIAN/compat similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-basecoin/compat rename to build/basecoin/DEBIAN/compat diff --git a/devops/rpmbuild/extrafiles/DEBIAN-basecoin/control b/build/basecoin/DEBIAN/control similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-basecoin/control rename to build/basecoin/DEBIAN/control diff --git a/devops/rpmbuild/extrafiles/DEBIAN-basecoin/copyright b/build/basecoin/DEBIAN/copyright similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-basecoin/copyright rename to build/basecoin/DEBIAN/copyright diff --git a/devops/rpmbuild/extrafiles/DEBIAN-basecoin/postinst b/build/basecoin/DEBIAN/postinst similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-basecoin/postinst rename to build/basecoin/DEBIAN/postinst diff --git a/devops/rpmbuild/extrafiles/DEBIAN-basecoin/postrm b/build/basecoin/DEBIAN/postrm similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-basecoin/postrm rename to build/basecoin/DEBIAN/postrm diff --git a/devops/rpmbuild/extrafiles/DEBIAN-basecoin/preinst b/build/basecoin/DEBIAN/preinst similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-basecoin/preinst rename to build/basecoin/DEBIAN/preinst diff --git a/devops/rpmbuild/extrafiles/DEBIAN-basecoin/prerm b/build/basecoin/DEBIAN/prerm similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-basecoin/prerm rename to build/basecoin/DEBIAN/prerm diff --git a/devops/rpmbuild/extrafiles/basecoin/etc/systemd/system-preset/50-basecoin.preset b/build/basecoin/etc/systemd/system-preset/50-basecoin.preset similarity index 100% rename from devops/rpmbuild/extrafiles/basecoin/etc/systemd/system-preset/50-basecoin.preset rename to build/basecoin/etc/systemd/system-preset/50-basecoin.preset diff --git a/devops/rpmbuild/extrafiles/basecoin/etc/systemd/system/basecoin-server.service b/build/basecoin/etc/systemd/system/basecoin-server.service similarity index 100% rename from devops/rpmbuild/extrafiles/basecoin/etc/systemd/system/basecoin-server.service rename to build/basecoin/etc/systemd/system/basecoin-server.service diff --git a/devops/rpmbuild/extrafiles/basecoin/etc/systemd/system/basecoin.service b/build/basecoin/etc/systemd/system/basecoin.service similarity index 100% rename from devops/rpmbuild/extrafiles/basecoin/etc/systemd/system/basecoin.service rename to build/basecoin/etc/systemd/system/basecoin.service diff --git a/devops/rpmbuild/extrafiles/basecoin/usr/share/basecoin/key.json b/build/basecoin/usr/share/basecoin/key.json similarity index 100% rename from devops/rpmbuild/extrafiles/basecoin/usr/share/basecoin/key.json rename to build/basecoin/usr/share/basecoin/key.json diff --git a/devops/rpmbuild/extrafiles/basecoin/usr/share/basecoin/key2.json b/build/basecoin/usr/share/basecoin/key2.json similarity index 100% rename from devops/rpmbuild/extrafiles/basecoin/usr/share/basecoin/key2.json rename to build/basecoin/usr/share/basecoin/key2.json diff --git a/devops/rpmbuild/extrafiles/DEBIAN-ethermint/changelog b/build/ethermint/DEBIAN/changelog similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-ethermint/changelog rename to build/ethermint/DEBIAN/changelog diff --git a/devops/rpmbuild/extrafiles/DEBIAN-ethermint/compat b/build/ethermint/DEBIAN/compat similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-ethermint/compat rename to build/ethermint/DEBIAN/compat diff --git a/devops/rpmbuild/extrafiles/DEBIAN-ethermint/control b/build/ethermint/DEBIAN/control similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-ethermint/control rename to build/ethermint/DEBIAN/control diff --git a/devops/rpmbuild/extrafiles/DEBIAN-ethermint/copyright b/build/ethermint/DEBIAN/copyright similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-ethermint/copyright rename to build/ethermint/DEBIAN/copyright diff --git a/devops/rpmbuild/extrafiles/DEBIAN-ethermint/postinst b/build/ethermint/DEBIAN/postinst similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-ethermint/postinst rename to build/ethermint/DEBIAN/postinst diff --git a/devops/rpmbuild/extrafiles/DEBIAN-ethermint/postrm b/build/ethermint/DEBIAN/postrm similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-ethermint/postrm rename to build/ethermint/DEBIAN/postrm diff --git a/devops/rpmbuild/extrafiles/DEBIAN-ethermint/preinst b/build/ethermint/DEBIAN/preinst similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-ethermint/preinst rename to build/ethermint/DEBIAN/preinst diff --git a/devops/rpmbuild/extrafiles/DEBIAN-ethermint/prerm b/build/ethermint/DEBIAN/prerm similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-ethermint/prerm rename to build/ethermint/DEBIAN/prerm diff --git a/devops/rpmbuild/extrafiles/ethermint/etc/systemd/system-preset/50-ethermint.preset b/build/ethermint/etc/systemd/system-preset/50-ethermint.preset similarity index 100% rename from devops/rpmbuild/extrafiles/ethermint/etc/systemd/system-preset/50-ethermint.preset rename to build/ethermint/etc/systemd/system-preset/50-ethermint.preset diff --git a/devops/rpmbuild/extrafiles/ethermint/etc/systemd/system/ethermint-server.service b/build/ethermint/etc/systemd/system/ethermint-server.service similarity index 100% rename from devops/rpmbuild/extrafiles/ethermint/etc/systemd/system/ethermint-server.service rename to build/ethermint/etc/systemd/system/ethermint-server.service diff --git a/devops/rpmbuild/extrafiles/ethermint/etc/systemd/system/ethermint.service b/build/ethermint/etc/systemd/system/ethermint.service similarity index 100% rename from devops/rpmbuild/extrafiles/ethermint/etc/systemd/system/ethermint.service rename to build/ethermint/etc/systemd/system/ethermint.service diff --git a/devops/rpmbuild/extrafiles/DEBIAN-gaia/changelog b/build/gaia/DEBIAN/changelog similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-gaia/changelog rename to build/gaia/DEBIAN/changelog diff --git a/devops/rpmbuild/extrafiles/DEBIAN-gaia/compat b/build/gaia/DEBIAN/compat similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-gaia/compat rename to build/gaia/DEBIAN/compat diff --git a/devops/rpmbuild/extrafiles/DEBIAN-gaia/control b/build/gaia/DEBIAN/control similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-gaia/control rename to build/gaia/DEBIAN/control diff --git a/devops/rpmbuild/extrafiles/DEBIAN-gaia/copyright b/build/gaia/DEBIAN/copyright similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-gaia/copyright rename to build/gaia/DEBIAN/copyright diff --git a/devops/rpmbuild/extrafiles/DEBIAN-gaia/postinst b/build/gaia/DEBIAN/postinst similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-gaia/postinst rename to build/gaia/DEBIAN/postinst diff --git a/devops/rpmbuild/extrafiles/DEBIAN-gaia/postrm b/build/gaia/DEBIAN/postrm similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-gaia/postrm rename to build/gaia/DEBIAN/postrm diff --git a/devops/rpmbuild/extrafiles/DEBIAN-gaia/preinst b/build/gaia/DEBIAN/preinst similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-gaia/preinst rename to build/gaia/DEBIAN/preinst diff --git a/devops/rpmbuild/extrafiles/DEBIAN-gaia/prerm b/build/gaia/DEBIAN/prerm similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-gaia/prerm rename to build/gaia/DEBIAN/prerm diff --git a/devops/rpmbuild/extrafiles/gaia/etc/systemd/system-preset/50-gaia.preset b/build/gaia/etc/systemd/system-preset/50-gaia.preset similarity index 100% rename from devops/rpmbuild/extrafiles/gaia/etc/systemd/system-preset/50-gaia.preset rename to build/gaia/etc/systemd/system-preset/50-gaia.preset diff --git a/devops/rpmbuild/extrafiles/gaia/etc/systemd/system/gaia-server.service b/build/gaia/etc/systemd/system/gaia-server.service similarity index 100% rename from devops/rpmbuild/extrafiles/gaia/etc/systemd/system/gaia-server.service rename to build/gaia/etc/systemd/system/gaia-server.service diff --git a/devops/rpmbuild/extrafiles/gaia/etc/systemd/system/gaia.service b/build/gaia/etc/systemd/system/gaia.service similarity index 100% rename from devops/rpmbuild/extrafiles/gaia/etc/systemd/system/gaia.service rename to build/gaia/etc/systemd/system/gaia.service diff --git a/devops/rpmbuild/extrafiles/gaia/usr/share/gaia/key.json b/build/gaia/usr/share/gaia/key.json similarity index 100% rename from devops/rpmbuild/extrafiles/gaia/usr/share/gaia/key.json rename to build/gaia/usr/share/gaia/key.json diff --git a/devops/rpmbuild/extrafiles/gaia/usr/share/gaia/key2.json b/build/gaia/usr/share/gaia/key2.json similarity index 100% rename from devops/rpmbuild/extrafiles/gaia/usr/share/gaia/key2.json rename to build/gaia/usr/share/gaia/key2.json diff --git a/build/rpmmacros b/build/rpmmacros new file mode 100644 index 000000000..6af30c890 --- /dev/null +++ b/build/rpmmacros @@ -0,0 +1,6 @@ +%_topdir %(echo $WORKSPACE)/tools/build +%_tmppath %(echo $WORKSPACE)/tools/build/tmp +%_signature gpg +%_gpg_name 2122CBE9 +%_gpgbin /usr/bin/gpg + diff --git a/devops/rpmbuild/sign b/build/sign similarity index 100% rename from devops/rpmbuild/sign rename to build/sign diff --git a/devops/rpmbuild/spectemplates/basecoin.spec b/build/spectemplates/basecoin.spec similarity index 75% rename from devops/rpmbuild/spectemplates/basecoin.spec rename to build/spectemplates/basecoin.spec index eed8562b4..b8336ad94 100644 --- a/devops/rpmbuild/spectemplates/basecoin.spec +++ b/build/spectemplates/basecoin.spec @@ -1,3 +1,5 @@ +Version: @VERSION@ +Release: @BUILD_NUMBER@ %define __spec_install_post %{nil} %define debug_package %{nil} @@ -21,26 +23,13 @@ if ! %{__grep} -q '^%{name}:' /etc/passwd ; then fi %prep -test -d "$GOPATH" || echo "GOPATH not set" -test -d "$GOPATH" - -%{__mkdir_p} %{name}-%{version} -cd %{name}-%{version} - -%{__mkdir_p} .%{_bindir} .%{_defaultlicensedir}/%{name} .%{_sysconfdir}/%{name}/tendermint - -%{__cp} $GOPATH/bin/%{name} $GOPATH/bin/basecli .%{_bindir} -%{__cp} $GOPATH/src/github.com/tendermint/%{name}/LICENSE .%{_defaultlicensedir}/%{name} - -cp -r %{_topdir}/extrafiles/%{name}/* ./ - -%{__chmod} -Rf a+rX,u+w,g-w,o-w . +# Nothing to do here. - It is done in the Makefile. %build # Nothing to do here. %install -cd %{name}-%{version} +cd %{name}-%{version}-%{release} %{__cp} -a * %{buildroot} %post @@ -63,8 +52,8 @@ systemctl stop %{name}-service 2> /dev/null || : systemctl daemon-reload %files -%attr(0755, %{name}, %{name}) %dir %{_sysconfdir}/%{name} -%attr(0755, %{name}, %{name}) %dir %{_sysconfdir}/%{name}/tendermint +%ghost %attr(0755, %{name}, %{name}) %dir %{_sysconfdir}/%{name} +%ghost %attr(0755, %{name}, %{name}) %dir %{_sysconfdir}/%{name}/tendermint %{_bindir}/* %{_sysconfdir}/systemd/system/* %{_sysconfdir}/systemd/system-preset/* diff --git a/devops/rpmbuild/spectemplates/ethermint.spec b/build/spectemplates/ethermint.spec similarity index 65% rename from devops/rpmbuild/spectemplates/ethermint.spec rename to build/spectemplates/ethermint.spec index 20968ac57..364459328 100644 --- a/devops/rpmbuild/spectemplates/ethermint.spec +++ b/build/spectemplates/ethermint.spec @@ -1,3 +1,5 @@ +Version: @VERSION@ +Release: @BUILD_NUMBER@ %define __spec_install_post %{nil} %define debug_package %{nil} @@ -20,27 +22,13 @@ if ! %{__grep} -q '^%{name}:' /etc/passwd ; then fi %prep -test -d "$GOPATH" || echo "GOPATH not set" -test -d "$GOPATH" -%{__mkdir_p} %{name}-%{version} -cd %{name}-%{version} - -%{__mkdir_p} .%{_bindir} .%{_defaultlicensedir}/%{name} .%{_sysconfdir}/%{name}/tendermint .%{_sysconfdir}/systemd/system .%{_sysconfdir}/systemd/system-preset - -%{__cp} $GOPATH/bin/%{name} .%{_bindir} -%{__cp} $GOPATH/src/github.com/tendermint/%{name}/LICENSE .%{_defaultlicensedir}/%{name} -%{__cp} $GOPATH/src/github.com/tendermint/%{name}/setup/genesis.json .%{_sysconfdir}/%{name}/genesis.json -%{__cp} -r $GOPATH/src/github.com/tendermint/%{name}/setup/keystore .%{_sysconfdir}/%{name} - -cp -r %{_topdir}/extrafiles/%{name}/* ./ - -%{__chmod} -Rf a+rX,u+w,g-w,o-w . +# Nothing to do here. - It is done in the Makefile. %build # Nothing to do here. %install -cd %{name}-%{version} +cd %{name}-%{version}-%{release} %{__cp} -a * %{buildroot} %post @@ -53,7 +41,6 @@ systemctl stop %{name} 2> /dev/null || : systemctl stop %{name}-service 2> /dev/null || : %postun -#userdel %{name} systemctl daemon-reload %files @@ -61,7 +48,7 @@ systemctl daemon-reload %config(noreplace) %attr(0644, %{name}, %{name}) %{_sysconfdir}/%{name}/genesis.json %attr(0755, %{name}, %{name}) %dir %{_sysconfdir}/%{name}/keystore %attr(0644, %{name}, %{name}) %{_sysconfdir}/%{name}/keystore/* -%attr(0755, %{name}, %{name}) %dir %{_sysconfdir}/%{name}/tendermint +%ghost %attr(0755, %{name}, %{name}) %dir %{_sysconfdir}/%{name}/tendermint %{_bindir}/* %{_sysconfdir}/systemd/system/* %{_sysconfdir}/systemd/system-preset/* diff --git a/devops/rpmbuild/spectemplates/gaia.spec b/build/spectemplates/gaia.spec similarity index 67% rename from devops/rpmbuild/spectemplates/gaia.spec rename to build/spectemplates/gaia.spec index 4c51d4f9d..a8b8503f4 100644 --- a/devops/rpmbuild/spectemplates/gaia.spec +++ b/build/spectemplates/gaia.spec @@ -1,3 +1,5 @@ +Version: @VERSION@ +Release: @BUILD_NUMBER@ %define __spec_install_post %{nil} %define debug_package %{nil} @@ -20,27 +22,13 @@ if ! %{__grep} -q '^%{name}:' /etc/passwd ; then fi %prep -test -d "$GOPATH" || echo "GOPATH not set" -test -d "$GOPATH" - -%{__mkdir_p} %{name}-%{version} -cd %{name}-%{version} - -%{__mkdir_p} .%{_bindir} .%{_defaultlicensedir}/%{name} .%{_sysconfdir}/%{name}/tendermint - -%{__cp} $GOPATH/bin/%{name} .%{_bindir} -#Workaround until https://github.com/cosmos/gaia/issues/2 -#%{__cp} $GOPATH/src/github.com/tendermint/%{name}/LICENSE .%{_defaultlicensedir}/%{name} - -cp -r %{_topdir}/extrafiles/%{name}/* ./ - -%{__chmod} -Rf a+rX,u+w,g-w,o-w . +# Nothing to do here. - It is done in the Makefile. %build # Nothing to do here. %install -cd %{name}-%{version} +cd %{name}-%{version}-%{release} %{__cp} -a * %{buildroot} %post @@ -63,14 +51,13 @@ systemctl stop %{name}-service 2> /dev/null || : systemctl daemon-reload %files -%attr(0755, %{name}, %{name}) %dir %{_sysconfdir}/%{name} -%attr(0755, %{name}, %{name}) %dir %{_sysconfdir}/%{name}/tendermint +%ghost %attr(0755, %{name}, %{name}) %dir %{_sysconfdir}/%{name} +%ghost %attr(0755, %{name}, %{name}) %dir %{_sysconfdir}/%{name}/tendermint %{_bindir}/* %{_sysconfdir}/systemd/system/* %{_sysconfdir}/systemd/system-preset/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/* %dir %{_defaultlicensedir}/%{name} -#Workaround until https://github.com/cosmos/gaia/issues/2 -#%doc %{_defaultlicensedir}/%{name}/LICENSE +%doc %{_defaultlicensedir}/%{name}/LICENSE diff --git a/devops/rpmbuild/spectemplates/tendermint.spec b/build/spectemplates/tendermint.spec similarity index 68% rename from devops/rpmbuild/spectemplates/tendermint.spec rename to build/spectemplates/tendermint.spec index 843382597..68902a170 100644 --- a/devops/rpmbuild/spectemplates/tendermint.spec +++ b/build/spectemplates/tendermint.spec @@ -1,3 +1,5 @@ +Version: @VERSION@ +Release: @BUILD_NUMBER@ %define __spec_install_post %{nil} %define debug_package %{nil} @@ -13,20 +15,13 @@ Packager: Greg Szabo Tendermint is software for securely and consistently replicating an application on many machines. By securely, we mean that Tendermint works even if up to 1/3 of machines fail in arbitrary ways. By consistently, we mean that every non-faulty machine sees the same transaction log and computes the same state. %prep -test -d "$GOPATH" || echo "GOPATH not set" -test -d "$GOPATH" -%{__mkdir_p} %{name}-%{version} -cd %{name}-%{version} -%{__mkdir_p} .%{_bindir} .%{_defaultlicensedir}/%{name} -%{__cp} $GOPATH/bin/%{name} .%{_bindir} -%{__cp} $GOPATH/src/github.com/tendermint/tendermint/LICENSE .%{_defaultlicensedir}/%{name} -%{__chmod} -Rf a+rX,u+w,g-w,o-w . +# Nothing to do here. - It is done in the Makefile. %build # Nothing to do here. %install -cd %{name}-%{version} +cd %{name}-%{version}-%{release} %{__cp} -a * %{buildroot} %files diff --git a/devops/rpmbuild/spectemplates/trackomatron.spec b/build/spectemplates/trackomatron.spec similarity index 75% rename from devops/rpmbuild/spectemplates/trackomatron.spec rename to build/spectemplates/trackomatron.spec index 937dba203..28a985067 100644 --- a/devops/rpmbuild/spectemplates/trackomatron.spec +++ b/build/spectemplates/trackomatron.spec @@ -1,3 +1,5 @@ +Version: @VERSION@ +Release: @BUILD_NUMBER@ %define __spec_install_post %{nil} %define debug_package %{nil} @@ -20,26 +22,13 @@ if ! %{__grep} -q '^%{name}:' /etc/passwd ; then fi %prep -test -d "$GOPATH" || echo "GOPATH not set" -test -d "$GOPATH" - -%{__mkdir_p} %{name}-%{version} -cd %{name}-%{version} - -%{__mkdir_p} .%{_bindir} .%{_defaultlicensedir}/%{name} .%{_sysconfdir}/%{name}/tendermint - -%{__cp} $GOPATH/bin/tracko $GOPATH/bin/trackocli .%{_bindir} -%{__cp} $GOPATH/src/github.com/tendermint/%{name}/LICENSE .%{_defaultlicensedir}/%{name} - -cp -r %{_topdir}/extrafiles/%{name}/* ./ - -%{__chmod} -Rf a+rX,u+w,g-w,o-w . +# Nothing to do here. - It is done in the Makefile. %build # Nothing to do here. %install -cd %{name}-%{version} +cd %{name}-%{version}-%{release} %{__cp} -a * %{buildroot} %post @@ -62,8 +51,8 @@ systemctl stop %{name}-service 2> /dev/null || : systemctl daemon-reload %files -%attr(0755, %{name}, %{name}) %dir %{_sysconfdir}/%{name} -%attr(0755, %{name}, %{name}) %dir %{_sysconfdir}/%{name}/tendermint +%ghost %attr(0755, %{name}, %{name}) %dir %{_sysconfdir}/%{name} +%ghost %attr(0755, %{name}, %{name}) %dir %{_sysconfdir}/%{name}/tendermint %{_bindir}/* %{_sysconfdir}/systemd/system/* %{_sysconfdir}/systemd/system-preset/* diff --git a/devops/rpmbuild/repofiles/tendermint.repo b/build/tendermint.repo similarity index 100% rename from devops/rpmbuild/repofiles/tendermint.repo rename to build/tendermint.repo diff --git a/devops/rpmbuild/extrafiles/DEBIAN-tendermint/changelog b/build/tendermint/DEBIAN/changelog similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-tendermint/changelog rename to build/tendermint/DEBIAN/changelog diff --git a/devops/rpmbuild/extrafiles/DEBIAN-tendermint/compat b/build/tendermint/DEBIAN/compat similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-tendermint/compat rename to build/tendermint/DEBIAN/compat diff --git a/devops/rpmbuild/extrafiles/DEBIAN-tendermint/control b/build/tendermint/DEBIAN/control similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-tendermint/control rename to build/tendermint/DEBIAN/control diff --git a/devops/rpmbuild/extrafiles/DEBIAN-tendermint/copyright b/build/tendermint/DEBIAN/copyright similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-tendermint/copyright rename to build/tendermint/DEBIAN/copyright diff --git a/devops/rpmbuild/extrafiles/DEBIAN-trackomatron/changelog b/build/trackomatron/DEBIAN/changelog similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-trackomatron/changelog rename to build/trackomatron/DEBIAN/changelog diff --git a/devops/rpmbuild/extrafiles/DEBIAN-trackomatron/compat b/build/trackomatron/DEBIAN/compat similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-trackomatron/compat rename to build/trackomatron/DEBIAN/compat diff --git a/devops/rpmbuild/extrafiles/DEBIAN-trackomatron/control b/build/trackomatron/DEBIAN/control similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-trackomatron/control rename to build/trackomatron/DEBIAN/control diff --git a/devops/rpmbuild/extrafiles/DEBIAN-trackomatron/copyright b/build/trackomatron/DEBIAN/copyright similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-trackomatron/copyright rename to build/trackomatron/DEBIAN/copyright diff --git a/devops/rpmbuild/extrafiles/DEBIAN-trackomatron/postinst b/build/trackomatron/DEBIAN/postinst similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-trackomatron/postinst rename to build/trackomatron/DEBIAN/postinst diff --git a/devops/rpmbuild/extrafiles/DEBIAN-trackomatron/postrm b/build/trackomatron/DEBIAN/postrm similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-trackomatron/postrm rename to build/trackomatron/DEBIAN/postrm diff --git a/devops/rpmbuild/extrafiles/DEBIAN-trackomatron/preinst b/build/trackomatron/DEBIAN/preinst similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-trackomatron/preinst rename to build/trackomatron/DEBIAN/preinst diff --git a/devops/rpmbuild/extrafiles/DEBIAN-trackomatron/prerm b/build/trackomatron/DEBIAN/prerm similarity index 100% rename from devops/rpmbuild/extrafiles/DEBIAN-trackomatron/prerm rename to build/trackomatron/DEBIAN/prerm diff --git a/devops/rpmbuild/extrafiles/trackomatron/etc/systemd/system-preset/50-trackomatron.preset b/build/trackomatron/etc/systemd/system-preset/50-trackomatron.preset similarity index 100% rename from devops/rpmbuild/extrafiles/trackomatron/etc/systemd/system-preset/50-trackomatron.preset rename to build/trackomatron/etc/systemd/system-preset/50-trackomatron.preset diff --git a/devops/rpmbuild/extrafiles/trackomatron/etc/systemd/system/trackomatron-server.service b/build/trackomatron/etc/systemd/system/trackomatron-server.service similarity index 100% rename from devops/rpmbuild/extrafiles/trackomatron/etc/systemd/system/trackomatron-server.service rename to build/trackomatron/etc/systemd/system/trackomatron-server.service diff --git a/devops/rpmbuild/extrafiles/trackomatron/etc/systemd/system/trackomatron.service b/build/trackomatron/etc/systemd/system/trackomatron.service similarity index 100% rename from devops/rpmbuild/extrafiles/trackomatron/etc/systemd/system/trackomatron.service rename to build/trackomatron/etc/systemd/system/trackomatron.service diff --git a/devops/rpmbuild/extrafiles/trackomatron/usr/share/trackomatron/key.json b/build/trackomatron/usr/share/trackomatron/key.json similarity index 100% rename from devops/rpmbuild/extrafiles/trackomatron/usr/share/trackomatron/key.json rename to build/trackomatron/usr/share/trackomatron/key.json diff --git a/devops/rpmbuild/extrafiles/trackomatron/usr/share/trackomatron/key2.json b/build/trackomatron/usr/share/trackomatron/key2.json similarity index 100% rename from devops/rpmbuild/extrafiles/trackomatron/usr/share/trackomatron/key2.json rename to build/trackomatron/usr/share/trackomatron/key2.json diff --git a/devops/rpmbuild/repofiles/tendermint-dev.repo b/devops/rpmbuild/repofiles/tendermint-dev.repo deleted file mode 100644 index c34a7b59a..000000000 --- a/devops/rpmbuild/repofiles/tendermint-dev.repo +++ /dev/null @@ -1,12 +0,0 @@ -#This is the .repo file for the Tendermint CentOS repositories. -#Although it has only been tested under CentOS 7, it should work under Fedora and RedHat 7 too. -#Currently only 64-bit packages are built. - -[tendermint-dev] -name=Tendermint development releases repository -baseurl=http://tendermint-packages.s3-website-us-west-1.amazonaws.com/centos/7/cr/x86_64 -gpgcheck=1 -gpgkey=http://tendermint-packages.s3-website-us-west-1.amazonaws.com/centos/7/os/x86_64/RPM-GPG-KEY-Tendermint -enabled=1 -#sslverify = 1 - diff --git a/devops/rpmbuild/rpmmacros b/devops/rpmbuild/rpmmacros deleted file mode 100644 index 0695c8bdc..000000000 --- a/devops/rpmbuild/rpmmacros +++ /dev/null @@ -1,6 +0,0 @@ -%_topdir %(echo $WORKSPACE)/tools/devops/rpmbuild -%_tmppath %(echo $WORKSPACE)/tools/devops/rpmbuild/tmp -%_signature gpg -%_gpg_name 2122CBE9 -%_gpgbin /usr/bin/gpg -