From c8d92b05d37f863ff894bcbb07dcd0155d2c61c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Mon, 12 Sep 2016 09:15:20 +0000 Subject: [PATCH] Preparation to compile on Ubuntu16 --- Makefile | 60 +++++++++---------- .../proxysql/centos67-build/proxysql.spec | 2 +- .../proxysql/centos7-build/proxysql.spec | 2 +- .../proxysql/debian-7.8-build/proxysql.ctl | 2 +- .../proxysql/debian-8.2-build/proxysql.ctl | 2 +- .../proxysql/ubuntu-12.04-build/proxysql.ctl | 2 +- .../proxysql/ubuntu-14.04-build/proxysql.ctl | 2 +- .../proxysql/ubuntu-15.10-build/proxysql.ctl | 2 +- .../proxysql/ubuntu-16.04-build/proxysql.ctl | 24 ++++++++ include/proxysql.h | 2 +- 10 files changed, 62 insertions(+), 38 deletions(-) create mode 100644 docker/images/proxysql/ubuntu-16.04-build/proxysql.ctl diff --git a/Makefile b/Makefile index 3fd5d6ebf..4d83eae22 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ DEBUG=${ALL_DEBUG} #export DEBUG #export OPTZ #export EXTRALINK -CURVER=1.2.2 +CURVER=1.2.3 DISTRO := $(shell gawk -F= '/^NAME/{print $$2}' /etc/os-release) .PHONY: default @@ -48,7 +48,7 @@ clean: cd lib && ${MAKE} clean cd src && ${MAKE} clean -packages: centos6.7 centos7 centos6.7-dbg centos7-dbg 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 ubuntu16 ubuntu16-dbg .PHONY: packages @@ -70,8 +70,8 @@ ubuntu12: binaries/proxysql_${CURVER}-ubuntu12_amd64.deb ubuntu14: binaries/proxysql_${CURVER}-ubuntu14_amd64.deb .PHONY: ubuntu14 -ubuntu15: binaries/proxysql_${CURVER}-ubuntu15_amd64.deb -.PHONY: ubuntu15 +ubuntu16: binaries/proxysql_${CURVER}-ubuntu16_amd64.deb +.PHONY: ubuntu16 debian7: binaries/proxysql_${CURVER}-debian7_amd64.deb .PHONY: debian7 @@ -85,8 +85,8 @@ ubuntu12-dbg: binaries/proxysql_${CURVER}-dbg-ubuntu12_amd64.deb ubuntu14-dbg: binaries/proxysql_${CURVER}-dbg-ubuntu14_amd64.deb .PHONY: ubuntu14-dbg -ubuntu15-dbg: binaries/proxysql_${CURVER}-dbg-ubuntu15_amd64.deb -.PHONY: ubuntu15-dbg +ubuntu16-dbg: binaries/proxysql_${CURVER}-dbg-ubuntu16_amd64.deb +.PHONY: ubuntu16-dbg debian7-dbg: binaries/proxysql_${CURVER}-dbg-debian7_amd64.deb .PHONY: debian7-dbg @@ -194,18 +194,18 @@ binaries/proxysql_${CURVER}-ubuntu14_amd64.deb: docker stop ubuntu14_build docker rm ubuntu14_build -binaries/proxysql_${CURVER}-ubuntu15_amd64.deb: - docker stop ubuntu15_build || true - docker rm ubuntu15_build || true - docker create --name ubuntu15_build renecannao/proxysql:build-ubuntu15 bash -c "while : ; do sleep 10 ; done" - docker start ubuntu15_build - docker exec ubuntu15_build bash -c "cd /opt; git clone -b v${CURVER} https://github.com/sysown/proxysql.git proxysql" - docker exec ubuntu15_build bash -c "cd /opt/proxysql; ${MAKE} clean && ${MAKE} -j 4 build_deps && ${MAKE} -j 4" - docker cp docker/images/proxysql/ubuntu-15.10-build/proxysql.ctl ubuntu15_build:/opt/proxysql/ - docker exec ubuntu15_build bash -c "cd /opt/proxysql; cp src/proxysql . ; equivs-build proxysql.ctl" - docker cp ubuntu15_build:/opt/proxysql/proxysql_${CURVER}_amd64.deb ./binaries/proxysql_${CURVER}-ubuntu15_amd64.deb - docker stop ubuntu15_build - docker rm ubuntu15_build +binaries/proxysql_${CURVER}-ubuntu16_amd64.deb: + docker stop ubuntu16_build || true + docker rm ubuntu16_build || true + docker create --name ubuntu16_build renecannao/proxysql:build-ubuntu16 bash -c "while : ; do sleep 10 ; done" + docker start ubuntu16_build + docker exec ubuntu16_build bash -c "cd /opt; git clone -b v${CURVER} https://github.com/sysown/proxysql.git proxysql" + docker exec ubuntu16_build bash -c "cd /opt/proxysql; ${MAKE} clean && ${MAKE} -j 4 build_deps && ${MAKE} -j 4" + docker cp docker/images/proxysql/ubuntu-16.04-build/proxysql.ctl ubuntu16_build:/opt/proxysql/ + docker exec ubuntu16_build bash -c "cd /opt/proxysql; cp src/proxysql . ; equivs-build proxysql.ctl" + docker cp ubuntu16_build:/opt/proxysql/proxysql_${CURVER}_amd64.deb ./binaries/proxysql_${CURVER}-ubuntu16_amd64.deb + docker stop ubuntu16_build + docker rm ubuntu16_build binaries/proxysql_${CURVER}-debian7_amd64.deb: docker stop debian7_build || true @@ -260,18 +260,18 @@ binaries/proxysql_${CURVER}-dbg-ubuntu14_amd64.deb: docker stop ubuntu14_build docker rm ubuntu14_build -binaries/proxysql_${CURVER}-dbg-ubuntu15_amd64.deb: - docker stop ubuntu15_build || true - docker rm ubuntu15_build || true - docker create --name ubuntu15_build renecannao/proxysql:build-ubuntu15 bash -c "while : ; do sleep 10 ; done" - docker start ubuntu15_build - docker exec ubuntu15_build bash -c "cd /opt; git clone -b v${CURVER} https://github.com/sysown/proxysql.git proxysql" - docker exec ubuntu15_build bash -c "cd /opt/proxysql; ${MAKE} clean && ${MAKE} -j 4 build_deps && ${MAKE} debug" - docker cp docker/images/proxysql/ubuntu-15.10-build/proxysql.ctl ubuntu15_build:/opt/proxysql/ - docker exec ubuntu15_build bash -c "cd /opt/proxysql; cp src/proxysql . ; equivs-build proxysql.ctl" - docker cp ubuntu15_build:/opt/proxysql/proxysql_${CURVER}_amd64.deb ./binaries/proxysql_${CURVER}-ubuntu15_amd64.deb - docker stop ubuntu15_build - docker rm ubuntu15_build +binaries/proxysql_${CURVER}-dbg-ubuntu16_amd64.deb: + docker stop ubuntu16_build || true + docker rm ubuntu16_build || true + docker create --name ubuntu16_build renecannao/proxysql:build-ubuntu16 bash -c "while : ; do sleep 10 ; done" + docker start ubuntu16_build + docker exec ubuntu16_build bash -c "cd /opt; git clone -b v${CURVER} https://github.com/sysown/proxysql.git proxysql" + docker exec ubuntu16_build bash -c "cd /opt/proxysql; ${MAKE} clean && ${MAKE} -j 4 build_deps && ${MAKE} debug" + docker cp docker/images/proxysql/ubuntu-16.04-build/proxysql.ctl ubuntu16_build:/opt/proxysql/ + docker exec ubuntu16_build bash -c "cd /opt/proxysql; cp src/proxysql . ; equivs-build proxysql.ctl" + docker cp ubuntu16_build:/opt/proxysql/proxysql_${CURVER}_amd64.deb ./binaries/proxysql_${CURVER}-ubuntu16_amd64.deb + docker stop ubuntu16_build + docker rm ubuntu16_build binaries/proxysql_${CURVER}-dbg-debian7_amd64.deb: docker stop debian7_build || true diff --git a/docker/images/proxysql/centos67-build/proxysql.spec b/docker/images/proxysql/centos67-build/proxysql.spec index 482c71de8..694210102 100644 --- a/docker/images/proxysql/centos67-build/proxysql.spec +++ b/docker/images/proxysql/centos67-build/proxysql.spec @@ -7,7 +7,7 @@ Summary: A high-performance MySQL proxy Name: proxysql -Version: 1.2.2 +Version: 1.2.3 Release: 1 License: GPL+ Group: Development/Tools diff --git a/docker/images/proxysql/centos7-build/proxysql.spec b/docker/images/proxysql/centos7-build/proxysql.spec index 482c71de8..694210102 100644 --- a/docker/images/proxysql/centos7-build/proxysql.spec +++ b/docker/images/proxysql/centos7-build/proxysql.spec @@ -7,7 +7,7 @@ Summary: A high-performance MySQL proxy Name: proxysql -Version: 1.2.2 +Version: 1.2.3 Release: 1 License: GPL+ Group: Development/Tools diff --git a/docker/images/proxysql/debian-7.8-build/proxysql.ctl b/docker/images/proxysql/debian-7.8-build/proxysql.ctl index 5c86af112..8475d93a5 100644 --- a/docker/images/proxysql/debian-7.8-build/proxysql.ctl +++ b/docker/images/proxysql/debian-7.8-build/proxysql.ctl @@ -4,7 +4,7 @@ Homepage: http://www.proxysql.com Standards-Version: 3.9.2 Package: proxysql -Version: 1.2.2 +Version: 1.2.3 Maintainer: Rene Cannao Architecture: amd64 # Changelog: CHANGELOG.md diff --git a/docker/images/proxysql/debian-8.2-build/proxysql.ctl b/docker/images/proxysql/debian-8.2-build/proxysql.ctl index 5c86af112..8475d93a5 100644 --- a/docker/images/proxysql/debian-8.2-build/proxysql.ctl +++ b/docker/images/proxysql/debian-8.2-build/proxysql.ctl @@ -4,7 +4,7 @@ Homepage: http://www.proxysql.com Standards-Version: 3.9.2 Package: proxysql -Version: 1.2.2 +Version: 1.2.3 Maintainer: Rene Cannao Architecture: amd64 # Changelog: CHANGELOG.md diff --git a/docker/images/proxysql/ubuntu-12.04-build/proxysql.ctl b/docker/images/proxysql/ubuntu-12.04-build/proxysql.ctl index 5c86af112..8475d93a5 100644 --- a/docker/images/proxysql/ubuntu-12.04-build/proxysql.ctl +++ b/docker/images/proxysql/ubuntu-12.04-build/proxysql.ctl @@ -4,7 +4,7 @@ Homepage: http://www.proxysql.com Standards-Version: 3.9.2 Package: proxysql -Version: 1.2.2 +Version: 1.2.3 Maintainer: Rene Cannao Architecture: amd64 # Changelog: CHANGELOG.md diff --git a/docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl b/docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl index 5c86af112..8475d93a5 100644 --- a/docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl +++ b/docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl @@ -4,7 +4,7 @@ Homepage: http://www.proxysql.com Standards-Version: 3.9.2 Package: proxysql -Version: 1.2.2 +Version: 1.2.3 Maintainer: Rene Cannao Architecture: amd64 # Changelog: CHANGELOG.md diff --git a/docker/images/proxysql/ubuntu-15.10-build/proxysql.ctl b/docker/images/proxysql/ubuntu-15.10-build/proxysql.ctl index 5c86af112..8475d93a5 100644 --- a/docker/images/proxysql/ubuntu-15.10-build/proxysql.ctl +++ b/docker/images/proxysql/ubuntu-15.10-build/proxysql.ctl @@ -4,7 +4,7 @@ Homepage: http://www.proxysql.com Standards-Version: 3.9.2 Package: proxysql -Version: 1.2.2 +Version: 1.2.3 Maintainer: Rene Cannao Architecture: amd64 # Changelog: CHANGELOG.md diff --git a/docker/images/proxysql/ubuntu-16.04-build/proxysql.ctl b/docker/images/proxysql/ubuntu-16.04-build/proxysql.ctl new file mode 100644 index 000000000..8475d93a5 --- /dev/null +++ b/docker/images/proxysql/ubuntu-16.04-build/proxysql.ctl @@ -0,0 +1,24 @@ +Section: misc +Priority: optional +Homepage: http://www.proxysql.com +Standards-Version: 3.9.2 + +Package: proxysql +Version: 1.2.3 +Maintainer: Rene Cannao +Architecture: amd64 +# Changelog: CHANGELOG.md +# Readme: README.md +Files: proxysql /usr/bin/ + etc/proxysql.cnf / + etc/init.d/proxysql / + tools/proxysql_galera_checker.sh /usr/share/proxysql/ + tools/proxysql_galera_writer.pl /usr/share/proxysql/ +Description: High performance MySQL proxy + ProxySQL is a fast, reliable MySQL proxy with advanced runtime configuration management (virtually no configuration change requires a restart). + . + It features query routing, query caching, query rewriting (for queries generated by ORMs, for example) and is most of the time a drop-in replacement for mysqld from the point of view of the application. It can be configured and remote controlled through an SQL-compatible admin interface. +File: postinst + #!/bin/sh -e + if [ ! -d /var/lib/proxysql ]; then mkdir /var/lib/proxysql ; fi + update-rc.d proxysql defaults diff --git a/include/proxysql.h b/include/proxysql.h index 1a79c3b8c..3397ef58d 100644 --- a/include/proxysql.h +++ b/include/proxysql.h @@ -99,7 +99,7 @@ #else #define DEB "" #endif /* DEBUG */ -#define PROXYSQL_VERSION "1.2.2" DEB +#define PROXYSQL_VERSION "1.2.3-RC" DEB #define PROXYSQL_CODENAME "Truls" #ifndef PROXYSQL_FUNC_DEFS