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

mariadb: move 50-client.cnf to lib pkg

Browse source 
50-client.cnf is used by the client library, so it should be installed
with the library. This commit moves the configuration file to the
correct package and updates its depend (50-client.cnf is sourced by
my.cnf from mariadb-common).

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2019-01-27 16:20:18 +01:00
parent ddea6e79ca
commit 9c56b2de11
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
utils/mariadb/Makefile
View file

@ -211,12 +211,17 @@ endef
define Package/libmariadb define Package/libmariadb
$(call Package/libmariadb/Default) $(call Package/libmariadb/Default)
DEPENDS:=$(MARIADB_COMMON_DEPENDS) DEPENDS:=+mariadb-common \
$(MARIADB_COMMON_DEPENDS)
TITLE:=MariaDB database client library TITLE:=MariaDB database client library
MENU:=1 MENU:=1
PROVIDES:=libmariadbclient libmysqlclient libmysqlclient-r PROVIDES:=libmariadbclient libmysqlclient libmysqlclient-r
endef endef
define Package/libmariadb/conffiles
$(CONF_DIR)/conf.d/50-client.cnf
endef
define Package/libmariadb/description define Package/libmariadb/description
$(call Package/mariadb/description/Default) $(call Package/mariadb/description/Default)
@ -256,7 +261,6 @@ define Package/mariadb-client-base
endef endef
define Package/mariadb-client-base/conffiles define Package/mariadb-client-base/conffiles
$(CONF_DIR)/conf.d/50-client.cnf
$(CONF_DIR)/conf.d/50-mysql-clients.cnf $(CONF_DIR)/conf.d/50-mysql-clients.cnf
endef endef
@ -513,11 +517,13 @@ define Build/InstallDev
endef endef
define Package/libmariadb/install define Package/libmariadb/install
$(INSTALL_DIR) $(1)$(CONF_DIR)/conf.d
$(INSTALL_DIR) $(1)$(PLUGIN_DIR) $(INSTALL_DIR) $(1)$(PLUGIN_DIR)
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{mariadb,mysqlclient}*.so* $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{mariadb,mysqlclient}*.so* $(1)/usr/lib
$(INSTALL_BIN) $(PKG_INSTALL_DIR)$(PLUGIN_DIR)/dialog.so $(1)$(PLUGIN_DIR) $(INSTALL_BIN) $(PKG_INSTALL_DIR)$(PLUGIN_DIR)/dialog.so $(1)$(PLUGIN_DIR)
$(INSTALL_BIN) $(PKG_INSTALL_DIR)$(PLUGIN_DIR)/mysql_clear_password.so $(1)$(PLUGIN_DIR) $(INSTALL_BIN) $(PKG_INSTALL_DIR)$(PLUGIN_DIR)/mysql_clear_password.so $(1)$(PLUGIN_DIR)
$(INSTALL_BIN) $(PKG_INSTALL_DIR)$(PLUGIN_DIR)/sha256_password.so $(1)$(PLUGIN_DIR) $(INSTALL_BIN) $(PKG_INSTALL_DIR)$(PLUGIN_DIR)/sha256_password.so $(1)$(PLUGIN_DIR)
$(INSTALL_CONF) conf/50-client.cnf $(1)$(CONF_DIR)/conf.d
endef endef
define Package/mariadb-client/install define Package/mariadb-client/install
@ -531,7 +537,6 @@ endef
define Package/mariadb-client-base/install define Package/mariadb-client-base/install
$(INSTALL_DIR) $(1)$(CONF_DIR)/conf.d $(INSTALL_DIR) $(1)$(CONF_DIR)/conf.d
$(INSTALL_CONF) conf/50-client.cnf $(1)$(CONF_DIR)/conf.d
$(INSTALL_CONF) conf/50-mysql-clients.cnf $(1)$(CONF_DIR)/conf.d $(INSTALL_CONF) conf/50-mysql-clients.cnf $(1)$(CONF_DIR)/conf.d
endef endef