From e448917ad20e1400c0b7de8176bc9246e54ab3f1 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Thu, 4 Nov 2021 13:45:17 -0300 Subject: [PATCH 1/3] mariadb: ensure columnstore engine is disabled mariadb may detect boost libraries, if the latter has been built with threads, date_time and chorno support, then it will enable the columnstore engine, which fails to build. Set PKG_RELEASE:=$(AUTORLEASE). Signed-off-by: Eneas U de Queiroz --- utils/mariadb/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index 6a14242f6..55fb191db 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mariadb PKG_VERSION:=10.6.4 -PKG_RELEASE:=1 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL := https://archive.mariadb.org/$(PKG_NAME)-$(PKG_VERSION)/source @@ -36,6 +36,7 @@ MARIADB_SOCKET=/var/run/mysqld/mysqld.sock MARIADB_DISABLE_ENGINES := \ cassandra \ + columnstore \ example \ mroonga \ oqgraph \ From 6bc9ec549dba57384970e9f0d0f40a80a35c4a57 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Thu, 4 Nov 2021 13:55:28 -0300 Subject: [PATCH 2/3] liburing: add KERNEL_IO_URING dependency This needs kernel io_uring support to work. Signed-off-by: Eneas U de Queiroz --- libs/liburing/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/liburing/Makefile b/libs/liburing/Makefile index 2e5183e5c..5748cd3c7 100644 --- a/libs/liburing/Makefile +++ b/libs/liburing/Makefile @@ -22,6 +22,7 @@ define Package/liburing CATEGORY:=Libraries TITLE:=io_uring library URL:=https://git.kernel.dk/cgit/liburing + DEPENDS:=@KERNEL_IO_URING endef define Package/liburing/description From a3cec3e410687beb4ecefd614269c9f5f8923c06 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Thu, 4 Nov 2021 14:23:03 -0300 Subject: [PATCH 3/3] mariadb: use liburing if kernel supports it liburing is preferred over libaio. So, if liburing has already been built, mariadb will use it, instead of libaio, failing with a missed dependency. If it is not found, then libaio is used. Since it depends on the kernel being built with io_uring support, and it defaults to y unless SMALL_FLASH=y, then we should allow libaio as fallback, checking the CONFIG_KERNEL_IO_URING symbol. Signed-off-by: Eneas U de Queiroz --- utils/mariadb/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index 55fb191db..a9c9eca93 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -82,6 +82,7 @@ MARIADB_SERVER_PLUGINS := \ PKG_CONFIG_DEPENDS := \ $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-server-plugin-%,$(subst _,-,$(MARIADB_SERVER_PLUGINS))) \ + CONFIG_KERNEL_IO_URING \ CONFIG_PACKAGE_mariadb-server plugin-auth_ed25519 := PLUGIN_AUTH_ED25519 @@ -284,7 +285,8 @@ define Package/mariadb-server-base $(call Package/mariadb/Default) DEPENDS:=mariadb-common \ $(MARIADB_COMMON_DEPENDS) \ - +libaio \ + +!KERNEL_IO_URING:libaio \ + +KERNEL_IO_URING:liburing \ +liblzma \ +libpcre2 \ +resolveip