Kouhei Sutou
null+****@clear*****
Sat Apr 30 15:39:10 JST 2016
Kouhei Sutou 2016-04-30 15:39:10 +0900 (Sat, 30 Apr 2016) New Revision: b5ba7df4b8054137e03d86948edf17485b5ead26 https://github.com/mroonga/mroonga/commit/b5ba7df4b8054137e03d86948edf17485b5ead26 Message: package ubuntu: mysql-5.7 requires running cmake to generate files Modified files: packages/debian-5.7/rules Renamed files: packages/debian-5.7/apparmor/mysql-server-5.7-mroonga (from packages/debian-5.7/apparmor/mysql-server-5.6-mroonga) Renamed: packages/debian-5.7/apparmor/mysql-server-5.7-mroonga (+1 -1) 71% =================================================================== --- packages/debian-5.7/apparmor/mysql-server-5.6-mroonga 2016-04-30 11:52:16 +0900 (3d076ed) +++ packages/debian-5.7/apparmor/mysql-server-5.7-mroonga 2016-04-30 15:39:10 +0900 (cdc7906) @@ -2,4 +2,4 @@ /usr/lib/*/groonga/plugins/** rm, /etc/mecabrc r, /var/lib/mecab/dic/** r, -#include <local/mysql-server-5.6-mroonga> +#include <local/mysql-server-5.7-mroonga> Modified: packages/debian-5.7/rules (+18 -5) =================================================================== --- packages/debian-5.7/rules 2016-04-30 11:52:16 +0900 (7346a92) +++ packages/debian-5.7/rules 2016-04-30 15:39:10 +0900 (91cba31) @@ -6,14 +6,17 @@ # This has to be exported to make some magic below work. export DH_OPTIONS +export MYSQL_VERSION_FULL := $(shell apt-cache show mysql-server-5.7 | grep Version | head -n 1 | awk '{print $$2}') export MYSQL_VERSION := $(shell apt-cache show mysql-server-5.7 | grep Version | head -n 1 | awk '{print $$2}' | awk -F '-' '{print $$1}') %: dh $@ override_dh_auto_configure: + archive_base=mysql-$(MYSQL_VERSION); \ archive=mysql-5.7_$(MYSQL_VERSION).orig.tar.gz; \ - path=main/m/mysql-5.7/$${archive}; \ + debian=mysql-5.7_$(MYSQL_VERSION_FULL).debian.tar.xz; \ + path=main/m/mysql-5.7; \ if [ "$$(lsb_release --id --short)" = "Ubuntu" ]; then \ base_url=http://archive.ubuntu.com/ubuntu/pool; \ security_base_url=http://security.ubuntu.com/ubuntu/pool; \ @@ -21,10 +24,20 @@ override_dh_auto_configure: base_url=http://ftp.debian.org/debian/pool; \ security_base_url=http://security.debian.org/pool/updates; \ fi; \ - wget $${security_base_url}/$${path} || \ - wget $${base_url}/$${path}; \ - tar xf $${archive} - dh_auto_configure -- --with-mysql-source=./mysql-$(MYSQL_VERSION) + wget $${security_base_url}/$${path}/$${archive} || \ + wget $${base_url}/$${path}/$${archive}; \ + wget $${security_base_url}/$${path}/$${debian} || \ + wget $${base_url}/$${path}/$${debian}; \ + tar xf $${archive}; \ + (cd $${archive_base} && \ + tar xf ../$${debian} && \ + debian/rules override_dh_auto_configure && \ + echo "TODO: Remove the following cp after 6.03 is released" &&\ + cp builddir/libbinlogevents/include/binlog_config.h \ + libbinlogevents/include/); \ + dh_auto_configure -- \ + --with-mysql-source=./$${archive_base} \ + --with-mysql-build=./$${archive_base}/builddir # disable 'make check'. override_dh_auto_test: -------------- next part -------------- HTML����������������������������...Download
