| 1 |
commit: d884a5fd086942a15ed8bfe0c9885161bdc6f5bc |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 31 08:17:27 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 31 08:19:30 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d884a5fd |
| 7 |
|
| 8 |
sys-cluster/neutron: Backport CI issue fixes |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-cluster/neutron/neutron-15.0.1.ebuild | 13 +++++-------- |
| 13 |
sys-cluster/neutron/neutron-2019.1.9999.ebuild | 13 +++++-------- |
| 14 |
2 files changed, 10 insertions(+), 16 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-cluster/neutron/neutron-15.0.1.ebuild b/sys-cluster/neutron/neutron-15.0.1.ebuild |
| 17 |
index 082eab07ed2..5deaec79742 100644 |
| 18 |
--- a/sys-cluster/neutron/neutron-15.0.1.ebuild |
| 19 |
+++ b/sys-cluster/neutron/neutron-15.0.1.ebuild |
| 20 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 21 |
PYTHON_COMPAT=( python3_{6,7} ) |
| 22 |
# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439 |
| 23 |
|
| 24 |
-inherit distutils-r1 linux-info user |
| 25 |
+inherit distutils-r1 linux-info |
| 26 |
|
| 27 |
DESCRIPTION="A virtual network service for Openstack" |
| 28 |
HOMEPAGE="https://launchpad.net/neutron" |
| 29 |
@@ -118,7 +118,9 @@ RDEPEND=" |
| 30 |
net-misc/radvd |
| 31 |
>=net-misc/dibbler-1.0.1 |
| 32 |
) |
| 33 |
- dhcp? ( net-dns/dnsmasq[dhcp-tools] )" |
| 34 |
+ dhcp? ( net-dns/dnsmasq[dhcp-tools] ) |
| 35 |
+ acct-group/neutron |
| 36 |
+ acct-user/neutron" |
| 37 |
|
| 38 |
#PATCHES=( |
| 39 |
#) |
| 40 |
@@ -135,11 +137,6 @@ pkg_pretend() { |
| 41 |
fi |
| 42 |
} |
| 43 |
|
| 44 |
-pkg_setup() { |
| 45 |
- enewgroup neutron |
| 46 |
- enewuser neutron -1 -1 /var/lib/neutron neutron |
| 47 |
-} |
| 48 |
- |
| 49 |
pkg_config() { |
| 50 |
fperms 0700 /var/log/neutron |
| 51 |
fowners neutron:neutron /var/log neutron |
| 52 |
@@ -157,7 +154,7 @@ python_install_all() { |
| 53 |
if use server; then |
| 54 |
newinitd "${FILESDIR}/neutron.initd" "neutron-server" |
| 55 |
newconfd "${FILESDIR}/neutron-server.confd" "neutron-server" |
| 56 |
- dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini |
| 57 |
+ dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini |
| 58 |
fi |
| 59 |
if use dhcp; then |
| 60 |
newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent" |
| 61 |
|
| 62 |
diff --git a/sys-cluster/neutron/neutron-2019.1.9999.ebuild b/sys-cluster/neutron/neutron-2019.1.9999.ebuild |
| 63 |
index 2435f5317d6..d34628c1f74 100644 |
| 64 |
--- a/sys-cluster/neutron/neutron-2019.1.9999.ebuild |
| 65 |
+++ b/sys-cluster/neutron/neutron-2019.1.9999.ebuild |
| 66 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 67 |
PYTHON_COMPAT=( python3_{6,7} ) |
| 68 |
# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439 |
| 69 |
|
| 70 |
-inherit distutils-r1 linux-info user |
| 71 |
+inherit distutils-r1 linux-info |
| 72 |
|
| 73 |
DESCRIPTION="A virtual network service for Openstack" |
| 74 |
HOMEPAGE="https://launchpad.net/neutron" |
| 75 |
@@ -115,7 +115,9 @@ RDEPEND=" |
| 76 |
net-misc/radvd |
| 77 |
>=net-misc/dibbler-1.0.1 |
| 78 |
) |
| 79 |
- dhcp? ( net-dns/dnsmasq[dhcp-tools] )" |
| 80 |
+ dhcp? ( net-dns/dnsmasq[dhcp-tools] ) |
| 81 |
+ acct-group/neutron |
| 82 |
+ acct-user/neutron" |
| 83 |
|
| 84 |
#PATCHES=( |
| 85 |
#) |
| 86 |
@@ -132,11 +134,6 @@ pkg_pretend() { |
| 87 |
fi |
| 88 |
} |
| 89 |
|
| 90 |
-pkg_setup() { |
| 91 |
- enewgroup neutron |
| 92 |
- enewuser neutron -1 -1 /var/lib/neutron neutron |
| 93 |
-} |
| 94 |
- |
| 95 |
pkg_config() { |
| 96 |
fperms 0700 /var/log/neutron |
| 97 |
fowners neutron:neutron /var/log neutron |
| 98 |
@@ -154,7 +151,7 @@ python_install_all() { |
| 99 |
if use server; then |
| 100 |
newinitd "${FILESDIR}/neutron.initd" "neutron-server" |
| 101 |
newconfd "${FILESDIR}/neutron-server.confd" "neutron-server" |
| 102 |
- dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini |
| 103 |
+ dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini |
| 104 |
fi |
| 105 |
if use dhcp; then |
| 106 |
newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent" |
Archives