| 1 |
commit: 9f8e1e313a3ed7e4d7ea2b0f2052ff7745fc7e0f |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 30 05:14:40 2016 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 30 05:18:10 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f8e1e31 |
| 7 |
|
| 8 |
sys-cluster/neutron: switch most to python_install_all |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
sys-cluster/neutron/neutron-2016.2.9999.ebuild | 21 ++++++++++++++------- |
| 13 |
1 file changed, 14 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-cluster/neutron/neutron-2016.2.9999.ebuild b/sys-cluster/neutron/neutron-2016.2.9999.ebuild |
| 16 |
index 92c3582..5f78ccc 100644 |
| 17 |
--- a/sys-cluster/neutron/neutron-2016.2.9999.ebuild |
| 18 |
+++ b/sys-cluster/neutron/neutron-2016.2.9999.ebuild |
| 19 |
@@ -128,7 +128,7 @@ RDEPEND=" |
| 20 |
#PATCHES=( |
| 21 |
#) |
| 22 |
|
| 23 |
-pkg_setup() { |
| 24 |
+pkg_pretend() { |
| 25 |
linux-info_pkg_setup |
| 26 |
CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \ |
| 27 |
IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \ |
| 28 |
@@ -138,6 +138,9 @@ pkg_setup() { |
| 29 |
linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel" |
| 30 |
done |
| 31 |
fi |
| 32 |
+} |
| 33 |
+ |
| 34 |
+pkg_setup() { |
| 35 |
enewgroup neutron |
| 36 |
enewuser neutron -1 -1 /var/lib/neutron neutron |
| 37 |
} |
| 38 |
@@ -154,8 +157,8 @@ src_prepare() { |
| 39 |
distutils-r1_python_prepare_all |
| 40 |
} |
| 41 |
|
| 42 |
-python_install() { |
| 43 |
- distutils-r1_python_install |
| 44 |
+python_install_all() { |
| 45 |
+ distutils-r1_python_install_all |
| 46 |
if use server; then |
| 47 |
newinitd "${FILESDIR}/neutron.initd" "neutron-server" |
| 48 |
newconfd "${FILESDIR}/neutron-server.confd" "neutron-server" |
| 49 |
@@ -197,10 +200,6 @@ python_install() { |
| 50 |
doins "etc/rootwrap.conf" |
| 51 |
doins -r "etc/neutron/rootwrap.d" |
| 52 |
|
| 53 |
- insopts -m 0644 |
| 54 |
- insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/" |
| 55 |
- doins -r "neutron/db/migration/alembic_migrations/versions" |
| 56 |
- |
| 57 |
#add sudoers definitions for user neutron |
| 58 |
insinto /etc/sudoers.d/ |
| 59 |
insopts -m 0440 -o root -g root |
| 60 |
@@ -220,6 +219,14 @@ python_install() { |
| 61 |
rm -R "${D}/usr/etc/" |
| 62 |
} |
| 63 |
|
| 64 |
+python_install() { |
| 65 |
+ distutils-r1_python_install |
| 66 |
+ # copy migration conf file (not coppied on install via setup.py script) |
| 67 |
+ insopts -m 0644 |
| 68 |
+ insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/" |
| 69 |
+ doins -r "neutron/db/migration/alembic_migrations/versions" |
| 70 |
+} |
| 71 |
+ |
| 72 |
pkg_postinst() { |
| 73 |
elog |
| 74 |
elog "neutron-server's conf.d file may need updating to include additional ini files" |
Archives