From: Rosen Penev Date: Mon, 12 Oct 2020 04:50:32 +0000 (-0700) Subject: mariadb: fix compilation when selinux is present X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F13640%2Fhead;p=feed%2Fpackages.git mariadb: fix compilation when selinux is present Signed-off-by: Rosen Penev --- diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index 96b01fe2fa..321ee70a9b 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -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 index 0000000000..d7ed569f71 --- /dev/null +++ b/utils/mariadb/patches/200-no-selinux.patch @@ -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