package/mysql: drop virtual package

Now that oracle-mysql is dropped there isn't any need for the mysql virtual package. Adjust the other packages to directly use the mariadb symbols. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-11-26 23:13:27 +08:00 · 2024-03-03 21:46:41 +01:00 · 2024-03-03 21:46:41 +01:00 · 8708f3a23a
commit 8708f3a23a
parent 7cc49fc692
41 changed files with 66 additions and 95 deletions
--- a/Config.in.legacy
+++ b/Config.in.legacy
@ -146,6 +146,14 @@ endif

 comment "Legacy options removed in 2024.02"

+config BR2_PACKAGE_MYSQL
+	bool "mysql virtual package removed"
+	select BR2_LEGACY
+	help
+	  The mysql virtual package has been removed as mariadb is the
+	  only supported mysql variant. Use the mariadb package
+	  instead.
+
 config BR2_PACKAGE_ORACLE_MYSQL
 	bool "oracle mysql removed"
 	select BR2_LEGACY
--- a/package/Config.in
+++ b/package/Config.in
@ -1587,8 +1587,8 @@ menu "Database"
 	source "package/libodb-mysql/Config.in"
 	source "package/libodb-pgsql/Config.in"
 	source "package/libpqxx/Config.in"
+	source "package/mariadb/Config.in"
 	source "package/mongodb/Config.in"
-	source "package/mysql/Config.in"
 	source "package/postgresql/Config.in"
 if BR2_PACKAGE_POSTGRESQL
 	source "package/osm2pgsql/Config.in"
--- a/package/apr-util/apr-util.mk
+++ b/package/apr-util/apr-util.mk
@ -35,9 +35,9 @@ else
 APR_UTIL_CONF_OPTS += --without-gdbm
 endif

-ifeq ($(BR2_PACKAGE_MYSQL),y)
+ifeq ($(BR2_PACKAGE_MARIADB),y)
 APR_UTIL_CONF_OPTS += --with-mysql="$(STAGING_DIR)/usr"
-APR_UTIL_DEPENDENCIES += mysql
+APR_UTIL_DEPENDENCIES += mariadb
 else
 APR_UTIL_CONF_OPTS += --without-mysql
 endif
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@ -394,7 +394,7 @@ config BR2_PACKAGE_COLLECTD_MYSQL
 	depends on BR2_INSTALL_LIBSTDCPP # mysql
 	depends on BR2_USE_MMU # mysql
 	depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
-	select BR2_PACKAGE_MYSQL
+	select BR2_PACKAGE_MARIADB
 	help
 	  Connects to a MySQL database and issues a "show status"
 	  command.
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@ -194,7 +194,7 @@ COLLECTD_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \
 	$(if $(BR2_PACKAGE_COLLECTD_MODBUS),libmodbus) \
 	$(if $(BR2_PACKAGE_COLLECTD_MQTT),mosquitto) \
-	$(if $(BR2_PACKAGE_COLLECTD_MYSQL),mysql) \
+	$(if $(BR2_PACKAGE_COLLECTD_MYSQL),mariadb) \
 	$(if $(BR2_PACKAGE_COLLECTD_NETLINK),libmnl) \
 	$(if $(BR2_PACKAGE_COLLECTD_NGINX),libcurl) \
 	$(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),libesmtp) \
@ -224,7 +224,7 @@ endif
 ifeq ($(BR2_PACKAGE_LUAJIT),y)
 COLLECTD_CONF_ENV += LIBLUA_PKG_CONFIG_NAME=luajit
 endif
-ifeq ($(BR2_PACKAGE_MYSQL),y)
+ifeq ($(BR2_PACKAGE_MARIADB),y)
 COLLECTD_CONF_OPTS += --with-libmysql=$(STAGING_DIR)/usr
 endif
 ifeq ($(BR2_PACKAGE_NETSNMP),y)
--- a/package/cppdb/Config.in
+++ b/package/cppdb/Config.in
@ -5,7 +5,7 @@ config BR2_PACKAGE_CPPDB
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	# Can be built without them but it's useless
-	depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE
+	depends on BR2_PACKAGE_MARIADB || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE
 	help
 	  CppDB is an SQL connectivity library that is designed to
 	  provide platform and Database independent connectivity API
@ -15,6 +15,6 @@ config BR2_PACKAGE_CPPDB
 	  http://cppcms.com/sql/cppdb/

 comment "cppdb needs a toolchain w/ C++, threads, dynamic library"
