Packages: removed CentOS 7 due to EOL

nginx · Jun 18, 2024 · 8b5e2e1 · 8b5e2e1
1 parent b7b27eb
commit 8b5e2e1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 28 deletions.
diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
@@ -10,9 +10,7 @@ RELEASE ?= $(DEFAULT_RELEASE)
 
 PACKAGE_VENDOR = NGINX Packaging <nginx-packaging@f5.com>
 
-ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 7 -a 0%{?amzn} -eq 0'`; echo $$?), 0)
-OSVER = centos7
-else ifeq ($(shell rpm --eval "%{?rhel}"), 8)
+ifeq ($(shell rpm --eval "%{?rhel}"), 8)
 OSVER = centos8
 else ifeq ($(shell rpm --eval "%{?rhel}"), 9)
 OSVER = centos9
@@ -26,10 +24,6 @@ endif
 
 BUILD_DEPENDS_unit = gcc rpm-build rpmlint clang llvm
 
-ifeq ($(OSVER), centos7)
-BUILD_DEPENDS_unit += which
-endif
-
 ifneq (,$(findstring $(OSVER),amazonlinux2))
 BUILD_DEPENDS_unit += libxml2 libxslt openssl11-devel
 else
@@ -40,17 +34,6 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit)
 
 MODULES=
 
-ifeq ($(OSVER), centos7)
-include Makefile.php
-include Makefile.python27
-include Makefile.python36
-include Makefile.go
-include Makefile.perl
-include Makefile.jsc-common
-include Makefile.jsc8
-include Makefile.jsc11
-endif
-
 ifeq ($(OSVER), centos8)
 include Makefile.php
 include Makefile.python27

diff --git a/pkg/rpm/Makefile.python27 b/pkg/rpm/Makefile.python27
@@ -15,7 +15,7 @@ MODULE_SOURCES_python27=	unit.example-python-app \
 
 ifneq (,$(findstring $(OSVER),centos8))
 BUILD_DEPENDS_python27=	python2-devel
-else ifneq (,$(findstring $(OSVER),centos7 amazonlinux2))
+else ifneq (,$(findstring $(OSVER),amazonlinux2))
 BUILD_DEPENDS_python27=	python-devel
 else
 BUILD_DEPENDS_python27=	python27-devel
@@ -24,7 +24,7 @@ endif
 BUILD_DEPENDS+=		$(BUILD_DEPENDS_python27)
 
 define MODULE_DEFINITIONS_python27
-%if (0%{?rhel} == 7) || (0%{?amzn} == 2)
+%if 0%{?amzn} == 2
 Obsoletes: unit-python
 %endif
 endef

diff --git a/pkg/rpm/Makefile.python36 b/pkg/rpm/Makefile.python36
@@ -13,11 +13,7 @@ MODULE_INSTARGS_python36=	python3.6-install
 MODULE_SOURCES_python36=	unit.example-python-app \
 			unit.example-python36-config
 
-ifneq (,$(findstring $(OSVER),centos7))
-BUILD_DEPENDS_python36=	python3-devel
-else
 BUILD_DEPENDS_python36=	python36-devel
-endif
 
 BUILD_DEPENDS+=		$(BUILD_DEPENDS_python36)
 

diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in
@@ -1,10 +1,6 @@
 # distribution specific definitions
 %define bdir %{_builddir}/%{name}-%{version}
 
-%if (0%{?rhel} == 7 && 0%{?amzn} == 0)
-%define dist .el7
-%endif
-
 %%MODULE_DEFINITIONS%%
 
 %if 0%{?rhel}%{?fedora}