From 195ad9d5955781207f4c15cda4f466669a0954be Mon Sep 17 00:00:00 2001 From: Jan Provaznik Date: Wed, 26 Mar 2014 04:21:23 -0400 Subject: [PATCH] Adds mysql-dev and mariadb-dev elements It have to be separate elements because installation differs depending whether mysql or mariadb is used. Change-Id: I9299b8e21a5ea2ff13ab9f11d851703a67c6b130 --- elements/mariadb-dev/README.md | 4 ++ elements/mariadb-dev/element-provides | 1 + elements/mariadb-dev/environment.d/20-mariadb | 9 ++++ elements/mariadb-dev/install.d/03-mariadb-dev | 12 +++++ .../pre-install.d/05-mysql-mariadb-repo | 53 +++++++++++++++++++ elements/mysql-dev/README.md | 4 ++ elements/mysql-dev/install.d/03-mysql-dev | 5 ++ elements/os-svc-install/element-deps | 1 + .../install.d/04-os-svc-install | 3 -- 9 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 elements/mariadb-dev/README.md create mode 100644 elements/mariadb-dev/element-provides create mode 100755 elements/mariadb-dev/environment.d/20-mariadb create mode 100755 elements/mariadb-dev/install.d/03-mariadb-dev create mode 100755 elements/mariadb-dev/pre-install.d/05-mysql-mariadb-repo create mode 100644 elements/mysql-dev/README.md create mode 100755 elements/mysql-dev/install.d/03-mysql-dev diff --git a/elements/mariadb-dev/README.md b/elements/mariadb-dev/README.md new file mode 100644 index 000000000..5b0b0f763 --- /dev/null +++ b/elements/mariadb-dev/README.md @@ -0,0 +1,4 @@ +Installs mariadb devel package + +This is a separate element because different devel packages are installed for +mysql and for mariadb. diff --git a/elements/mariadb-dev/element-provides b/elements/mariadb-dev/element-provides new file mode 100644 index 000000000..063f2a84b --- /dev/null +++ b/elements/mariadb-dev/element-provides @@ -0,0 +1 @@ +mysql-dev diff --git a/elements/mariadb-dev/environment.d/20-mariadb b/elements/mariadb-dev/environment.d/20-mariadb new file mode 100755 index 000000000..b099e45dc --- /dev/null +++ b/elements/mariadb-dev/environment.d/20-mariadb @@ -0,0 +1,9 @@ +#!/bin/bash + +# The mariadb download url arch values are not the same as ours +if [ $ARCH = "i386" ]; then + MARIADB_ARCH=x86 +else + MARIADB_ARCH=$ARCH +fi +export MARIADB_ARCH diff --git a/elements/mariadb-dev/install.d/03-mariadb-dev b/elements/mariadb-dev/install.d/03-mariadb-dev new file mode 100755 index 000000000..1fd8b2c90 --- /dev/null +++ b/elements/mariadb-dev/install.d/03-mariadb-dev @@ -0,0 +1,12 @@ +#!/bin/bash + +set -eux + +install-packages libmariadb-dev + +# TODO: fedora mysql_config has to be tweaked to exclude probes_mysql lib +# https://mariadb.atlassian.net/browse/MDEV-5793 +FILE=$(which mysql_config) +if $FILE --libs_r | grep probes_mysql;then + sed -i.orig "s/-lprobes_mysql//" $FILE +fi diff --git a/elements/mariadb-dev/pre-install.d/05-mysql-mariadb-repo b/elements/mariadb-dev/pre-install.d/05-mysql-mariadb-repo new file mode 100755 index 000000000..65bce3c6a --- /dev/null +++ b/elements/mariadb-dev/pre-install.d/05-mysql-mariadb-repo @@ -0,0 +1,53 @@ +#!/bin/bash + +set -e +set -o xtrace + +# repo urls +# 5.5 version is used instead of 10.0 (which is already out) because of +# dependency issues - python-mysql depends on mariadb-libs which conflicts +# with mysql-galera-server pkg +# http://yum.mariadb.org/5.5/fedora20-amd64 +# http://yum.mariadb.org/5.5/fedora20-x86 +# http://yum.mariadb.org/5.5/rhel6-amd64 +# http://yum.mariadb.org/5.5/rhel6-x86 +# http://mirror.jmu.edu/pub/mariadb/repo/5.5/ubuntu saucy main +# http://mirror.jmu.edu/pub/mariadb/repo/5.5/debian wheezy main + +DISTRO=`lsb_release -si` || true + +if [ "$DISTRO" == "RedHatEnterpriseServer" ];then + DIST_DIR="rhel" +else + DIST_DIR=$(echo "$DISTRO"|tr A-Z a-z) +fi + +function add_yum_repo() { + ver=`lsb_release -sr` + + cat > /etc/yum.repos.d/mariadb.repo <