From: "Brian Evans" <grknight@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
Date: Thu, 28 Jun 2018 18:28:48 +0000 (UTC) [thread overview]
Message-ID: <1530210505.33b99abf2a667e3f9d1ed0b67a718862347ccc21.grknight@gentoo> (raw)
commit: 33b99abf2a667e3f9d1ed0b67a718862347ccc21
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 28 18:28:25 2018 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 18:28:25 2018 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=33b99abf
dev-db/mysql: Revert config change on 5.6.40-r1
Package-Manager: Portage-2.3.41, Repoman-2.3.9
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mysql/mysql-5.6.40-r1.ebuild | 47 ++++++++++---------------------------
1 file changed, 13 insertions(+), 34 deletions(-)
diff --git a/dev-db/mysql/mysql-5.6.40-r1.ebuild b/dev-db/mysql/mysql-5.6.40-r1.ebuild
index f91b13d..3851573 100644
--- a/dev-db/mysql/mysql-5.6.40-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.40-r1.ebuild
@@ -164,16 +164,6 @@ pkg_postinst() {
einfo
fi
fi
-
- # Note about configuration change
- einfo
- elog "This version of mysql reorganizes the configuration from a single my.cnf"
- elog "to several files in /etc/mysql/${PN}.d."
- elog "Please backup any changes you made to /etc/mysql/my.cnf"
- elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension."
- elog "You may have as many files as needed and they are read alphabetically."
- elog "Be sure the options have the appropitate section headers, i.e. [mysqld]."
- einfo
}
src_unpack() {
@@ -381,32 +371,21 @@ src_install() {
# Configuration stuff
einfo "Building default configuration ..."
insinto "${MY_SYSCONFDIR#${EPREFIX}}"
- [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf
- cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
- eprefixify "${TMPDIR}/my.cnf"
- doins "${TMPDIR}/my.cnf"
- insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
- cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
- eprefixify "${TMPDIR}/50-distro-client.cnf"
- doins "${TMPDIR}/50-distro-client.cnf"
+ [[ -f "${S%/}/scripts/mysqlaccess.conf" ]] && doins "${S%/}"/scripts/mysqlaccess.conf
+ local mycnf_src="my.cnf-5.6"
+ sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+ "${FILESDIR%/}/${mycnf_src}" \
+ > "${TMPDIR%/}/my.cnf.ok" || die
+ use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok"
+ if use latin1 ; then
+ sed -i \
+ -e "/character-set/s|utf8|latin1|g" \
+ "${TMPDIR%/}/my.cnf.ok" || die
+ fi
+ eprefixify "${TMPDIR%/}/my.cnf.ok"
+ newins "${TMPDIR}/my.cnf.ok" my.cnf
if use server ; then
- mycnf_src="my.cnf.distro-server"
- sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
- "${FILESDIR}/${mycnf_src}" \
- > "${TMPDIR}/my.cnf.ok" || die
- if use prefix ; then
- sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
- "${TMPDIR}/my.cnf.ok" || die
- fi
- if use latin1 ; then
- sed -i \
- -e "/character-set/s|utf8|latin1|g" \
- "${TMPDIR}/my.cnf.ok" || die
- fi
- eprefixify "${TMPDIR}/my.cnf.ok"
- newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
-
einfo "Including support files and sample configurations"
docinto "support-files"
local script
next reply other threads:[~2018-06-28 18:28 UTC|newest]
Thread overview: 124+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-28 18:28 Brian Evans [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-07-31 13:57 [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/ Brian Evans
2019-07-31 13:57 Brian Evans
2018-06-28 16:11 Brian Evans
2018-06-28 16:11 Brian Evans
2018-06-28 2:10 Brian Evans
2018-03-29 12:46 Brian Evans
2018-03-27 18:26 Brian Evans
2018-03-12 20:47 Brian Evans
2018-03-12 20:32 Brian Evans
2018-03-12 13:20 Brian Evans
2018-03-12 13:20 Brian Evans
2017-03-02 14:30 Brian Evans
2017-03-02 14:30 Brian Evans
2017-01-09 16:27 Brian Evans
[not found] <1483479079.1e70022facc519de2f3b12c26191f0a021faa862.grknight@gentoo>
2017-01-03 21:37 ` Brian Evans
2016-04-29 19:52 Brian Evans
2016-04-12 18:23 Brian Evans
2016-02-12 3:30 Brian Evans
2016-02-12 3:30 Brian Evans
2016-02-12 3:30 Brian Evans
2016-02-12 3:30 Brian Evans
2016-02-10 2:59 Brian Evans
2016-02-10 2:59 Brian Evans
2016-01-21 21:15 Brian Evans
2015-10-19 18:13 Brian Evans
2015-10-19 18:13 Brian Evans
2015-10-12 18:37 Brian Evans
2015-10-01 15:15 Brian Evans
2015-08-19 18:33 Brian Evans
2015-08-13 13:50 Brian Evans
2015-07-29 19:02 Brian Evans
2015-06-03 17:18 Brian Evans
2015-05-30 1:23 Brian Evans
2015-05-29 18:05 Brian Evans
2015-03-10 20:52 Brian Evans
2015-02-06 14:10 Brian Evans
2015-02-06 14:10 Brian Evans
2014-12-04 1:29 Brian Evans
2014-12-03 21:40 Brian Evans
2014-09-24 3:24 Brian Evans
2014-08-03 21:43 Robin H. Johnson
2014-08-03 21:43 Robin H. Johnson
2014-08-02 1:12 Brian Evans
2014-08-01 19:57 Brian Evans
2014-07-29 20:24 Robin H. Johnson
2014-06-08 20:08 Brian Evans
2014-05-14 2:31 Brian Evans
2014-04-26 19:10 Brian Evans
2014-04-24 11:07 Jorge Manuel B. S. Vicetto
2014-04-02 12:59 Brian Evans
2014-04-01 17:51 Brian Evans
2014-03-28 16:47 Brian Evans
2014-03-11 20:07 Brian Evans
2014-02-24 17:26 Brian Evans
2014-02-01 2:10 Jorge Manuel B. S. Vicetto
2014-01-24 13:47 Brian Evans
2013-12-12 17:28 Brian Evans
2013-12-10 14:39 Brian Evans
2013-10-14 17:49 Brian Evans
2013-08-30 20:27 Brian Evans
2013-08-29 18:04 Brian Evans
2013-08-26 12:46 Brian Evans
2013-08-16 16:28 Brian Evans
2013-06-26 1:57 Jorge Manuel B. S. Vicetto
2013-06-25 17:38 Jorge Manuel B. S. Vicetto
2013-06-06 20:32 Robin H. Johnson
2013-06-06 20:32 Robin H. Johnson
2013-06-06 20:32 Robin H. Johnson
2013-05-28 21:51 Robin H. Johnson
2013-04-30 11:37 Jorge Manuel B. S. Vicetto
2013-04-29 21:34 Jorge Manuel B. S. Vicetto
2013-03-08 7:49 Robin H. Johnson
2013-01-28 18:58 Robin H. Johnson
2013-01-28 2:13 Robin H. Johnson
2013-01-28 2:13 Robin H. Johnson
2013-01-28 2:13 Robin H. Johnson
2013-01-28 2:13 Robin H. Johnson
2013-01-28 2:13 Robin H. Johnson
2013-01-20 2:15 Robin H. Johnson
2013-01-20 2:15 Robin H. Johnson
2013-01-20 2:15 Robin H. Johnson
2013-01-20 2:15 Robin H. Johnson
2013-01-20 2:15 Robin H. Johnson
2013-01-20 2:15 Robin H. Johnson
2012-11-02 0:05 Robin H. Johnson
2012-10-26 14:41 Jorge Manuel B. S. Vicetto
2012-10-25 13:46 Jorge Manuel B. S. Vicetto
2012-10-24 18:10 Jorge Manuel B. S. Vicetto
2012-08-14 10:05 Jorge Manuel B. S. Vicetto
2012-08-03 19:56 Robin H. Johnson
2012-07-27 16:09 Robin H. Johnson
2012-07-07 23:55 Jorge Manuel B. S. Vicetto
2012-05-22 12:09 Jorge Manuel B. S. Vicetto
2012-04-02 0:21 Robin H. Johnson
2012-03-23 22:03 Robin H. Johnson
2012-03-23 22:02 Robin H. Johnson
2012-02-02 2:50 Robin H. Johnson
2012-02-02 2:50 Robin H. Johnson
2012-01-31 9:29 Robin H. Johnson
2011-12-27 7:15 Robin H. Johnson
2011-11-20 0:27 Robin H. Johnson
2011-11-19 0:47 Robin H. Johnson
2011-10-26 19:45 Jorge Manuel B. S. Vicetto
2011-10-26 19:45 Jorge Manuel B. S. Vicetto
2011-09-27 2:26 Jorge Manuel B. S. Vicetto
2011-09-22 3:32 Jorge Manuel B. S. Vicetto
2011-07-30 3:37 Jorge Manuel B. S. Vicetto
2011-07-21 5:39 Jorge Manuel B. S. Vicetto
2011-07-21 5:39 Jorge Manuel B. S. Vicetto
2011-07-14 4:05 Jorge Manuel B. S. Vicetto
2011-07-14 4:05 Jorge Manuel B. S. Vicetto
2011-07-13 7:43 Robin H. Johnson
2011-07-13 7:43 Robin H. Johnson
2011-07-13 3:15 Jorge Manuel B. S. Vicetto
2011-07-13 2:14 Jorge Manuel B. S. Vicetto
2011-07-13 2:14 Jorge Manuel B. S. Vicetto
2011-05-18 19:28 Jorge Manuel B. S. Vicetto
2011-05-16 15:35 Jorge Manuel B. S. Vicetto
2011-05-16 2:14 Jorge Manuel B. S. Vicetto
2011-05-15 23:07 Jorge Manuel B. S. Vicetto
2011-05-11 2:30 Jorge Manuel B. S. Vicetto
2011-04-21 12:14 Robin H. Johnson
2011-02-17 3:15 Jorge Manuel B. S. Vicetto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1530210505.33b99abf2a667e3f9d1ed0b67a718862347ccc21.grknight@gentoo \
--to=grknight@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox