From 637a2006a6c0da5825dd6b04940e05e2c9feda5d Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Mon, 20 Jun 2022 18:20:11 +0400 Subject: [PATCH] Packages: cleanup targets that are not supported anymore. --- pkg/deb/Makefile | 15 ---- pkg/deb/Makefile.jsc13 | 71 ------------------- pkg/deb/Makefile.jsc14 | 71 ------------------- pkg/deb/Makefile.jsc15 | 71 ------------------- pkg/deb/Makefile.python | 46 ------------ pkg/deb/Makefile.python34 | 46 ------------ pkg/deb/Makefile.python35 | 46 ------------ pkg/deb/debian.module/copyright.unit-jsc10 | 33 --------- .../debian.module/unit.example-jsc10-config | 15 ---- .../debian.module/unit.example-jsc13-config | 15 ---- .../debian.module/unit.example-jsc14-config | 15 ---- .../debian.module/unit.example-jsc15-config | 15 ---- .../debian.module/unit.example-jsc9-config | 15 ---- .../debian.module/unit.example-python-config | 16 ----- .../unit.example-python3.4-config | 16 ----- .../unit.example-python3.5-config | 16 ----- pkg/rpm/Makefile | 45 +----------- pkg/rpm/Makefile.python | 57 --------------- pkg/rpm/Makefile.python35 | 52 -------------- pkg/rpm/Makefile.python38 | 57 --------------- pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10 | 32 --------- .../SOURCES/unit.example-python35-config | 16 ----- .../SOURCES/unit.example-python38-config | 16 ----- 23 files changed, 2 insertions(+), 795 deletions(-) delete mode 100644 pkg/deb/Makefile.jsc13 delete mode 100644 pkg/deb/Makefile.jsc14 delete mode 100644 pkg/deb/Makefile.jsc15 delete mode 100644 pkg/deb/Makefile.python delete mode 100644 pkg/deb/Makefile.python34 delete mode 100644 pkg/deb/Makefile.python35 delete mode 100644 pkg/deb/debian.module/copyright.unit-jsc10 delete mode 100644 pkg/deb/debian.module/unit.example-jsc10-config delete mode 100644 pkg/deb/debian.module/unit.example-jsc13-config delete mode 100644 pkg/deb/debian.module/unit.example-jsc14-config delete mode 100644 pkg/deb/debian.module/unit.example-jsc15-config delete mode 100644 pkg/deb/debian.module/unit.example-jsc9-config delete mode 100644 pkg/deb/debian.module/unit.example-python-config delete mode 100644 pkg/deb/debian.module/unit.example-python3.4-config delete mode 100644 pkg/deb/debian.module/unit.example-python3.5-config delete mode 100644 pkg/rpm/Makefile.python delete mode 100644 pkg/rpm/Makefile.python35 delete mode 100644 pkg/rpm/Makefile.python38 delete mode 100644 pkg/rpm/rpmbuild/SOURCES/COPYRIGHT.unit-jsc10 delete mode 100644 pkg/rpm/rpmbuild/SOURCES/unit.example-python35-config delete mode 100644 pkg/rpm/rpmbuild/SOURCES/unit.example-python38-config diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 52813e37..c4f085f8 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -49,21 +49,6 @@ include Makefile.jsc17 include Makefile.jsc18 endif -# Ubuntu 21.04 -ifeq ($(CODENAME),hirsute) -include Makefile.php -include Makefile.python27 -include Makefile.python39 -include Makefile.go -include Makefile.perl -include Makefile.ruby -include Makefile.jsc-common -include Makefile.jsc11 -include Makefile.jsc15 -include Makefile.jsc16 -include Makefile.jsc17 -endif - # Ubuntu 20.04 ifeq ($(CODENAME),focal) include Makefile.php diff --git a/pkg/deb/Makefile.jsc13 b/pkg/deb/Makefile.jsc13 deleted file mode 100644 index d22944dc..00000000 --- a/pkg/deb/Makefile.jsc13 +++ /dev/null @@ -1,71 +0,0 @@ -MODULES+= jsc13 -MODULE_SUFFIX_jsc13= jsc13 - -MODULE_SUMMARY_jsc13= Java 13 module for NGINX Unit - -MODULE_VERSION_jsc13= $(VERSION) -MODULE_RELEASE_jsc13= 1 - -MODULE_CONFARGS_jsc13= java --module=java13 --home=/usr/lib/jvm/java-13-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/ -MODULE_MAKEARGS_jsc13= java13 -MODULE_INSTARGS_jsc13= java13-install - -MODULE_SOURCES_jsc13= unit.example-jsc-app \ - unit.example-jsc13-config - -BUILD_DEPENDS_jsc13= openjdk-13-jdk-headless openjdk-13-jre-headless -BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc13) - -MODULE_BUILD_DEPENDS_jsc13=,openjdk-13-jdk-headless -MODULE_DEPENDS_jsc13=,openjdk-13-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME)) - -define MODULE_PREINSTALL_jsc13 - mkdir -p debian/unit-jsc13/usr/share/doc/unit-jsc13/examples/jsc-app - install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc13/usr/share/doc/unit-jsc13/examples/jsc-app/index.jsp - install -m 644 -p debian/unit.example-jsc13-config debian/unit-jsc13/usr/share/doc/unit-jsc13/examples/unit.config - install -m 644 -p src/java/README.JSR-340 debian/unit-jsc13/usr/share/doc/unit-jsc13/ -endef -export MODULE_PREINSTALL_jsc13 - -define MODULE_POSTINSTALL_jsc13 - cd $$\(BUILDDIR_unit\) \&\& \ - DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall -endef -export MODULE_POSTINSTALL_jsc13 - -define MODULE_POST_jsc13 -cat < -ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 6 -a 0%{?amzn} -eq 0'`; echo $$?), 0) -OSVER = centos6 -else ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 7 -a 0%{?amzn} -eq 0'`; echo $$?), 0) +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) OSVER = centos8 else ifeq ($(shell rpm --eval "%{?rhel}"), 9) OSVER = centos9 -else ifeq ($(shell rpm --eval "%{?amzn}"), 1) -OSVER = amazonlinux1 else ifeq ($(shell rpm --eval "%{?amzn}"), 2) OSVER = amazonlinux2 else ifeq ($(shell test `rpm --eval '0%{?suse_version} -ge 1315 -a 0%{?suse_version} -lt 1330 -a 0%{?is_opensuse} -eq 1'`; echo $$?), 0) @@ -28,7 +24,7 @@ else ifeq ($(shell test `rpm --eval '0%{?suse_version} -ge 1330 -a 0%{?is_opensu OSVER = opensuse-tumbleweed else ifeq ($(shell test `rpm --eval '0%{?suse_version} -ge 1315 -a 0%{?is_opensuse} -eq 0'`; echo $$?), 0) OSVER = sles -else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 26'`; echo $$?),0) +else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 35'`; echo $$?),0) OSVER = fedora endif @@ -38,10 +34,6 @@ ifeq ($(OSVER), centos7) BUILD_DEPENDS_unit += which endif -ifeq ($(OSVER), amazonlinux1) -BUILD_DEPENDS_unit += system-rpm-config -endif - ifneq (,$(findstring $(OSVER),opensuse-leap opensuse-tumbleweed sles)) BUILD_DEPENDS_unit += libxml2-tools libxslt1 libopenssl-devel else @@ -56,14 +48,6 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit) MODULES= -ifeq ($(OSVER), centos6) -include Makefile.php -include Makefile.python -include Makefile.go -include Makefile.jsc-common -include Makefile.jsc8 -endif - ifeq ($(OSVER), centos7) include Makefile.php include Makefile.python27 @@ -96,18 +80,6 @@ include Makefile.jsc8 include Makefile.jsc11 endif -ifeq ($(OSVER), amazonlinux1) -include Makefile.php -include Makefile.python27 -include Makefile.python34 -include Makefile.python35 -include Makefile.python36 -include Makefile.go -include Makefile.perl -include Makefile.jsc-common -include Makefile.jsc8 -endif - ifeq ($(OSVER), amazonlinux2) include Makefile.php include Makefile.python27 @@ -143,20 +115,7 @@ endif ifeq ($(OSVER), fedora) include Makefile.php -ifeq ($(shell test `rpm --eval '0%{?fedora} -lt 32'`; echo $$?),0) -include Makefile.python27 -endif -ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 35'`; echo $$?),0) include Makefile.python310 -else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 33'`; echo $$?),0) -include Makefile.python39 -else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 32'`; echo $$?),0) -include Makefile.python38 -else ifeq ($(shell test `rpm --eval '0%{?fedora} -ge 29'`; echo $$?),0) -include Makefile.python37 -else -include Makefile.python36 -endif include Makefile.go include Makefile.perl include Makefile.ruby diff --git a/pkg/rpm/Makefile.python b/pkg/rpm/Makefile.python deleted file mode 100644 index 334d62c1..00000000 --- a/pkg/rpm/Makefile.python +++ /dev/null @@ -1,57 +0,0 @@ -MODULES+= python -MODULE_SUFFIX_python= python - -MODULE_SUMMARY_python= Python module for NGINX Unit - -MODULE_VERSION_python= $(VERSION) -MODULE_RELEASE_python= 1 - -MODULE_CONFARGS_python= python -MODULE_MAKEARGS_python= python -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 -%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python/examples/python-app -%{__install} -m 644 -p %{SOURCE100} \ - %{buildroot}%{_datadir}/doc/unit-python/examples/python-app/wsgi.py -%{__install} -m 644 -p %{SOURCE101} \ - %{buildroot}%{_datadir}/doc/unit-python/examples/unit.config -endef -export MODULE_PREINSTALL_python - -define MODULE_FILES_python -%{_libdir}/unit/modules/* -%{_libdir}/unit/debug-modules/* -endef -export MODULE_FILES_python - -define MODULE_POST_python -cat <