changes for arma

Author: punkrokk

packages/st2/Makefile

@@ -48,7 +48,7 @@ else
 endif
 
 # Moved from top of file to handle when only py2 or py3 available
-ST2PKG_VERSION ?= $(shell $(PYTHON_BINARY) python3 -c "from $(ST2_COMPONENT) import __version__; print(__version__),")
+ST2PKG_VERSION ?= $(shell $(PYTHON_BINARY) -c "from $(ST2_COMPONENT) import __version__; print(__version__),")
 
 # Note: We dynamically obtain the version, this is required because dev
 # build versions don't store correct version identifier in __init__.py
@@ -144,7 +144,7 @@ wheelhouse: .build-runners .stamp-wheelhouse
 	cat requirements.txt
 	# Try to install wheels 2x in case the first one fails
 	$(PIP_BINARY) wheel --wheel-dir=$(WHEELDIR) --find-links=$(WHEELDIR) -r requirements.txt || \
-	$(PIP_BINARY) wheel --wheel-dir=$(WHEELDIR) --find-links=$(WHEELDIR) -r requirements.txt
+		$(PIP_BINARY) wheel --wheel-dir=$(WHEELDIR) --find-links=$(WHEELDIR) -r requirements.txt
 	touch $@
 
 .build-runners:

packages/st2/component.makefile

@@ -79,7 +79,7 @@ wheelhouse: .stamp-wheelhouse
 	cat requirements.txt
 	# Try to install wheels 2x in case the first one fails
 	$(PIP_BINARY) wheel --wheel-dir=$(WHEELDIR) --find-links=$(WHEELDIR) -r requirements.txt || \
-	$(PIP_BINARY) wheel --wheel-dir=$(WHEELDIR) --find-links=$(WHEELDIR) -r requirements.txt
+		$(PIP_BINARY) wheel --wheel-dir=$(WHEELDIR) --find-links=$(WHEELDIR) -r requirements.txt
 	touch $@
 
 bdist_wheel: .stamp-bdist_wheel
@@ -88,9 +88,10 @@ bdist_wheel: .stamp-bdist_wheel
 # We need to install these python packages to handle rpmbuild 4.14 in EL8
 ifeq ($(EL_VERSION),8)
 	$(PIP_BINARY) install wheel setuptools virtualenv
-	$(PIP_BINARY) install cryptography --no-binary cryptography
+		$(PIP_BINARY) install cryptography --no-binary cryptography
 endif
-	$(PYTHON_BINARY) setup.py bdist_wheel --universal -d $(WHEELDIR)
+	$(PYTHON_BINARY) setup.py bdist_wheel -d $(WHEELDIR) || \
+		$(PYTHON_BINARY) setup.py bdist_wheel -d $(WHEELDIR)
 	touch $@
 
 # Note: We want to dynamically inject "st2client" dependency. This way we can

packages/st2/rpm/st2.spec

@@ -3,7 +3,6 @@
 %define svc_user st2
 %define stanley_user stanley
 %define packs_group st2packs
-%define epoch %(_epoch=`echo $ST2PKG_VERSION | grep -q dev || echo 1`; echo "${_epoch:-0}")
 
 %include ../rpmspec/st2pkg_toptags.spec
 
@@ -13,13 +12,15 @@ Epoch: %{epoch}
 
 %if 0%{?use_st2python}
 Requires: st2python, python-devel, openssl-devel, libffi-devel, git, pam, openssh-server, openssh-clients, bash, setup
+%endif
+
 %if 0%{?rhel} == 7
 Requires: python-devel, openssl-devel, libffi-devel, git, pam, openssh-server, openssh-clients, bash, setup
+%endif
+
 %if 0%{?rhel} >= 8
 Requires: python3-devel openssl-devel, libffi-devel, git, pam, openssh-server, openssh-clients, bash, setup
 %endif
-%endif
-%endif
 
 # EL8 requires a few python packages available within 'BUILDROOT' when outside venv
 # These are in the el8 packagingbuild dockerfile
@@ -29,7 +30,7 @@ Requires: python3-devel openssl-devel, libffi-devel, git, pam, openssh-server, o
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 Requires: python3-virtualenv
-BuildRequires: python3-virtualenv
+# BuildRequires: python3-virtualenv
 %endif  # Requires for RHEL 8
 
 Summary: StackStorm all components bundle

scripts/install_os_packages.sh

@@ -11,6 +11,7 @@ version_delemiter() {
 }
 
 install_rpm() {
+  sudo yum deplist $(lookup_fullnames $@)
   sudo yum -y install $(lookup_fullnames $@);
 }