diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2017-10-02 09:46:59 +0300 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2017-10-02 09:46:59 +0300 |
commit | f603b13e46d33094ac926c992dedd3eb2af69183 (patch) | |
tree | 05ac9906fdb50a23d4574495cbac195a739de4ce | |
parent | aa192af43acd89b4c76274006232670d1802ab86 (diff) | |
download | mariadb-10.1-f603b13e46d33094ac926c992dedd3eb2af69183.tar.gz |
Update packaging for Dyson
-rw-r--r-- | debian/control | 11 | ||||
-rwxr-xr-x | debian/rules | 21 |
2 files changed, 24 insertions, 8 deletions
diff --git a/debian/control b/debian/control index ba98d9e..7608c6a 100644 --- a/debian/control +++ b/debian/control @@ -8,11 +8,12 @@ Uploaders: Otto Kekäläinen <otto@debian.org>, Build-Depends: bison, chrpath, cmake, - cracklib-runtime, + cracklib-runtime, debhelper (>= 9), - dh-apparmor, + dh-apparmor [linux-any], dh-exec, - dh-systemd, + dh-systemd [linux-any], + dh-smf [illumos-any], gdb, libaio-dev [linux-any], libarchive-dev, @@ -25,12 +26,12 @@ Build-Depends: bison, libpam0g-dev, libpcre3-dev (>= 2:8.35-3.2~), libreadline-gplv2-dev, - libsystemd-dev, + libsystemd-dev [linux-any], libxml2-dev, lsb-release, perl, po-debconf, - psmisc, + psmisc [!illumos-any], unixodbc-dev, zlib1g-dev (>= 1:1.1.3-5~) Standards-Version: 3.9.8 diff --git a/debian/rules b/debian/rules index 707c3b5..758bf4c 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk + BUILDDIR := builddir DEB_VERSION_REVISION := $(shell echo $(DEB_VERSION) | sed -e 's/^.*-//') RELEASE := $(shell lsb_release -r -s) # Use changelog based DEB_DISTRIBUTION instead? @@ -48,10 +49,20 @@ endif # Add support for verbose builds MAKEFLAGS += VERBOSE=1 +with := +ifeq (linux,$(DEB_HOST_ARCH_OS)) +with += systemd +endif +ifeq (illumos,$(DEB_HOST_ARCH_OS)) +with += smf +CMAKEFLAGS += -DENABLE_DTRACE=no +endif + +dh_with := $(with:%=--with %) + override_dh_auto_clean: @echo "RULES.$@" dh_testdir - dh_testroot rm -rf mysql-test/var rm -f storage/mroonga/mysql-test/mroonga/storage/r/information_schema_plugins.result rm -f storage/mroonga/mysql-test/mroonga/storage/r/variable_version.result @@ -109,7 +120,7 @@ override_dh_auto_install: dh_testdir dh_testroot -ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS))) +ifeq (linux,$(DEB_HOST_ARCH_OS)) # Copy systemd files to a location available for dh_installinit cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.1.mariadb.service cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.1.mariadb@.service @@ -133,6 +144,7 @@ endif override_dh_installlogrotate-arch: dh_installlogrotate --name mysql-server +ifeq (linux,$(DEB_HOST_ARCH_OS)) override_dh_systemd_enable: dh_systemd_enable --name=mariadb dh_systemd_enable --no-enable --name=mariadb@ @@ -140,7 +152,9 @@ override_dh_systemd_enable: # Disable dh_systemd_start due /etc/init.d/mysql messing with the automatic snippets override_dh_systemd_start: : +endif +ifneq (illumos,$(DEB_HOST_ARCH_OS)) # Start mysql at sequence number 19 before 20 where apache, proftpd etc gets # started which might depend on a running database server. override_dh_installinit-arch: @@ -148,11 +162,12 @@ override_dh_installinit-arch: override_dh_installcron-arch: dh_installcron --name mysql-server +endif get-orig-source: uscan --force-download --verbose %: - dh $@ --parallel --with systemd --fail-missing + dh $@ --parallel $(dh_with) --fail-missing # vim: ts=8 |