Skip to content

Commit

Permalink
mk: Remove MySQL 5.5-based packages.
Browse files Browse the repository at this point in the history
These no longer build against OpenSSL 1.1 and are obsolete anyway.  The
mariadb55 package is still in-tree, so for now just exclude it from the
default list.
  • Loading branch information
Jonathan Perkin committed Jan 5, 2021
1 parent 7dc958c commit ea1ff33
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions mk/mysql.buildlink3.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#
# Possible: 80 57 56 73-cluster
# mariadb100 mariadb55
# percona80 percona57 percona56 percona55
# percona57-cluster percona56-cluster percona55-cluster
# percona80 percona57 percona56
# percona57-cluster percona56-cluster
# Default: 57
#
# Package-settable variables:
Expand All @@ -33,8 +33,8 @@
# The package name prefix for the selected version.
#
# Possible: mysql80 mysql57 mysql56 mysql73-cluster
# percona80 percona57 percona56 percona55
# percona57-cluster percona56-cluster percona55-cluster
# percona80 percona57 percona56
# percona57-cluster percona56-cluster
#

.if !defined(MYSQL_VERSION_MK)
Expand All @@ -57,11 +57,11 @@ BUILD_DEFS_EFFECTS+= MYSQL_VERSION MYSQL_PKG_PREFIX
# The available MySQL packages:
_PKG_MYSQLS= 80 57 56 mariadb100 mariadb55
_PKG_MYSQLS+= 57-cluster
_PKG_MYSQLS+= percona80 percona57 percona56 percona55
_PKG_MYSQLS+= percona57-cluster percona56-cluster percona55-cluster
_PKG_MYSQLS+= percona80 percona57 percona56
_PKG_MYSQLS+= percona57-cluster percona56-cluster

# Package-settable variables. XXX: 57 hardcoded duplicate to avoid pkglint errors
MYSQL_VERSIONS_ACCEPTED?= 57 ${_PKG_MYSQLS}
MYSQL_VERSIONS_ACCEPTED?= 57 ${_PKG_MYSQLS:N*55*}

_MYSQL_PKGBASE.57-cluster= mysql-cluster-7.3.*
_MYSQL_PKGSRCDIR.57-cluster= ../../joyent/mysql73-cluster
Expand Down Expand Up @@ -99,14 +99,6 @@ _MYSQL_PKGBASE.percona56= percona-client-5.6.*
_MYSQL_PKGSRCDIR.percona56= ../../joyent/percona56-client
_MYSQL_PKG_PREFIX.percona56= percona56

_MYSQL_PKGBASE.percona55= percona-client-5.5.*
_MYSQL_PKGSRCDIR.percona55= ../../joyent/percona55-client
_MYSQL_PKG_PREFIX.percona55= percona55

_MYSQL_PKGBASE.percona55-cluster= percona-cluster-5.5.*
_MYSQL_PKGSRCDIR.percona55-cluster= ../../joyent/percona55-cluster
_MYSQL_PKG_PREFIX.percona55-cluster= percona55-cluster

_MYSQL_PKGBASE.percona56-cluster= percona-cluster-5.6.*
_MYSQL_PKGSRCDIR.percona56-cluster= ../../joyent/percona56-cluster
_MYSQL_PKG_PREFIX.percona56-cluster= percona56-cluster
Expand Down

0 comments on commit ea1ff33

Please sign in to comment.