The following changes were made:

* Moved to newer version scheme
  * Added modified my.cnf
  * corrected function log_info_msg to log_init_msg
  * Updated usher to install my.cnf
This commit is contained in:
2018-01-11 22:41:39 -06:00
parent 1cce039371
commit b3f6944280
4 changed files with 172 additions and 20 deletions

View File

@@ -8,26 +8,20 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
DEPENDS = openssl
DEPENDS = bash,bzip2,dash,glibc,libaio,libgcc,libstdc++,libxml2,ncurses,openssl,pcre,zlib
ARCH = x86_64
URL = https://mariadb.org/
DESC =
SNAPVER = sr0
REPO = server
BRIEF = Database server
DESC = MariaDB is a fork of the MySQL database server
SNAPVER = 1
ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//')
PATCHDIR := $(PWD)/SRC/patches
BUILDDIR := $(PWD)/BUILD
VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER)
MAKE = make
MAKEINST = make install
SNAPHACKS = install -d -m 755 $(ROOT)/etc/init.d && \
install -d -m 700 $(ROOT)/var/lib/mysql && \
install -m 755 SNAP/mysqld.init $(ROOT)/etc/init.d/mysqld && \
install -m 644 $(ROOT)/usr/share/mysql/my-medium.cnf \
$(ROOT)/etc/my.cnf
VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SNAPVER)
include /usr/share/snap/Makefile.snaplinux
@@ -78,8 +72,7 @@ $(BUILDDIR)/Makefile: $(SRCDIR)/configure.cmake
../$(SRCDIR)
$(BUILDDIR)/sql/mysqld: $(BUILDDIR)/Makefile
@cd $(BUILDDIR); \
$(MAKE)
@cd $(BUILDDIR) && make
$(ROOT): $(BUILDDIR)/sql/mysqld
@if [ -d $(ROOT) ]; then \
@@ -88,10 +81,12 @@ $(ROOT): $(BUILDDIR)/sql/mysqld
mkdir -v $(ROOT); \
fi
@cd $(BUILDDIR); \
$(MAKEINST) DESTDIR=$(ROOT)
@$(SNAPHACKS)
@cd $(BUILDDIR) && make install DESTDIR=$(ROOT) && \
install -d -m 755 $(ROOT)/etc/init.d && \
install -d -m 755 $(ROOT)/usr/share/mariadb && \
install -d -m 700 $(ROOT)/var/lib/mysql && \
install -m 755 $(SNAPDIR)/mysqld.init $(ROOT)/etc/init.d/mysqld && \
install -m 644 $(SNAPDIR)/my.cnf $(ROOT)/usr/share/mariadb/my.cnf
clean:
@rm -rvf $(ROOT) \