Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix the rpm packaging for 686

pull/1054/merge
John Shahid 2014-10-24 17:54:01 -04:00
parent 6b42f1cbe1
commit 7e543e1765
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.in
View File

@ -275,7 +275,7 @@ package_version=$(subst -,_,$(version))
source_package = packages/influxdb-$(version).src.tar.gz source_package = packages/influxdb-$(version).src.tar.gz
binary_package = packages/influxdb-$(version).$(arch).tar.gz binary_package = packages/influxdb-$(version).$(arch).tar.gz
rpm_args = : rpm_args =
ifeq ($(arch),386) ifeq ($(arch),386)
rpm_package = packages/influxdb-$(package_version)-1.i686.rpm rpm_package = packages/influxdb-$(package_version)-1.i686.rpm
debian_package = packages/influxdb_$(version)_i686.deb debian_package = packages/influxdb_$(version)_i686.deb
@ -304,7 +304,7 @@ $(rpm_package): $(binary_package)
rm -rf out_rpm rm -rf out_rpm
mkdir -p out_rpm/opt/influxdb/versions/$(version) mkdir -p out_rpm/opt/influxdb/versions/$(version)
cp -r build/* out_rpm/opt/influxdb/versions/$(version) cp -r build/* out_rpm/opt/influxdb/versions/$(version)
( rvm use 1.9.3@influxdb && cd out_rpm && $(rpm_args) && fpm -s dir -t rpm --after-install ../scripts/post_install.sh -n influxdb -v $(version) . ) ( rvm use 1.9.3@influxdb && cd out_rpm && $(rpm_args) fpm -s dir -t rpm --after-install ../scripts/post_install.sh -n influxdb -v $(version) . )
mv out_rpm/$(shell basename $(rpm_package)) packages/ mv out_rpm/$(shell basename $(rpm_package)) packages/
$(debian_package): $(binary_package) $(debian_package): $(binary_package)