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

mariadb: move mariadb-common into its own package

Browse source 
This moves mariadb-common into its own (tiny) package in preparation for
moving out libmariadb as well. Otherwise the library would have a
dependency on the big mariadb package.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2019-11-17 15:54:16 +01:00
parent a90561a90b
commit 88511f13d0
3 changed files with 49 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
utils/mariadb-common/Makefile Normal file
View file

@ -0,0 +1,49 @@
#
# Copyright (C) 2019 Sebastian Kemper <sebastian_ml@gmx.net>
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=mariadb-common
PKG_VERSION:=1.0
PKG_RELEASE:=1
PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
PKG_LICENSE:=GPL-2.0
CONF_DIR:=/etc/mysql
include $(INCLUDE_DIR)/package.mk
define Package/mariadb-common
SECTION:=utils
CATEGORY:=Utilities
URL:=https://mariadb.org/
SUBMENU:=Database
TITLE:=MariaDB database common files
DEPENDS:=
endef
define Package/mariadb-common/conffiles
$(CONF_DIR)/my.cnf
endef
define Package/mariadb-common/description
MariaDB is a very fast and robust SQL database server.
This package includes shared files, for example $(CONF_DIR)/my.cnf.
endef
define Package/mariadb-common/install
$(INSTALL_DIR) $(1)$(CONF_DIR)
$(INSTALL_CONF) conf/my.cnf $(1)$(CONF_DIR)
endef
define Build/Compile
endef
$(eval $(call BuildPackage,mariadb-common))

0
utils/mariadb/conf/my.cnf → utils/mariadb-common/conf/my.cnf
View file

23
utils/mariadb/Makefile
View file

@ -298,23 +298,6 @@ $(subst $(space),$(newline),$(MARIADB_CLIENT_EXTRA))
endef endef
define Package/mariadb-common
$(call Package/mariadb/Default)
TITLE:=MariaDB database common files
DEPENDS:=
endef
define Package/mariadb-common/conffiles
$(CONF_DIR)/my.cnf
endef
define Package/mariadb-common/description
$(call Package/mariadb/description/Default)
This package includes shared files, for example $(CONF_DIR)/my.cnf.
endef
define Package/mariadb-server define Package/mariadb-server
$(call Package/mariadb/Default) $(call Package/mariadb/Default)
DEPENDS:=mariadb-server-base DEPENDS:=mariadb-server-base
@ -559,11 +542,6 @@ define Package/mariadb-client-extra/install
$(foreach b,$(MARIADB_CLIENT_EXTRA),$(call Package/mariadb/install/bin,$(1),$(b));) $(foreach b,$(MARIADB_CLIENT_EXTRA),$(call Package/mariadb/install/bin,$(1),$(b));)
endef endef
define Package/mariadb-common/install
$(INSTALL_DIR) $(1)$(CONF_DIR)
$(INSTALL_CONF) conf/my.cnf $(1)$(CONF_DIR)
endef
define Package/mariadb-server/install define Package/mariadb-server/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(foreach b,$(MARIADB_SERVER),$(call Package/mariadb/install/bin,$(1),$(b));) $(foreach b,$(MARIADB_SERVER),$(call Package/mariadb/install/bin,$(1),$(b));)
@ -622,7 +600,6 @@ $(eval $(call BuildPackage,libmariadb))
$(eval $(call BuildPackage,mariadb-client)) $(eval $(call BuildPackage,mariadb-client))
$(eval $(call BuildPackage,mariadb-client-base)) $(eval $(call BuildPackage,mariadb-client-base))
$(eval $(call BuildPackage,mariadb-client-extra)) $(eval $(call BuildPackage,mariadb-client-extra))
$(eval $(call BuildPackage,mariadb-common))
$(eval $(call BuildPackage,mariadb-server)) $(eval $(call BuildPackage,mariadb-server))
$(eval $(call BuildPackage,mariadb-server-base)) $(eval $(call BuildPackage,mariadb-server-base))
$(eval $(call BuildPackage,mariadb-server-extra)) $(eval $(call BuildPackage,mariadb-server-extra))