diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-03-06 07:17:36 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-03-06 07:32:36 +0000 |
| commit | 1785c0e77b46a7c6bd6aba5da6aac57c0170387e (patch) | |
| tree | 0f476d20f72c72cdfcbab3672dac6b511b80a228 | |
| parent | d059727ab1e74d0426faf1da2abcd961ad94aa16 (diff) | |
| download | aports-1785c0e77b46a7c6bd6aba5da6aac57c0170387e.tar.bz2 aports-1785c0e77b46a7c6bd6aba5da6aac57c0170387e.tar.xz | |
main/mariadb: misc fixes for upgrade
- the mariadb-common should replace mysql-common instead of mariadb. We
never had an mariadb which provided the file shipped with
mariadb-common.
- provide a couple of dummy packages for mysql that pulls in mariadb as
dependency. This should make upgrades smoother.
| -rw-r--r-- | main/mariadb/APKBUILD | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index 57ff5f314..532cbc473 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mariadb pkgver=5.5.41 -pkgrel=1 +pkgrel=2 pkgdesc="A fast SQL database server" url="http://www.mariadb.org" pkgusers="mysql" @@ -19,7 +19,9 @@ $pkgname.initd fix-xtradb-storage.patch " -subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-common $pkgname-client $pkgname-bench $pkgname-test:mytest" +subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-common + $pkgname-client $pkgname-bench $pkgname-test:mytest + mysql mysql-client:_compat_client mysql-bench:_compat_bench" _builddir="$srcdir/$pkgname-$pkgver" @@ -121,7 +123,7 @@ libs() { common() { pkgdesc="MariaDB common files for boh server and client" - replaces="mariadb" + replaces="mysql-common" depends= mkdir -p "$subpkgdir"/usr/share/mysql \ mv "$pkgdir"/etc "$subpkgdir"/ || return 1 @@ -185,6 +187,18 @@ bench() { mv "$pkgdir"/usr/sql-bench "$subpkgdir"/usr/share } +_compat() { + pkgdesc="Dummy package for $1 migration" + depends="$1" + mkdir -p "$subpkgdir" +} + +mysql() { _compat mysql; } +_compat_client() { _compat mysql-client; } +_compat_bench() { _compat mysql-bench; } + + + md5sums="d2415efc6a6d73d7a58f3c79bb42f2e8 mariadb-5.5.41.tar.gz 01fe0055305d8f974c35d0898245014b mariadb.initd 0bc35376a413719e77808ab778378517 fix-xtradb-storage.patch" |