diff options
| author | Otto Kekäläinen <otto@mariadb.org> | 2018-04-17 21:54:30 +0300 |
|---|---|---|
| committer | Otto Kekäläinen <otto@mariadb.org> | 2018-05-29 23:52:46 +0300 |
| commit | a2499a2d46848ddca2b89bc4136514b770511042 (patch) | |
| tree | 2380222824f60d83a335d8fc0803537a4ee269bc /debian | |
| parent | a3539bbb2ac51dfa2b363d3b4c11784c25d1f256 (diff) | |
| download | mariadb-git-a2499a2d46848ddca2b89bc4136514b770511042.tar.gz | |
Deb: Clean away legacy rules sections which no longer have a function
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/mysql-common.install | 1 | ||||
| -rwxr-xr-x | debian/rules | 14 |
2 files changed, 0 insertions, 15 deletions
diff --git a/debian/mysql-common.install b/debian/mysql-common.install index 264df611822..56c1c4a03f6 100644 --- a/debian/mysql-common.install +++ b/debian/mysql-common.install @@ -1,2 +1 @@ debian/additions/my.cnf etc/mysql -usr/share/mysql-common/internal-use-only diff --git a/debian/rules b/debian/rules index f5e2c21a126..a0bdf81e973 100755 --- a/debian/rules +++ b/debian/rules @@ -95,17 +95,12 @@ endif -DCOMPILATION_COMMENT="mariadb.org binary distribution" \ -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \ -DSYSTEM_TYPE="debian-$(DEB_BUILD_GNU_SYSTEM)" \ - $${MYSQL_BUILD_CXX:+-DCMAKE_CXX_COMPILER=$${MYSQL_BUILD_CXX}} \ - $${MYSQL_BUILD_CC:+-DCMAKE_C_COMPILER=$${MYSQL_BUILD_CC}} \ - $${MYSQL_COMPILER_LAUNCHER:+-DCMAKE_CXX_COMPILER_LAUNCHER=${MYSQL_COMPILER_LAUNCHER}} \ - $${MYSQL_COMPILER_LAUNCHER:+-DCMAKE_C_COMPILER_LAUNCHER=${MYSQL_COMPILER_LAUNCHER}} \ -DCMAKE_SYSTEM_PROCESSOR=$(DEB_BUILD_ARCH) \ -DBUILD_CONFIG=mysql_release \ -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \ -DINSTALL_PLUGINDIR=lib/mysql/plugin \ -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test \ -DDEB=$(DISTRIBUTION) ..' - touch $@ # This is needed, otherwise 'make test' will run before binaries have been built override_dh_auto_build: @@ -113,7 +108,6 @@ override_dh_auto_build: # Print build env info to help debug builds on different platforms dpkg-architecture cd $(BUILDDIR) && $(MAKE) - touch $@ override_dh_auto_test: @echo "RULES.$@" @@ -151,13 +145,6 @@ override_dh_auto_install: # to satisfy Debian reproducible build requirements nm --defined-only $(BUILDDIR)/sql/mysqld | LC_ALL=C sort | gzip -n -9 > $(TMP)/usr/share/doc/mariadb-server-10.3/mysqld.sym.gz - # For 5.0 -> 10.3 transition - d=$(TMP)/usr/share/mysql-common/internal-use-only/; \ - mkdir -p $$d; \ - cp debian/mariadb-server-10.3.mysql.init $$d/_etc_init.d_mysql; \ - cp debian/mariadb-server-10.3.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \ - cp debian/additions/debian-start $$d/_etc_mysql_debian-start; - # rename and install AppArmor profile install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld # install Apport hook @@ -172,7 +159,6 @@ override_dh_auto_install: ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.19 ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.20 - touch $@ override_dh_installlogrotate-arch: dh_installlogrotate --name mysql-server |