-	depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE
+	depends on BR2_PACKAGE_MARIADB || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
 		BR2_STATIC_LIBS
--- a/package/cppdb/cppdb.mk
+++ b/package/cppdb/cppdb.mk
@ -12,8 +12,8 @@ CPPDB_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite)
 CPPDB_LICENSE = BSL-1.0 or MIT
 CPPDB_LICENSE_FILES = LICENSE_1_0.txt MIT.txt

-ifeq ($(BR2_PACKAGE_MYSQL),y)
-CPPDB_DEPENDENCIES += mysql
+ifeq ($(BR2_PACKAGE_MARIADB),y)
+CPPDB_DEPENDENCIES += mariadb
 else
 CPPDB_CONF_OPTS += -DDISABLE_MYSQL=ON
 endif
--- a/package/dovecot/Config.in
+++ b/package/dovecot/Config.in
@ -17,9 +17,9 @@ if BR2_PACKAGE_DOVECOT

 config BR2_PACKAGE_DOVECOT_MYSQL
 	bool "mysql support"
-	depends on BR2_INSTALL_LIBSTDCPP # mysql
-	depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
-	select BR2_PACKAGE_MYSQL
+	depends on BR2_INSTALL_LIBSTDCPP # mariadb
+	depends on BR2_TOOLCHAIN_HAS_THREADS # mariadb
+	select BR2_PACKAGE_MARIADB
 	help
 	  Enable MySQL support.

--- a/package/dovecot/dovecot.mk
+++ b/package/dovecot/dovecot.mk
@ -83,7 +83,7 @@ endif
 ifeq ($(BR2_PACKAGE_DOVECOT_MYSQL),y)
 DOVECOT_CONF_ENV += MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/mysql_config"
 DOVECOT_CONF_OPTS += --with-mysql
-DOVECOT_DEPENDENCIES += mysql
+DOVECOT_DEPENDENCIES += mariadb
 else
 DOVECOT_CONF_OPTS += --without-mysql
 endif
--- a/package/freeradius-server/freeradius-server.mk
+++ b/package/freeradius-server/freeradius-server.mk
@ -140,9 +140,9 @@ else
 FREERADIUS_SERVER_CONF_OPTS += --without-rlm_cache_memcached
 endif

-ifeq ($(BR2_PACKAGE_MYSQL),y)
+ifeq ($(BR2_PACKAGE_MARIADB),y)
 FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_mysql
-FREERADIUS_SERVER_DEPENDENCIES += mysql
+FREERADIUS_SERVER_DEPENDENCIES += mariadb
 else
 FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_mysql
 endif
--- a/package/gerbera/gerbera.mk
+++ b/package/gerbera/gerbera.mk
@ -89,8 +89,8 @@ GERBERA_DEPENDENCIES += libupnp
 GERBERA_CONF_OPTS += -DWITH_NPUPNP=OFF
 endif

-ifeq ($(BR2_PACKAGE_MYSQL),y)
-GERBERA_DEPENDENCIES += mysql
+ifeq ($(BR2_PACKAGE_MARIADB),y)
+GERBERA_DEPENDENCIES += mariadb
 GERBERA_CONF_OPTS += -DWITH_MYSQL=ON
 else
 GERBERA_CONF_OPTS += -DWITH_MYSQL=OFF
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@ -198,7 +198,7 @@ comment "nfs support needs a toolchain w/ threads support"

 config BR2_PACKAGE_KODI_MYSQL
 	bool "mysql"
-	select BR2_PACKAGE_MYSQL
+	select BR2_PACKAGE_MARIADB
 	help
 	  Enable MySQL support

--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@ -216,7 +216,7 @@ endif

 ifeq ($(BR2_PACKAGE_KODI_MYSQL),y)
 KODI_CONF_OPTS += -DENABLE_MYSQLCLIENT=ON
-KODI_DEPENDENCIES += mysql
+KODI_DEPENDENCIES += mariadb
 else
 KODI_CONF_OPTS += -DENABLE_MYSQLCLIENT=OFF
 endif
--- a/package/libdbi-drivers/libdbi-drivers.mk
+++ b/package/libdbi-drivers/libdbi-drivers.mk
@ -15,8 +15,8 @@ LIBDBI_DRIVERS_AUTORECONF = YES

 LIBDBI_DRIVERS_CONF_OPTS = --with-dbi-libdir=$(STAGING_DIR)/usr/lib

-ifeq ($(BR2_PACKAGE_MYSQL),y)
-LIBDBI_DRIVERS_DEPENDENCIES += mysql
+ifeq ($(BR2_PACKAGE_MARIADB),y)
+LIBDBI_DRIVERS_DEPENDENCIES += mariadb
 LIBDBI_DRIVERS_CONF_OPTS += --with-mysql
 LIBDBI_DRIVERS_CONF_ENV += MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/mysql_config"
 else
--- a/package/libodb-mysql/Config.in
+++ b/package/libodb-mysql/Config.in
@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBODB_MYSQL
 	bool "libodb-mysql"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_PACKAGE_MYSQL
+	depends on BR2_PACKAGE_MARIADB
 	select BR2_PACKAGE_LIBODB
 	help
 	  This package contains the MySQL ODB runtime library. Every
@ -13,4 +13,4 @@ config BR2_PACKAGE_LIBODB_MYSQL

 comment "libodb-mysql needs a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
-	depends on BR2_PACKAGE_MYSQL
+	depends on BR2_PACKAGE_MARIADB
--- a/package/libodb-mysql/libodb-mysql.mk
+++ b/package/libodb-mysql/libodb-mysql.mk
@ -11,7 +11,7 @@ LIBODB_MYSQL_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_MYSQL_VE
 LIBODB_MYSQL_INSTALL_STAGING = YES
 LIBODB_MYSQL_LICENSE = GPL-2.0
 LIBODB_MYSQL_LICENSE_FILES = LICENSE
-LIBODB_MYSQL_DEPENDENCIES = libodb mysql
+LIBODB_MYSQL_DEPENDENCIES = libodb mariadb
 LIBODB_MYSQL_CONF_ENV = \
 	CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" \
 	LIBS=`$(STAGING_DIR)/usr/bin/mysql_config --libs`
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@ -73,7 +73,7 @@ LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=disabled
 endif

 ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y)
-LIGHTTPD_DEPENDENCIES += mysql
+LIGHTTPD_DEPENDENCIES += mariadb
 LIGHTTPD_CONF_OPTS += -Dwith_mysql=enabled
 else
 LIGHTTPD_CONF_OPTS += -Dwith_mysql=disabled
--- a/package/linknx/linknx.mk
+++ b/package/linknx/linknx.mk
@ -49,9 +49,9 @@ else
 LINKNX_CONF_OPTS += --without-lua
 endif

-ifeq ($(BR2_PACKAGE_MYSQL),y)
+ifeq ($(BR2_PACKAGE_MARIADB),y)
 LINKNX_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr
-LINKNX_DEPENDENCIES += mysql
+LINKNX_DEPENDENCIES += mariadb
 else
 LINKNX_CONF_OPTS += --without-mysql
 endif
--- a/package/mariadb/Config.in
+++ b/package/mariadb/Config.in
@ -1,22 +1,9 @@
-config BR2_PACKAGE_MYSQL
-	bool "mysql support"
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_USE_MMU # fork()
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	help
-	  Select the desired mysql provider.
-
-if BR2_PACKAGE_MYSQL
-
-choice
-	prompt "mysql variant"
-	help
-	  Select either the oracle mysql server or the mariadb server
-
 config BR2_PACKAGE_MARIADB
 	bool "mariadb"
 	depends on BR2_INSTALL_LIBSTDCPP # fmt
 	depends on !BR2_STATIC_LIBS
+	depends on BR2_USE_MMU # fork()
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
 	depends on BR2_USE_WCHAR # fmt
 	select BR2_PACKAGE_LIBAIO
@ -25,7 +12,6 @@ config BR2_PACKAGE_MARIADB
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_PCRE2
-	select BR2_PACKAGE_HAS_MYSQL
 	help
 	  MariaDB is one of the most popular database servers in the
 	  world.  It's made by the original developers of MySQL and
@ -33,13 +19,11 @@ config BR2_PACKAGE_MARIADB

 	  http://www.mariadb.org/

-comment "mariadb needs a toolchain w/ dynamic library, C++, wchar"
+comment "mariadb needs a toolchain w/ dynamic library, C++, threads, wchar"
 	depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \
-		|| !BR2_USE_WCHAR
+		|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8

