mariadb: fix compilation when selinux is present 13640/head
authorRosen Penev <rosenp@gmail.com>
Mon, 12 Oct 2020 04:50:32 +0000 (21:50 -0700)
committerRosen Penev <rosenp@gmail.com>
Mon, 12 Oct 2020 05:14:02 +0000 (22:14 -0700)
Signed-off-by: Rosen Penev <rosenp@gmail.com>
utils/mariadb/Makefile
utils/mariadb/patches/200-no-selinux.patch [new file with mode: 0644]

index 96b01fe2faca0109d96c9e7f4b3d0418198f9c16..321ee70a9b6280d7adaf436722a82e15a7b6e3b1 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mariadb
 PKG_VERSION:=10.4.14
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL := \
diff --git a/utils/mariadb/patches/200-no-selinux.patch b/utils/mariadb/patches/200-no-selinux.patch
new file mode 100644 (file)
index 0000000..d7ed569
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/support-files/CMakeLists.txt
++++ b/support-files/CMakeLists.txt
+@@ -61,7 +61,7 @@ IF(UNIX)
+     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
+     INSTALL(DIRECTORY policy DESTINATION ${inst_location} COMPONENT SupportFiles)
+     FIND_PROGRAM(CHECKMODULE checkmodule)
+-    FIND_PROGRAM(SEMODULE_PACKAGE semodule_package)
++#    FIND_PROGRAM(SEMODULE_PACKAGE semodule_package)
+     MARK_AS_ADVANCED(CHECKMODULE SEMODULE_PACKAGE)
+     # Build pp files in policy/selinux