Skip to content
GitLab
Commit f6f6254b authored by Jessica Clarke's avatar Jessica Clarke Committed by Otto Kekäläinen
Browse files

Fix FTBFS on non-Linux architectures (Closes: #852728)

parent ea705b30
Hide whitespace changes
Inline Side-by-side
debian/mariadb-server-10.1.install
View file @ f6f6254b
#!/usr/bin/dh-exec
[linux-any] lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
[linux-any] usr/bin/galera_new_cluster
[linux-any] usr/bin/galera_recovery
[linux-any] usr/bin/mariadb-service-convert
debian/additions/debian-start etc/mysql debian/additions/debian-start etc/mysql
debian/additions/debian-start.inc.sh usr/share/mysql debian/additions/debian-start.inc.sh usr/share/mysql
debian/additions/echo_stderr usr/share/mysql debian/additions/echo_stderr usr/share/mysql
...@@ -5,15 +10,11 @@ debian/additions/mariadb.conf.d/50-mysqld_safe.cnf etc/mysql/mariadb.conf.d ...@@ -5,15 +10,11 @@ debian/additions/mariadb.conf.d/50-mysqld_safe.cnf etc/mysql/mariadb.conf.d
debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d
debian/additions/source_mariadb-10.1.py usr/share/apport/package-hooks debian/additions/source_mariadb-10.1.py usr/share/apport/package-hooks
etc/apparmor.d/usr.sbin.mysqld etc/apparmor.d/usr.sbin.mysqld
lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
usr/bin/aria_chk usr/bin/aria_chk
usr/bin/aria_dump_log usr/bin/aria_dump_log
usr/bin/aria_ftdump usr/bin/aria_ftdump
usr/bin/aria_pack usr/bin/aria_pack
usr/bin/aria_read_log usr/bin/aria_read_log
usr/bin/galera_new_cluster
usr/bin/galera_recovery
usr/bin/mariadb-service-convert
usr/bin/msql2mysql usr/bin/msql2mysql
usr/bin/my_print_defaults usr/bin/my_print_defaults
usr/bin/myisam_ftdump usr/bin/myisam_ftdump
......
debian/rules
View file @ f6f6254b
...@@ -14,6 +14,7 @@ BUILDDIR := builddir ...@@ -14,6 +14,7 @@ BUILDDIR := builddir
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
DEBVERSION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' ) DEBVERSION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
...@@ -119,9 +120,11 @@ override_dh_auto_install: ...@@ -119,9 +120,11 @@ override_dh_auto_install:
dh_testdir dh_testdir
dh_testroot dh_testroot
ifneq (,$(filter linux,$(DEB_BUILD_ARCH_OS)))
# Copy systemd files to a location available for dh_installinit # 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
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
endif
# make install # make install
cd $(BUILDDIR) && $(MAKE) install DESTDIR=$(TMP) cd $(BUILDDIR) && $(MAKE) install DESTDIR=$(TMP)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment