From 0095ea78b91f1be4af91f517fe57d5928b126332 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 23 Nov 2018 21:44:49 +0100 Subject: [PATCH] mariadb: drop my-small.cnf handling Unbreaks builds without BR2_PACKAGE_MARIADB_SERVER as this only gets installed if the server is enabled. As pointed out in commit 2b82e014b40 (package/mariadb: bump version to 10.3.10), this file has been removed upstream in newer versions as it hasn't been updated in >8 years and the compiled in defaults are sensible, so completely remove the file handling instead of adding logic to only install it if the server is enabled. Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index e8ccf7a2a9..fa0b1485d5 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -112,8 +112,6 @@ endif # We also don't need the test suite on the target define MARIADB_POST_INSTALL mkdir -p $(TARGET_DIR)/var/lib/mysql - $(INSTALL) -D -m 644 $(TARGET_DIR)/usr/share/mysql/my-small.cnf \ - $(TARGET_DIR)/etc/mysql/my.cnf $(RM) $(TARGET_DIR)/usr/bin/mysql_config $(RM) -r $(TARGET_DIR)/usr/share/mysql/test endef