Skip to content

Commit

Permalink
Merge pull request #658 from StackStorm/remove/el6
Browse files Browse the repository at this point in the history
Remove EL6 and st2python
  • Loading branch information
arm4b authored Aug 4, 2020
2 parents dbc3f59 + 900fad1 commit b3c6340
Show file tree
Hide file tree
Showing 37 changed files with 15 additions and 2,911 deletions.
71 changes: 0 additions & 71 deletions packages/python/st2python.spec

This file was deleted.

5 changes: 0 additions & 5 deletions packages/st2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ else ifeq ($(EL_VERSION),8)
PYTHON_BINARY := /usr/bin/python3
PIP_BINARY := /usr/local/bin/pip3
PYTHON_ALT_BINARY := python3
else ifneq (,$(wildcard /usr/share/python/st2python/bin/python))
PATH := /usr/share/python/st2python/bin:$(PATH)
PYTHON_BINARY := /usr/share/python/st2python/bin/python
PIP_BINARY := pip
PYTHON_ALT_BINARY := python
else
PYTHON_BINARY := python
PIP_BINARY := pip
Expand Down
4 changes: 0 additions & 4 deletions packages/st2/component.makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ ifeq ($(DEB_DISTRO),bionic)
else ifeq ($(EL_VERSION),8)
PYTHON_BINARY := /usr/bin/python3
PIP_BINARY := /usr/local/bin/pip3
else ifneq (,$(wildcard /usr/share/python/st2python/bin/python))
PATH := /usr/share/python/st2python/bin:$(PATH)
PYTHON_BINARY := /usr/share/python/st2python/bin/python
PIP_BINARY := pip
else
PYTHON_BINARY := python
PIP_BINARY := pip
Expand Down
241 changes: 0 additions & 241 deletions packages/st2/conf/rhel-functions-sysvinit

This file was deleted.

17 changes: 0 additions & 17 deletions packages/st2/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ override_dh_gencontrol:
# Packaging recognizes only 1 {package_name} service file (http://manpages.ubuntu.com/manpages/xenial/man1/dh_installinit.1.html)
# We have many, and so force it to install multiple service files
override_dh_installinit:
ifeq (true, $(IS_SYSTEMD))
dh_systemd_enable --name=st2actionrunner st2actionrunner.service
install -p -m644 debian/[email protected] debian/st2/lib/systemd/system/[email protected]
dh_systemd_enable --name=st2api st2api.service
Expand All @@ -59,22 +58,6 @@ ifeq (true, $(IS_SYSTEMD))
dh_systemd_enable --name=st2timersengine st2timersengine.service
dh_systemd_enable --name=st2workflowengine st2workflowengine.service
dh_systemd_enable --name=st2scheduler st2scheduler.service
else
# So far don't start services
dh_installinit --no-start --name=st2actionrunner-worker
dh_installinit --no-start --name=st2actionrunner
dh_installinit --no-start --name=st2api
dh_installinit --no-start --name=st2stream
dh_installinit --no-start --name=st2auth
dh_installinit --no-start --name=st2notifier
dh_installinit --no-start --name=st2resultstracker
dh_installinit --no-start --name=st2rulesengine
dh_installinit --no-start --name=st2sensorcontainer
dh_installinit --no-start --name=st2garbagecollector
dh_installinit --no-start --name=st2timersengine
dh_installinit --no-start --name=st2workflowengine
dh_installinit --no-start --name=st2scheduler
endif

override_dh_installdeb:
DESTDIR=debian/st2 $(MAKE) post_install
Expand Down
Loading

0 comments on commit b3c6340

Please sign in to comment.