1 |
commit: f6726d625afa61325cb4cebc3d9b39cec622be35 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 23 02:30:22 2017 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 23 02:30:22 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6726d62 |
7 |
|
8 |
app-admin/glance: fixing bug 628548, new init |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
11 |
|
12 |
app-admin/glance/files/glance.initd-r2 | 17 +++++++++++++++++ |
13 |
...lance-2017.1.9999.ebuild => glance-14.0.0-r1.ebuild} | 7 +++---- |
14 |
app-admin/glance/glance-2017.1.9999.ebuild | 2 +- |
15 |
3 files changed, 21 insertions(+), 5 deletions(-) |
16 |
|
17 |
diff --git a/app-admin/glance/files/glance.initd-r2 b/app-admin/glance/files/glance.initd-r2 |
18 |
new file mode 100644 |
19 |
index 00000000000..338de069750 |
20 |
--- /dev/null |
21 |
+++ b/app-admin/glance/files/glance.initd-r2 |
22 |
@@ -0,0 +1,17 @@ |
23 |
+#!/sbin/openrc-run |
24 |
+# Copyright 1999-2017 Gentoo Foundation |
25 |
+# Distributed under the terms of the GNU General Public License v2 |
26 |
+ |
27 |
+description="Starts ${RC_SVCNAME} service for OpenStack" |
28 |
+ |
29 |
+command=/usr/bin/${RC_SVCNAME} |
30 |
+command_user="${GLANCE_USER:-glance}" |
31 |
+command_background=yes |
32 |
+pidfile=/run/${RC_SVCNAME}.pid |
33 |
+required_files=/etc/glance/${RC_SVCNAME}.conf |
34 |
+ |
35 |
+start_stop_daemon_args="--quiet" |
36 |
+ |
37 |
+depend() { |
38 |
+ need net |
39 |
+} |
40 |
|
41 |
diff --git a/app-admin/glance/glance-2017.1.9999.ebuild b/app-admin/glance/glance-14.0.0-r1.ebuild |
42 |
similarity index 97% |
43 |
copy from app-admin/glance/glance-2017.1.9999.ebuild |
44 |
copy to app-admin/glance/glance-14.0.0-r1.ebuild |
45 |
index f3ec7d4dcba..02f04305b64 100644 |
46 |
--- a/app-admin/glance/glance-2017.1.9999.ebuild |
47 |
+++ b/app-admin/glance/glance-14.0.0-r1.ebuild |
48 |
@@ -4,16 +4,15 @@ |
49 |
EAPI=6 |
50 |
PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) |
51 |
|
52 |
-inherit distutils-r1 git-r3 user |
53 |
+inherit distutils-r1 user |
54 |
|
55 |
DESCRIPTION="Services for discovering, registering, and retrieving VM images" |
56 |
HOMEPAGE="https://launchpad.net/glance" |
57 |
-EGIT_REPO_URI="https://github.com/openstack/glance.git" |
58 |
-EGIT_BRANCH="stable/ocata" |
59 |
+SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" |
60 |
|
61 |
LICENSE="Apache-2.0" |
62 |
SLOT="0" |
63 |
-KEYWORDS="" |
64 |
+KEYWORDS="~amd64 ~arm64 ~x86" |
65 |
IUSE="doc mysql postgres +sqlite +swift" |
66 |
REQUIRED_USE="|| ( mysql postgres sqlite )" |
67 |
|
68 |
|
69 |
diff --git a/app-admin/glance/glance-2017.1.9999.ebuild b/app-admin/glance/glance-2017.1.9999.ebuild |
70 |
index f3ec7d4dcba..abe2dce6724 100644 |
71 |
--- a/app-admin/glance/glance-2017.1.9999.ebuild |
72 |
+++ b/app-admin/glance/glance-2017.1.9999.ebuild |
73 |
@@ -117,7 +117,7 @@ python_install_all() { |
74 |
distutils-r1_python_install_all |
75 |
|
76 |
for svc in api glare registry scrubber; do |
77 |
- newinitd "${FILESDIR}/glance.initd" glance-${svc} |
78 |
+ newinitd "${FILESDIR}/glance.initd-r2" glance-${svc} |
79 |
done |
80 |
|
81 |
diropts -m 0750 -o glance -g glance |