diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2020-01-31 09:17:27 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2020-01-31 09:19:30 +0100 |
| commit | d884a5fd086942a15ed8bfe0c9885161bdc6f5bc (patch) | |
| tree | 5c0eebb0b50632c3cf9b2cbf0ceaa0b5cde11600 /sys-cluster | |
| parent | net-misc/icaclient: Fix AbsoluteSymlink (diff) | |
| download | gentoo-d884a5fd086942a15ed8bfe0c9885161bdc6f5bc.tar.gz gentoo-d884a5fd086942a15ed8bfe0c9885161bdc6f5bc.tar.bz2 gentoo-d884a5fd086942a15ed8bfe0c9885161bdc6f5bc.zip | |
sys-cluster/neutron: Backport CI issue fixes
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/neutron/neutron-15.0.1.ebuild | 13 | ||||
| -rw-r--r-- | sys-cluster/neutron/neutron-2019.1.9999.ebuild | 13 |
2 files changed, 10 insertions, 16 deletions
diff --git a/sys-cluster/neutron/neutron-15.0.1.ebuild b/sys-cluster/neutron/neutron-15.0.1.ebuild index 082eab07ed24..5deaec79742b 100644 --- a/sys-cluster/neutron/neutron-15.0.1.ebuild +++ b/sys-cluster/neutron/neutron-15.0.1.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7} ) # still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439 -inherit distutils-r1 linux-info user +inherit distutils-r1 linux-info DESCRIPTION="A virtual network service for Openstack" HOMEPAGE="https://launchpad.net/neutron" @@ -118,7 +118,9 @@ RDEPEND=" net-misc/radvd >=net-misc/dibbler-1.0.1 ) - dhcp? ( net-dns/dnsmasq[dhcp-tools] )" + dhcp? ( net-dns/dnsmasq[dhcp-tools] ) + acct-group/neutron + acct-user/neutron" #PATCHES=( #) @@ -135,11 +137,6 @@ pkg_pretend() { fi } -pkg_setup() { - enewgroup neutron - enewuser neutron -1 -1 /var/lib/neutron neutron -} - pkg_config() { fperms 0700 /var/log/neutron fowners neutron:neutron /var/log neutron @@ -157,7 +154,7 @@ python_install_all() { if use server; then newinitd "${FILESDIR}/neutron.initd" "neutron-server" newconfd "${FILESDIR}/neutron-server.confd" "neutron-server" - dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini + dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini fi if use dhcp; then newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent" diff --git a/sys-cluster/neutron/neutron-2019.1.9999.ebuild b/sys-cluster/neutron/neutron-2019.1.9999.ebuild index 2435f5317d6a..d34628c1f749 100644 --- a/sys-cluster/neutron/neutron-2019.1.9999.ebuild +++ b/sys-cluster/neutron/neutron-2019.1.9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7} ) # still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439 -inherit distutils-r1 linux-info user +inherit distutils-r1 linux-info DESCRIPTION="A virtual network service for Openstack" HOMEPAGE="https://launchpad.net/neutron" @@ -115,7 +115,9 @@ RDEPEND=" net-misc/radvd >=net-misc/dibbler-1.0.1 ) - dhcp? ( net-dns/dnsmasq[dhcp-tools] )" + dhcp? ( net-dns/dnsmasq[dhcp-tools] ) + acct-group/neutron + acct-user/neutron" #PATCHES=( #) @@ -132,11 +134,6 @@ pkg_pretend() { fi } -pkg_setup() { - enewgroup neutron - enewuser neutron -1 -1 /var/lib/neutron neutron -} - pkg_config() { fperms 0700 /var/log/neutron fowners neutron:neutron /var/log neutron @@ -154,7 +151,7 @@ python_install_all() { if use server; then newinitd "${FILESDIR}/neutron.initd" "neutron-server" newconfd "${FILESDIR}/neutron-server.confd" "neutron-server" - dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini + dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini fi if use dhcp; then newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent" |