-endchoice
-
 if BR2_PACKAGE_MARIADB

 config BR2_PACKAGE_MARIADB_SERVER
@ -54,16 +38,3 @@ config BR2_PACKAGE_MARIADB_SERVER_EMBEDDED
 	  Install the mariadb embedded server on the target.

 endif
-
-config BR2_PACKAGE_HAS_MYSQL
-	bool
-
-config BR2_PACKAGE_PROVIDES_MYSQL
-	string
-	default "mariadb"      if BR2_PACKAGE_MARIADB
-
-endif
-
-comment "mysql needs a toolchain w/ C++, threads"
-	depends on BR2_USE_MMU
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
--- a/package/mariadb/mariadb.mk
+++ b/package/mariadb/mariadb.mk
@ -13,7 +13,6 @@ MARIADB_LICENSE_FILES = README.md COPYING
 MARIADB_CPE_ID_VENDOR = mariadb
 MARIADB_SELINUX_MODULES = mysql
 MARIADB_INSTALL_STAGING = YES
-MARIADB_PROVIDES = mysql
 MARIADB_CONFIG_SCRIPTS = mysql_config

 MARIADB_DEPENDENCIES = \
--- a/package/motion/motion.mk
+++ b/package/motion/motion.mk
@ -23,8 +23,8 @@ else
 MOTION_CONF_OPTS += --without-ffmpeg
 endif

-ifeq ($(BR2_PACKAGE_MYSQL),y)
-MOTION_DEPENDENCIES += mysql
+ifeq ($(BR2_PACKAGE_MARIADB),y)
+MOTION_DEPENDENCIES += mariadb
 MOTION_CONF_OPTS += --with-mysql
 else
 MOTION_CONF_OPTS += --without-mysql
--- a/package/mysql/mysql.mk
+++ b/package/mysql/mysql.mk
@ -1,7 +0,0 @@
-################################################################################
-#
-# mysql
-#
-################################################################################
-
-$(eval $(virtual-package))
--- a/package/open2300/open2300.mk
+++ b/package/open2300/open2300.mk
@ -15,8 +15,8 @@ OPEN2300_BINS = \
 OPEN2300_CFLAGS = $(TARGET_CFLAGS)
 OPEN2300_LDFLAGS = $(TARGET_LDFLAGS)

-ifeq ($(BR2_PACKAGE_MYSQL),y)
-OPEN2300_DEPENDENCIES += mysql
+ifeq ($(BR2_PACKAGE_MARIADB),y)
+OPEN2300_DEPENDENCIES += mariadb
 OPEN2300_BINS += mysql2300 mysqlhistlog2300
 OPEN2300_CFLAGS += $(shell $(STAGING_DIR)/usr/bin/mysql_config --cflags)
 OPEN2300_LDFLAGS += $(shell $(STAGING_DIR)/usr/bin/mysql_config --libs)
--- a/package/perl-dbd-mysql/Config.in
+++ b/package/perl-dbd-mysql/Config.in
@ -4,7 +4,7 @@ config BR2_PACKAGE_PERL_DBD_MYSQL
 	depends on BR2_INSTALL_LIBSTDCPP # mysql
 	depends on BR2_USE_MMU # mysql
 	depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
-	select BR2_PACKAGE_MYSQL
+	select BR2_PACKAGE_MARIADB
 	select BR2_PACKAGE_PERL_DBI # runtime
 	help
 	  A MySQL driver for the Perl5 Database Interface (DBI).
--- a/package/perl-dbd-mysql/perl-dbd-mysql.mk
+++ b/package/perl-dbd-mysql/perl-dbd-mysql.mk
@ -9,7 +9,7 @@ PERL_DBD_MYSQL_SOURCE = DBD-mysql-$(PERL_DBD_MYSQL_VERSION).tar.gz
 PERL_DBD_MYSQL_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CA/CAPTTOFU
 PERL_DBD_MYSQL_DEPENDENCIES = \
 	host-perl-dbi \
-	mysql
+	mariadb
 PERL_DBD_MYSQL_LICENSE = Artistic or GPL-1.0+
 PERL_DBD_MYSQL_LICENSE_FILES = LICENSE
 PERL_DBD_MYSQL_DISTNAME = DBD-mysql
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@ -46,7 +46,7 @@ config BR2_PACKAGE_POCO_DATA
 config BR2_PACKAGE_POCO_DATA_MYSQL
 	bool "Data/MySQL"
 	depends on BR2_USE_MMU # mysql
