[Buildroot] [git commit branch/2018.02.x] mariadb: drop my-small.cnf handling

Peter Korsgaard peter at korsgaard.com
Sun Nov 25 20:10:47 UTC 2018


commit: https://git.buildroot.net/buildroot/commit/?id=a189aefcec4c9b395b7c147e61f6c7b20d5803bb
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2018.02.x

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 <peter at korsgaard.com>
---
 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


More information about the buildroot mailing list