Commit 713d5136 authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-12074 selinux build failure on Fedora 24

parent 831b5318
...@@ -221,7 +221,7 @@ support-files/mysql.spec ...@@ -221,7 +221,7 @@ support-files/mysql.spec
support-files/mysqld_multi.server support-files/mysqld_multi.server
support-files/wsrep.cnf support-files/wsrep.cnf
support-files/wsrep_notify support-files/wsrep_notify
support-files/SELinux/centos6-mariadb.pp support-files/SELinux/mariadb.pp
tags tags
tests/async_queries tests/async_queries
tests/bug25714 tests/bug25714
......
...@@ -20,7 +20,7 @@ MARK_AS_ADVANCED(CHECKMODULE SEMODULE_PACKAGE) ...@@ -20,7 +20,7 @@ MARK_AS_ADVANCED(CHECKMODULE SEMODULE_PACKAGE)
SET(params DESTINATION ${INSTALL_SUPPORTFILESDIR}/SELinux COMPONENT SupportFiles) SET(params DESTINATION ${INSTALL_SUPPORTFILESDIR}/SELinux COMPONENT SupportFiles)
IF(CHECKMODULE AND SEMODULE_PACKAGE) IF(CHECKMODULE AND SEMODULE_PACKAGE)
FOREACH(pol centos6-mariadb) FOREACH(pol mariadb)
SET(src ${CMAKE_CURRENT_SOURCE_DIR}/${pol}.te) SET(src ${CMAKE_CURRENT_SOURCE_DIR}/${pol}.te)
SET(mod ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${pol}-pp.dir/${pol}.mod) SET(mod ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${pol}-pp.dir/${pol}.mod)
SET(out ${CMAKE_CURRENT_BINARY_DIR}/${pol}.pp) SET(out ${CMAKE_CURRENT_BINARY_DIR}/${pol}.pp)
...@@ -32,4 +32,4 @@ IF(CHECKMODULE AND SEMODULE_PACKAGE) ...@@ -32,4 +32,4 @@ IF(CHECKMODULE AND SEMODULE_PACKAGE)
INSTALL(FILES ${out} ${params}) INSTALL(FILES ${out} ${params})
ENDFOREACH() ENDFOREACH()
ENDIF() ENDIF()
INSTALL(FILES centos6-mariadb.te rhel4-mysql.fc rhel4-mysql.te ${params}) INSTALL(FILES mariadb.te rhel4-mysql.fc rhel4-mysql.te ${params})
...@@ -82,7 +82,7 @@ if [ -f /etc/redhat-release ] ; then ...@@ -82,7 +82,7 @@ if [ -f /etc/redhat-release ] ; then
fi fi
if grep 'CentOS release 6' /etc/redhat-release >/dev/null 2>&1; then if grep 'CentOS release 6' /etc/redhat-release >/dev/null 2>&1; then
if [ -x /usr/sbin/semodule ] ; then if [ -x /usr/sbin/semodule ] ; then
/usr/sbin/semodule -i /usr/share/mysql/SELinux/centos6-mariadb.pp /usr/sbin/semodule -i /usr/share/mysql/SELinux/mariadb.pp
fi fi
fi fi
fi fi
......
Markdown is supported
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