-	select BR2_PACKAGE_MYSQL
+	select BR2_PACKAGE_MARIADB
 	select BR2_PACKAGE_POCO_DATA

 config BR2_PACKAGE_POCO_DATA_PGSQL
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@ -15,7 +15,7 @@ POCO_DEPENDENCIES = \
 	pcre2 \
 	zlib \
 	$(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \
-	$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \
+	$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mariadb) \
 	$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \
 	$(if $(BR2_PACKAGE_POCO_DATA_PGSQL),postgresql) \
 	$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \
--- a/package/pure-ftpd/pure-ftpd.mk
+++ b/package/pure-ftpd/pure-ftpd.mk
@ -31,9 +31,9 @@ ifeq ($(BR2_PACKAGE_LIBSODIUM),y)
 PURE_FTPD_DEPENDENCIES += libsodium
 endif

-ifeq ($(BR2_PACKAGE_MYSQL),y)
+ifeq ($(BR2_PACKAGE_MARIADB),y)
 PURE_FTPD_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr
-PURE_FTPD_DEPENDENCIES += mysql
+PURE_FTPD_DEPENDENCIES += mariadb
 else
 PURE_FTPD_CONF_OPTS += --without-mysql
 endif
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@ -62,7 +62,7 @@ if BR2_PACKAGE_QT5BASE_SQL
 config BR2_PACKAGE_QT5BASE_MYSQL
 	bool "MySQL Plugin"
 	depends on BR2_USE_MMU # mysql
-	select BR2_PACKAGE_MYSQL
+	select BR2_PACKAGE_MARIADB
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_READLINE
 	help
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@ -129,7 +129,7 @@ endif
 ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
 ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y)
 QT5BASE_CONFIGURE_OPTS += -plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
-QT5BASE_DEPENDENCIES   += mysql
+QT5BASE_DEPENDENCIES   += mariadb
 else
 QT5BASE_CONFIGURE_OPTS += -no-sql-mysql
 endif
--- a/package/qt6/qt6base/Config.in
+++ b/package/qt6/qt6base/Config.in
@ -190,7 +190,7 @@ config BR2_PACKAGE_QT6BASE_MYSQL
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_MMU
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	select BR2_PACKAGE_MYSQL
+	select BR2_PACKAGE_MARIADB
 	help
 	  Build MySQL plugin

--- a/package/qt6/qt6base/qt6base.mk
+++ b/package/qt6/qt6base/qt6base.mk
@ -313,7 +313,7 @@ QT6BASE_CONF_OPTS += -DFEATURE_sql_db2=OFF -DFEATURE_sql_ibase=OFF -DFEATURE_sql

 ifeq ($(BR2_PACKAGE_QT6BASE_MYSQL),y)
 QT6BASE_CONF_OPTS += -DFEATURE_sql_mysql=ON
-QT6BASE_DEPENDENCIES += mysql
+QT6BASE_DEPENDENCIES += mariadb
 else
 QT6BASE_CONF_OPTS += -DFEATURE_sql_mysql=OFF
 endif
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@ -102,8 +102,8 @@ else
 RSYSLOG_CONF_OPTS += --disable-impcap
 endif

-ifeq ($(BR2_PACKAGE_MYSQL),y)
-RSYSLOG_DEPENDENCIES += mysql
+ifeq ($(BR2_PACKAGE_MARIADB),y)
+RSYSLOG_DEPENDENCIES += mariadb
 RSYSLOG_CONF_OPTS += --enable-mysql
 RSYSLOG_CONF_ENV += ac_cv_prog_MYSQL_CONFIG=$(STAGING_DIR)/usr/bin/mysql_config
 else
--- a/package/sconeserver/Config.in
+++ b/package/sconeserver/Config.in
@ -67,7 +67,7 @@ config BR2_PACKAGE_SCONESERVER_MATHS
 config BR2_PACKAGE_SCONESERVER_MYSQL
 	bool "mysql"
 	depends on BR2_USE_MMU # mysql
-	select BR2_PACKAGE_MYSQL
+	select BR2_PACKAGE_MARIADB
 	help
 	  MySQL module for Sconeserver

--- a/package/sconeserver/sconeserver.mk
+++ b/package/sconeserver/sconeserver.mk
@ -63,7 +63,7 @@ SCONESERVER_CONF_OPTS += -DWITH_MATHS=OFF
 endif

 ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y)
-SCONESERVER_DEPENDENCIES += mysql
+SCONESERVER_DEPENDENCIES += mariadb
 SCONESERVER_CONF_OPTS += -DWITH_MYSQL=ON
 else
 SCONESERVER_CONF_OPTS += -DWITH_MYSQL=OFF
--- a/package/strongswan/Config.in
+++ b/package/strongswan/Config.in
@ -193,7 +193,7 @@ config BR2_PACKAGE_STRONGSWAN_STROKE

 config BR2_PACKAGE_STRONGSWAN_SQL
 	bool "Enable SQL database configuration backend"
-	depends on BR2_PACKAGE_SQLITE || BR2_PACKAGE_MYSQL
+	depends on BR2_PACKAGE_SQLITE || BR2_PACKAGE_MARIADB

 config BR2_PACKAGE_STRONGSWAN_BYPASS_LAN
 	bool "Enable BYPASS-LAN plugin"
--- a/package/strongswan/strongswan.mk
+++ b/package/strongswan/strongswan.mk
@ -80,7 +80,7 @@ STRONGSWAN_DEPENDENCIES += \
 ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y)
 STRONGSWAN_DEPENDENCIES += \
 	$(if $(BR2_PACKAGE_SQLITE),sqlite) \
-	$(if $(BR2_PACKAGE_MYSQL),mysql)
+	$(if $(BR2_PACKAGE_MARIADB),mariadb)
 endif

 # disable connmark/forecast until net/if.h vs. linux/if.h conflict resolved
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@ -35,7 +35,7 @@ HOST_TCL_PRE_CONFIGURE_HOOKS += HOST_TCL_REMOVE_PACKAGES
 # We remove the bundled sqlite as we prefer to not use bundled stuff at all.
 define TCL_REMOVE_PACKAGES
 	rm -fr $(@D)/pkgs/sqlite3* \
-		$(if $(BR2_PACKAGE_MYSQL),,$(@D)/pkgs/tdbcmysql*) \
+		$(if $(BR2_PACKAGE_MARIADB),,$(@D)/pkgs/tdbcmysql*) \
 		$(@D)/pkgs/tdbcodbc* \
 		$(if $(BR2_PACKAGE_POSTGRESQL),,$(@D)/pkgs/tdbcpostgres*) \
 		$(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3*)
@ -74,7 +74,7 @@ endef
 TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_EXTRA

 TCL_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite) \
-	$(if $(BR2_PACKAGE_MYSQL),mysql) \
+	$(if $(BR2_PACKAGE_MARIADB),mariadb) \
 	$(if $(BR2_PACKAGE_POSTGRESQL),postgresql) \
 	zlib

--- a/package/ulogd/ulogd.mk
+++ b/package/ulogd/ulogd.mk
@ -22,11 +22,11 @@ ULOGD_DEPENDENCIES += libdbi
 else
 ULOGD_CONF_OPTS += --disable-dbi
 endif
-ifeq ($(BR2_PACKAGE_MYSQL),y)
+ifeq ($(BR2_PACKAGE_MARIADB),y)
 ULOGD_CONF_OPTS += \
 	--enable-mysql \
 	--with-mysql-config=$(STAGING_DIR)/usr/bin/mysql_config
-ULOGD_DEPENDENCIES += mysql
+ULOGD_DEPENDENCIES += mariadb
 else
 ULOGD_CONF_OPTS += --disable-mysql
 endif
--- a/package/zabbix/Config.in
+++ b/package/zabbix/Config.in
@ -39,7 +39,7 @@ config BR2_PACKAGE_ZABBIX_SERVER_MYSQL
 	bool "mysql"
 	depends on BR2_INSTALL_LIBSTDCPP # mysql
 	depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
-	select BR2_PACKAGE_MYSQL
+	select BR2_PACKAGE_MARIADB

 config BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL
 	bool "postgresql"
--- a/package/zabbix/zabbix.mk
+++ b/package/zabbix/zabbix.mk
@ -107,7 +107,7 @@ ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_COPY_FRONTEND
 endif

 ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_MYSQL),y)
-ZABBIX_DEPENDENCIES += mysql
+ZABBIX_DEPENDENCIES += mariadb
 ZABBIX_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config --without-postgresql
 ZABBIX_DATABASE = mysql
 else ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL),y)