From 0c4ec72ca8e1efaac747e5cf2cdc7b6688e0a939 Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Mon, 22 Jan 2018 16:39:31 +0300 Subject: [PATCH] Packages: added support for Amazon Linux. --- pkg/rpm/Makefile | 27 +++++++++- pkg/rpm/Makefile.python | 5 ++ pkg/rpm/Makefile.python27 | 50 +++++++++++++++++++ pkg/rpm/Makefile.python34 | 50 +++++++++++++++++++ pkg/rpm/Makefile.python35 | 50 +++++++++++++++++++ pkg/rpm/Makefile.python36 | 50 +++++++++++++++++++ .../SOURCES/unit.example-python27-config | 17 +++++++ .../SOURCES/unit.example-python34-config | 17 +++++++ .../SOURCES/unit.example-python35-config | 17 +++++++ .../SOURCES/unit.example-python36-config | 17 +++++++ pkg/rpm/unit.module.spec.in | 2 +- pkg/rpm/unit.spec.in | 2 + 12 files changed, 302 insertions(+), 2 deletions(-) create mode 100644 pkg/rpm/Makefile.python27 create mode 100644 pkg/rpm/Makefile.python34 create mode 100644 pkg/rpm/Makefile.python35 create mode 100644 pkg/rpm/Makefile.python36 create mode 100644 pkg/rpm/rpmbuild/SOURCES/unit.example-python27-config create mode 100644 pkg/rpm/rpmbuild/SOURCES/unit.example-python34-config create mode 100644 pkg/rpm/rpmbuild/SOURCES/unit.example-python35-config create mode 100644 pkg/rpm/rpmbuild/SOURCES/unit.example-python36-config diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index aad26a5a..a5d463c9 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -11,8 +11,33 @@ RELEASE ?= $(DEFAULT_RELEASE) BUILD_DEPENDS_unit = libxml2 libxslt rpm-build rpmlint BUILD_DEPENDS = $(BUILD_DEPENDS_unit) +ifeq ($(shell rpm --eval "%{?rhel}"), 6) +OSVER = centos6 +else ifeq ($(shell rpm --eval "%{?rhel}"), 7) +OSVER = centos7 +else ifeq ($(shell rpm --eval "%{?amzn}"), 1) +OSVER = amazonlinux1 +BUILD_DEPENDS += system-rpm-config +else ifeq ($(shell rpm --eval "%{?amzn}"), 2) +OSVER = amazonlinux2 +endif + MODULES= --include Makefile.* + +ifneq (,$(findstring $(OSVER),centos6 centos7 amazonlinux2)) +include Makefile.php +include Makefile.python +include Makefile.go +endif + +ifeq ($(OSVER), amazonlinux1) +include Makefile.php +include Makefile.python27 +include Makefile.python34 +include Makefile.python35 +include Makefile.python36 +include Makefile.go +endif CONFIGURE_ARGS=\ --prefix=/usr \ diff --git a/pkg/rpm/Makefile.python b/pkg/rpm/Makefile.python index 21ba8a5d..f13179b5 100644 --- a/pkg/rpm/Makefile.python +++ b/pkg/rpm/Makefile.python @@ -12,7 +12,12 @@ MODULE_INSTARGS_python= python-install MODULE_SOURCES_python= unit.example-python-app \ unit.example-python-config +ifeq ($(shell rpm --eval "%{?amzn}"), 1) +BUILD_DEPENDS_python= python26-devel +else BUILD_DEPENDS_python= python-devel +endif + BUILD_DEPENDS+= $(BUILD_DEPENDS_python) define MODULE_PREINSTALL_python diff --git a/pkg/rpm/Makefile.python27 b/pkg/rpm/Makefile.python27 new file mode 100644 index 00000000..327efff8 --- /dev/null +++ b/pkg/rpm/Makefile.python27 @@ -0,0 +1,50 @@ +MODULES+= python27 + +MODULE_SUMMARY_python27= Python 2.7 module for NGINX Unit + +MODULE_VERSION_python27= $(VERSION) +MODULE_RELEASE_python27= 1 + +MODULE_CONFARGS_python27= python --config=python2.7-config +MODULE_MAKEARGS_python27= python2.7 +MODULE_INSTARGS_python27= python2.7-install + +MODULE_SOURCES_python27= unit.example-python-app \ + unit.example-python27-config + +BUILD_DEPENDS_python27= python27-devel +BUILD_DEPENDS+= $(BUILD_DEPENDS_python27) + +define MODULE_PREINSTALL_python27 +%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python27/examples/python-app +%{__install} -m 644 -p %{SOURCE100} \ + %{buildroot}%{_datadir}/doc/unit-python27/examples/python-app/wsgi.py +%{__install} -m 644 -p %{SOURCE101} \ + %{buildroot}%{_datadir}/doc/unit-python27/examples/unit.config +endef +export MODULE_PREINSTALL_python27 + +define MODULE_FILES_python27 +%{_libdir}/unit/modules/* +%{_libdir}/unit/debug-modules/* +endef +export MODULE_FILES_python27 + +define MODULE_POST_python27 +cat <= 8.36 %if 0%{?rhel} == 7 Requires: systemd BuildRequires: systemd-units +%if 0%{?amzn} == 0 %define dist .el7 %endif +%endif %if 0%{?suse_version} == 1315 BuildRequires: systemd