From 5bdf4d3c2f37057dc7d07cf704efad1e2ed3b8e1 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Wed, 23 Feb 2022 19:13:59 +0000 Subject: [PATCH] reorganize and cleanup distros --- Makefile | 116 ++++++++++--------------------------------------------- 1 file changed, 21 insertions(+), 95 deletions(-) diff --git a/Makefile b/Makefile index ca945c68e..eff087542 100644 --- a/Makefile +++ b/Makefile @@ -202,7 +202,7 @@ amd64-ubuntu: ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg amd64-debian: debian8 debian8-dbg debian9 debian9-dbg debian10 debian10-dbg debian11 debian11-clang debian11-dbg .PHONY: amd64-debian -amd64-fedora: fedora24 fedora24-dbg fedora27 fedora27-dbg fedora28 fedora28-dbg fedora33 fedora33-dbg fedora34 fedora34-clang fedora34-dbg +amd64-fedora: fedora27 fedora27-dbg fedora28 fedora28-dbg fedora33 fedora33-dbg fedora34 fedora34-clang fedora34-dbg .PHONY: amd64-fedora amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg @@ -213,16 +213,30 @@ amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg -arm64-packages: centos7-arm64 centos8-arm64 debian9-arm64 debian10-arm64 debian11-arm64 ubuntu18-arm64 ubuntu20-arm64 fedora32-arm64 fedora33-arm64 + +arm64-packages: arm64-centos arm64-debian arm64-ubuntu arm64-fedora arm64-opensuse arm64-almalinux .PHONY: arm64-packages +arm64-centos: centos7-arm64 centos8-arm64 +.PHONY: arm64-centos + +arm64-debian: debian8-arm64 debian9-arm64 debian10-arm64 debian11-arm64 +.PHONY: arm64-debian + +arm64-ubuntu: ubuntu16-arm64 ubuntu18-arm64 ubuntu20-arm64 +.PHONY: arm64-ubuntu + +arm64-fedora: fedora33-arm64 fedora34-arm64 +.PHONY: arm64-fedora + +arm64-opensuse: opensuse15-arm64 +.PHONY: arm64-opensuse + +arm64-almalinux: almalinux8-arm64 +.PHONY: arm64-almalinux -centos5: binaries/proxysql-${CURVER}-1-centos5.x86_64.rpm -.PHONY: centos5 -centos5-dbg: binaries/proxysql-${CURVER}-1-dbg-centos5.x86_64.rpm -.PHONY: centos5-dbg centos6: binaries/proxysql-${CURVER}-1-centos6.x86_64.rpm @@ -232,13 +246,6 @@ centos6-dbg: binaries/proxysql-${CURVER}-1-dbg-centos6.x86_64.rpm .PHONY: centos6-dbg -centos6.7: binaries/proxysql-${CURVER}-1-centos67.x86_64.rpm -.PHONY: centos6.7 - -centos6.7-dbg: binaries/proxysql-${CURVER}-1-dbg-centos67.x86_64.rpm -.PHONY: centos6.7-dbg - - centos7: binaries/proxysql-${CURVER}-1-centos7.x86_64.rpm .PHONY: centos7 @@ -262,13 +269,6 @@ centos8-dbg: binaries/proxysql-${CURVER}-1-dbg-centos8.x86_64.rpm .PHONY: centos8-dbg -fedora24: binaries/proxysql-${CURVER}-1-fedora24.x86_64.rpm -.PHONY: fedora24 - -fedora24-dbg: binaries/proxysql-${CURVER}-1-dbg-fedora24.x86_64.rpm -.PHONY: fedora24-dbg - - fedora27: binaries/proxysql-${CURVER}-1-fedora27.x86_64.rpm .PHONY: fedora27 @@ -283,10 +283,6 @@ fedora28-dbg: binaries/proxysql-${CURVER}-1-dbg-fedora28.x86_64.rpm .PHONY: fedora28-dbg -fedora32-arm64: binaries/proxysql-${CURVER}-1-fedora32.aarch64.rpm -.PHONY: fedora32-arm64 - - fedora33: binaries/proxysql-${CURVER}-1-fedora33.x86_64.rpm .PHONY: fedora33 @@ -344,13 +340,6 @@ ubuntu20-dbg: binaries/proxysql_${CURVER}-dbg-ubuntu20_amd64.deb .PHONY: ubuntu20-dbg -debian7: binaries/proxysql_${CURVER}-debian7_amd64.deb -.PHONY: debian7 - -debian7-dbg: binaries/proxysql_${CURVER}-dbg-debian7_amd64.deb -.PHONY: debian7-dbg - - debian8: binaries/proxysql_${CURVER}-debian8_amd64.deb .PHONY: debian8 @@ -368,13 +357,6 @@ debian9-dbg: binaries/proxysql_${CURVER}-dbg-debian9_amd64.deb .PHONY: debian9-dbg -debian9.4: binaries/proxysql_${CURVER}-debian9.4_amd64.deb -.PHONY: debian9.4 - -debian9.4-dbg: binaries/proxysql_${CURVER}-dbg-debian9.4_amd64.deb -.PHONY: debian9.4-dbg - - debian10: binaries/proxysql_${CURVER}-debian10_amd64.deb .PHONY: debian10 @@ -419,15 +401,6 @@ almalinux8-dbg: binaries/proxysql-${CURVER}-1-almalinux8-dbg.x86_64.rpm -binaries/proxysql-${CURVER}-1-centos5.x86_64.rpm: - docker-compose up centos5_build - docker-compose rm -f - -binaries/proxysql-${CURVER}-1-dbg-centos5.x86_64.rpm: - docker-compose up centos5_dbg_build - docker-compose rm -f - - binaries/proxysql-${CURVER}-1-centos6.x86_64.rpm: docker-compose up centos6_build docker-compose rm -f @@ -437,15 +410,6 @@ binaries/proxysql-${CURVER}-1-dbg-centos6.x86_64.rpm: docker-compose rm -f -binaries/proxysql-${CURVER}-1-centos67.x86_64.rpm: - docker-compose up centos67_build - docker-compose rm -f - -binaries/proxysql-${CURVER}-1-dbg-centos67.x86_64.rpm: - docker-compose up centos67_dbg_build - docker-compose rm -f - - binaries/proxysql-${CURVER}-1-centos7.x86_64.rpm: docker-compose up centos7_build docker-compose rm -f @@ -476,15 +440,6 @@ binaries/proxysql-${CURVER}-1-dbg-centos8.x86_64.rpm: docker-compose rm -f -binaries/proxysql-${CURVER}-1-fedora24.x86_64.rpm: - docker-compose up fedora24_build - docker-compose rm -f - -binaries/proxysql-${CURVER}-1-dbg-fedora24.x86_64.rpm: - docker-compose up fedora24_dbg_build - docker-compose rm -f - - binaries/proxysql-${CURVER}-1-dbg-fedora27.x86_64.rpm: docker-compose up fedora27_dbg_build docker-compose rm -f @@ -503,11 +458,6 @@ binaries/proxysql-${CURVER}-1-dbg-fedora28.x86_64.rpm: docker-compose rm -f -binaries/proxysql-${CURVER}-1-fedora32.aarch64.rpm: - docker-compose up fedora32_build - docker-compose rm -f - - binaries/proxysql-${CURVER}-1-fedora33.x86_64.rpm: docker-compose up fedora33_build docker-compose rm -f @@ -535,11 +485,6 @@ binaries/proxysql-${CURVER}-1-dbg-fedora34.x86_64.rpm: docker-compose rm -f -binaries/proxysql_${CURVER}-ubuntu12_amd64.deb: - docker-compose up ubuntu12_build - docker-compose rm -f - - binaries/proxysql_${CURVER}-ubuntu14_amd64.deb: docker-compose up ubuntu14_build docker-compose rm -f @@ -566,16 +511,15 @@ binaries/proxysql_${CURVER}-dbg-ubuntu18_amd64.deb: docker-compose up ubuntu18_dbg_build docker-compose rm -f - binaries/proxysql_${CURVER}-ubuntu18_aarch64.deb: docker-compose up ubuntu18_build docker-compose rm -f + binaries/proxysql_${CURVER}-dbg-ubuntu20_amd64.deb: docker-compose up ubuntu20_dbg_build docker-compose rm -f - binaries/proxysql_${CURVER}-ubuntu20_amd64.deb: docker-compose up ubuntu20_build docker-compose rm -f @@ -589,15 +533,6 @@ binaries/proxysql_${CURVER}-ubuntu20_aarch64.deb: docker-compose rm -f -binaries/proxysql_${CURVER}-debian7_amd64.deb: - docker-compose up debian7_build - #docker-compose rm -f - -binaries/proxysql_${CURVER}-dbg-debian7_amd64.deb: - docker-compose up debian7_dbg_build - docker-compose rm -f - - binaries/proxysql_${CURVER}-debian8_amd64.deb: docker-compose up debian8_build docker-compose rm -f @@ -620,15 +555,6 @@ binaries/proxysql_${CURVER}-debian9_aarch64.deb: docker-compose rm -f -binaries/proxysql_${CURVER}-debian9.4_amd64.deb: - docker-compose up debian9_build - docker-compose rm -f - -binaries/proxysql_${CURVER}-dbg-debian9.4_amd64.deb: - docker-compose up debian9_dbg_build - docker-compose rm -f - - binaries/proxysql_${CURVER}-debian10_amd64.deb: docker-compose up debian10_build docker-compose rm -f