Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #17064 from cotequeiroz/mariadb

Browse source 
mariadb, liburing: fix liburing dependency failure (use liburing if kernel supports it)
This commit is contained in:
Eneas U de Queiroz 2021-11-25 20:52:26 -03:00 committed by GitHub
commit 9335b406bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libs/liburing/Makefile
View file

@ -22,6 +22,7 @@ define Package/liburing
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=io_uring library TITLE:=io_uring library
URL:=https://git.kernel.dk/cgit/liburing URL:=https://git.kernel.dk/cgit/liburing
DEPENDS:=@KERNEL_IO_URING
endef endef
define Package/liburing/description define Package/liburing/description

7
utils/mariadb/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mariadb PKG_NAME:=mariadb
PKG_VERSION:=10.6.4 PKG_VERSION:=10.6.4
PKG_RELEASE:=1 PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL := https://archive.mariadb.org/$(PKG_NAME)-$(PKG_VERSION)/source 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 := \ MARIADB_DISABLE_ENGINES := \
cassandra \ cassandra \
columnstore \
example \ example \
mroonga \ mroonga \
oqgraph \ oqgraph \
@ -81,6 +82,7 @@ MARIADB_SERVER_PLUGINS := \
PKG_CONFIG_DEPENDS := \ PKG_CONFIG_DEPENDS := \
$(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-server-plugin-%,$(subst _,-,$(MARIADB_SERVER_PLUGINS))) \ $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-server-plugin-%,$(subst _,-,$(MARIADB_SERVER_PLUGINS))) \
CONFIG_KERNEL_IO_URING \
CONFIG_PACKAGE_mariadb-server CONFIG_PACKAGE_mariadb-server
plugin-auth_ed25519 := PLUGIN_AUTH_ED25519 plugin-auth_ed25519 := PLUGIN_AUTH_ED25519
@ -283,7 +285,8 @@ define Package/mariadb-server-base
$(call Package/mariadb/Default) $(call Package/mariadb/Default)
DEPENDS:=mariadb-common \ DEPENDS:=mariadb-common \
$(MARIADB_COMMON_DEPENDS) \ $(MARIADB_COMMON_DEPENDS) \
+libaio \ +!KERNEL_IO_URING:libaio \
+KERNEL_IO_URING:liburing \
+liblzma \ +liblzma \
+libpcre2 \ +libpcre2 \
+resolveip +resolveip