From: "Patrice Clement" <monsieurp@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/
Date: Wed, 30 Mar 2016 12:18:10 +0000 (UTC) [thread overview]
Message-ID: <1459339422.4720572e0dcdf0638d64a59b13816bd73449fb73.monsieurp@gentoo> (raw)
commit: 4720572e0dcdf0638d64a59b13816bd73449fb73
Author: Michael Seifert <mseifert <AT> error-reports <DOT> org>
AuthorDate: Tue Mar 22 19:03:02 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 12:03:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4720572e
dev-util/buildbot: Added migration guide and updated setup instructions.
buildbot-0.8.12-r2 prints ewarn messages when migrating from a previous
version. The messages describe the necessary steps to migrate properly. In
addition to this, the user is notified of the support for emerge --config and
DOC_CONTENT was updated to point to the possibility of using it.
This string of 5 commits merges gentoo/gentoo#1027 and solves bug #570666.
Gentoo-Bug: https://bugs.gentoo.org/570666
Acked-By: Markos Chandras hwoarang <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/1027
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-util/buildbot/buildbot-0.8.12-r2.ebuild | 49 ++++++++++++++++++-----------
1 file changed, 31 insertions(+), 18 deletions(-)
diff --git a/dev-util/buildbot/buildbot-0.8.12-r2.ebuild b/dev-util/buildbot/buildbot-0.8.12-r2.ebuild
index 1df4422..b6d42d5 100644
--- a/dev-util/buildbot/buildbot-0.8.12-r2.ebuild
+++ b/dev-util/buildbot/buildbot-0.8.12-r2.ebuild
@@ -46,11 +46,8 @@ pkg_setup() {
DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
to support starting buildbot through Gentoo's init system. To use this,
- set up your build master following the documentation, make sure the
- resulting directories are owned by the \"buildbot\" user and point
- \"${EROOT}etc/conf.d/buildmaster\" at the right location. The scripts can
- run as a different user if desired. If you need to run more than one
- build master, just copy the scripts."
+ execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+ The scripts can run as a different user if desired."
}
src_compile() {
@@ -93,6 +90,20 @@ pkg_postinst() {
readme.gentoo_print_elog
if [[ -n ${REPLACING_VERSIONS} ]]; then
+ ewarn
+ ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
+ ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
+ ewarn "is now the common base directory for all instances. If you are migrating from an older"
+ ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+ ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
+ ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+ ewarn " ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
+ ewarn " rc-update add buildmaster.myinstance default"
+ ewarn " /etc/init.d/buildmaster.myinstance start"
+ ewarn "Systems using systemd can do the following:"
+ ewarn " systemctl enable buildmaster@myinstance.service"
+ ewarn " systemctl enable buildmaster.target"
+ ewarn " systemctl start buildmaster.target"
elog
elog "Upstream recommends the following when upgrading:"
elog "Each time you install a new version of Buildbot, you should run the"
@@ -100,23 +111,26 @@ pkg_postinst() {
elog "This will add files and fix (or at least detect) incompatibilities between"
elog "your old config and the new code."
fi
+ elog
+ elog "In order to create a new instance of buildmaster, execute:"
+ elog " emerge --config =${CATEGORY}/${PF}"
}
pkg_config() {
local buildmaster_path="/var/lib/buildmaster"
- einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
+ einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
einfo "Press Control-C to abort."
- einfo "Enter the name for the new instance: "
- read instance_name
- [[ -z "${instance_name}" ]] && die "Invalid instance name"
+ einfo "Enter the name for the new instance: "
+ read instance_name
+ [[ -z "${instance_name}" ]] && die "Invalid instance name"
- local instance_path="${buildmaster_path}/${instance_name}"
- if [[ -e "${instance_path}" ]]; then
- eerror "The instance with the specified name already exists:"
- eerror "${instance_path}"
- die "Instance already exists"
- fi
+ local instance_path="${buildmaster_path}/${instance_name}"
+ if [[ -e "${instance_path}" ]]; then
+ eerror "The instance with the specified name already exists:"
+ eerror "${instance_path}"
+ die "Instance already exists"
+ fi
local buildbot="/usr/bin/buildbot"
if [[ ! -d "${buildmaster_path}" ]]; then
@@ -129,7 +143,6 @@ pkg_config() {
ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
|| die "Unable to create link to init file"
- einfo "Successfully created a buildmaster instance at ${instance_path}."
- einfo "To change the default settings edit the master.cfg file in this directory."
+ einfo "Successfully created a buildmaster instance at ${instance_path}."
+ einfo "To change the default settings edit the master.cfg file in this directory."
}
-
next reply other threads:[~2016-03-30 12:18 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-30 12:18 Patrice Clement [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-07-05 3:08 [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/ Eli Schwartz
2024-03-15 12:29 Jakov Smolić
2024-03-14 19:19 Sam James
2024-03-14 6:22 Sam James
2024-01-30 8:33 Sam James
2023-12-05 4:20 Michał Górny
2023-09-01 8:59 Sam James
2023-08-24 23:34 Brian Dolbec
2023-04-09 8:27 Arthur Zamarin
2023-01-10 13:56 Michał Górny
2022-12-31 15:08 Sam James
2022-08-25 23:24 Brian Dolbec
2022-07-04 6:57 Michał Górny
2022-05-30 19:08 Brian Dolbec
2022-03-14 10:32 Yixun Lan
2022-01-30 18:47 Arthur Zamarin
2022-01-30 18:47 Arthur Zamarin
2022-01-28 11:16 Arthur Zamarin
2022-01-28 11:16 Arthur Zamarin
2021-09-25 18:08 Brian Dolbec
2021-06-20 16:07 Brian Dolbec
2021-05-02 0:19 Brian Dolbec
2021-04-27 22:54 Sam James
2021-04-25 21:13 Brian Dolbec
2021-03-28 22:16 Brian Dolbec
2021-01-29 21:46 Brian Dolbec
2021-01-17 18:51 Brian Dolbec
2020-10-10 18:56 Brian Dolbec
2020-09-18 17:20 Michał Górny
2020-07-24 21:15 Brian Dolbec
2020-07-23 18:13 Brian Dolbec
2020-06-28 0:46 Brian Dolbec
2020-05-13 20:48 Brian Dolbec
2020-05-12 22:07 Brian Dolbec
2020-02-04 13:10 Michał Górny
2020-01-28 6:01 Michał Górny
2020-01-27 12:20 Michał Górny
2020-01-27 10:13 Michał Górny
2019-06-25 12:09 Michael Haubenwallner
2019-06-25 9:05 Michael Haubenwallner
2018-07-26 17:17 Brian Dolbec
2018-07-26 17:17 Brian Dolbec
2018-07-26 17:17 Brian Dolbec
2018-06-29 12:28 Mikle Kolyada
2018-05-17 0:33 Brian Dolbec
2018-03-13 23:56 Brian Dolbec
2017-11-23 21:21 Brian Dolbec
2017-09-20 20:11 Brian Dolbec
2017-09-16 14:47 Brian Dolbec
2017-09-15 17:41 Brian Dolbec
2017-08-10 22:44 Brian Dolbec
2017-08-10 22:00 Brian Dolbec
2017-06-19 18:33 Brian Dolbec
2017-03-06 20:37 Brian Dolbec
2017-02-02 0:23 Brian Dolbec
2017-01-13 2:26 Brian Dolbec
2016-11-08 20:02 Brian Dolbec
2016-10-12 22:07 Brian Dolbec
2016-10-07 20:18 Brian Dolbec
2016-09-23 18:52 Brian Dolbec
2016-09-01 17:14 Brian Dolbec
2016-08-12 15:31 Brian Dolbec
2016-03-30 12:18 Patrice Clement
2016-03-30 12:18 Patrice Clement
2016-01-08 3:07 Brian Dolbec
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=1459339422.4720572e0dcdf0638d64a59b13816bd73449fb73.monsieurp@gentoo \
--to=monsieurp@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