From 576578af633a2f9bc2cbeeddce162f5542d5a7c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Mon, 25 Apr 2016 00:39:32 +0000 Subject: [PATCH] Added support for debug binaries in CentOS 6.7 and 7 --- Makefile | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 149e25f64..f09eab16a 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ clean: cd lib && ${MAKE} clean cd src && ${MAKE} clean -packages: centos6.7 centos7 ubuntu12 ubuntu14 debian7 debian8 ubuntu12-dbg ubuntu14-dbg debian7-dbg debian8-dbg +packages: centos6.7 centos7 centos6.7-dbg centos7-dbg ubuntu12 ubuntu14 debian7 debian8 ubuntu12-dbg ubuntu14-dbg debian7-dbg debian8-dbg .PHONY: packages @@ -55,7 +55,13 @@ centos6.7: binaries/proxysql-${CURVER}-1-centos67.x86_64.rpm .PHONY: centos6.7 centos7: binaries/proxysql-${CURVER}-1-centos7.x86_64.rpm -.PHONY: centos +.PHONY: centos7 + +centos6.7-dbg: binaries/proxysql-${CURVER}-1-dbg-centos67.x86_64.rpm +.PHONY: centos6.7-dbg + +centos7-dbg: binaries/proxysql-${CURVER}-1-dbg-centos7.x86_64.rpm +.PHONY: centos7-dbg ubuntu12: binaries/proxysql_${CURVER}-ubuntu12_amd64.deb .PHONY: ubuntu12 @@ -100,6 +106,24 @@ binaries/proxysql-${CURVER}-1-centos67.x86_64.rpm: docker stop centos67_build docker rm centos67_build +binaries/proxysql-${CURVER}-1-dbg-centos67.x86_64.rpm: + docker stop centos67_build || true + docker rm centos67_build || true + docker create --name centos67_build renecannao/proxysql:build-centos6.7 bash -c "while : ; do sleep 10 ; done" + docker start centos67_build + docker exec centos67_build bash -c "cd /opt; git clone -b v${CURVER} https://github.com/sysown/proxysql.git proxysql" + docker exec centos67_build bash -c "cd /opt/proxysql; ${MAKE} clean && ${MAKE} -j 4 build_deps && ${MAKE} debug" + docker exec -it centos67_build bash -c "cd /opt/proxysql ; mkdir -p proxysql/usr/bin; mkdir -p proxysql/etc; cp src/proxysql proxysql/usr/bin/; cp -a etc proxysql ; mv proxysql proxysql-${CURVER} ; tar czvf proxysql-${CURVER}.tar.gz proxysql-${CURVER}" + docker exec -it centos67_build bash -c "mkdir -p /root/rpmbuild/{RPMS,SRPMS,BUILD,SOURCES,SPECS,tmp}" + docker cp docker/images/proxysql/centos67-build/rpmmacros centos67_build:/root/.rpmmacros + docker cp docker/images/proxysql/centos67-build/proxysql.spec centos67_build:/root/rpmbuild/SPECS/proxysql.spec + docker exec -it centos67_build bash -c "cp /opt/proxysql/proxysql-${CURVER}.tar.gz /root/rpmbuild/SOURCES" + docker exec -it centos67_build bash -c "cd /root/rpmbuild; rpmbuild -ba SPECS/proxysql.spec" + docker exec -it centos67_build bash -c "cp /root/rpmbuild/RPMS/x86_64/proxysql-${CURVER}-1.x86_64.rpm /root/rpm" + docker cp centos67_build:/root/rpmbuild/RPMS/x86_64/proxysql-${CURVER}-1.x86_64.rpm ./binaries/proxysql-${CURVER}-1-dbg-centos67.x86_64.rpm + docker stop centos67_build + docker rm centos67_build + binaries/proxysql-${CURVER}-1-centos7.x86_64.rpm: docker stop centos7_build || true docker rm centos7_build || true @@ -118,6 +142,24 @@ binaries/proxysql-${CURVER}-1-centos7.x86_64.rpm: docker stop centos7_build docker rm centos7_build +binaries/proxysql-${CURVER}-1-dbg-centos7.x86_64.rpm: + docker stop centos7_build || true + docker rm centos7_build || true + docker create --name centos7_build renecannao/proxysql:build-centos7 bash -c "while : ; do sleep 10 ; done" + docker start centos7_build + docker exec centos7_build bash -c "cd /opt; git clone -b v${CURVER} https://github.com/sysown/proxysql.git proxysql" + docker exec centos7_build bash -c "cd /opt/proxysql; ${MAKE} clean && ${MAKE} -j 4 build_deps && ${MAKE} debug" + docker exec -it centos7_build bash -c "cd /opt/proxysql ; mkdir -p proxysql/usr/bin; mkdir -p proxysql/etc; cp src/proxysql proxysql/usr/bin/; cp -a etc proxysql ; mv proxysql proxysql-${CURVER} ; tar czvf proxysql-${CURVER}.tar.gz proxysql-${CURVER}" + docker exec -it centos7_build bash -c "mkdir -p /root/rpmbuild/{RPMS,SRPMS,BUILD,SOURCES,SPECS,tmp}" + docker cp docker/images/proxysql/centos7-build/rpmmacros centos7_build:/root/.rpmmacros + docker cp docker/images/proxysql/centos7-build/proxysql.spec centos7_build:/root/rpmbuild/SPECS/proxysql.spec + docker exec -it centos7_build bash -c "cp /opt/proxysql/proxysql-${CURVER}.tar.gz /root/rpmbuild/SOURCES" + docker exec -it centos7_build bash -c "cd /root/rpmbuild; rpmbuild -ba SPECS/proxysql.spec" + docker exec -it centos7_build bash -c "cp /root/rpmbuild/RPMS/x86_64/proxysql-${CURVER}-1.x86_64.rpm /root/rpm" + docker cp centos7_build:/root/rpmbuild/RPMS/x86_64/proxysql-${CURVER}-1.x86_64.rpm ./binaries/proxysql-${CURVER}-1-dbg-centos7.x86_64.rpm + docker stop centos7_build + docker rm centos7_build + binaries/proxysql_${CURVER}-ubuntu12_amd64.deb: docker stop ubuntu12_build || true