1 |
commit: ccb7e88d71d067708d3fc2900bd9b490404f5b0e |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 24 18:06:14 2018 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 25 16:35:43 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccb7e88d |
7 |
|
8 |
app-emulation/cloud-init: update live ebuild |
9 |
|
10 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
11 |
Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org> |
12 |
|
13 |
app-emulation/cloud-init/Manifest | 4 -- |
14 |
app-emulation/cloud-init/cloud-init-9999.ebuild | 58 ++++++++++++------------- |
15 |
2 files changed, 28 insertions(+), 34 deletions(-) |
16 |
|
17 |
diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest |
18 |
index 1ed457e3bf6..96b57fd0e5e 100644 |
19 |
--- a/app-emulation/cloud-init/Manifest |
20 |
+++ b/app-emulation/cloud-init/Manifest |
21 |
@@ -1,7 +1,3 @@ |
22 |
-DIST cloud-init-0.7.6.tar.gz 515670 BLAKE2B edaab1c731d5ac0ce1f0a3a82b1fed9cca54ac555f2704a4bf0bab2627d54d8f090610fa6aed79d0e2f131abff4016fb8ed55c0c0822ca45c602eabc80548ca9 SHA512 aa2397328afda8e77ed6d642e7642f41a4b4b5bcd3d0e87056aa8c88b56624ec65c57cfc66b0d13ccc235f1840baf1d577316974902a0439cf2f2eb0f8eef36d |
23 |
-DIST cloud-init-0.7.6_p1212.tar.gz 451717 BLAKE2B 0b2136e36b78de38a700f9abad0639cfd3f49ca5a0e43aa7673afd0f9aa365a7ebe2b5767b076e481d4eb3521a0e8a04d581d1aa3de5537bbd09bcead867d3ee SHA512 25c5d1cc7c8fa887859624b4f28416d455063c278e3f00bfb3561ab0c99aa708d9fa431ff17c42994aba43eb985538982e5175bf0531857cc18fd8e724ef1fd3 |
24 |
-DIST cloud-init-0.7.7.tar.gz 477287 BLAKE2B eade80cff35e545a619f7d0beafadde145777c5ae581325a4588436ad8becc95a5945c216d8c3c814331099dd4b5cfafe62ee411329f4dce9897ab816ce5ba1f SHA512 06cd2bba67da9668204416073af771145668db43777d6f183dcb54e8e1d9d12471fe3bfc99dfbc03a81814c5614347ff7d6acc5dbe117e1206d7fc2041ae4b62 |
25 |
-DIST cloud-init-0.7.8.tar.gz 508777 BLAKE2B 7b5b3f1b5f28b6a4ba67ef30cbbb32e1a1eb21a373da5491a7157f45553843de68b56e040ec9f07a2ca35a0bbf9fdd5f90d0ef381d2da558422080de3da0299d SHA512 ff6c3837afe702359879f0ae1d7443247b0ed97d60ecf0cbe85fc364dc833e553962aae221f48becb104ad3f951a28cbd742a3b8521ef25dfb8fd19439759447 |
26 |
DIST cloud-init-0.7.9.tar.gz 602188 BLAKE2B c2e2b8538488474cd4674b976f859164f0ab8ed585fc0b59c6e75f23a62fd035b8b76e0700c1e68893fc4a8346b3110ff2b25f13be92ff13eeac0f1ad2405641 SHA512 ee52909f634f51dcf9e1229a8f49faa8c562bf05b69fac108fcc80cb3217f4364a33cf696df015e4dcd7887c68cf6108729850648b4daee07b3d3247ca3cc5b1 |
27 |
DIST cloud-init-17.1.tar.gz 780532 BLAKE2B 10809da2e81d594542d83b2416481c493474cac2e790da25363e631f6dae9edc1e2fd160708121486dd3a2ebd19cfc29d18978cbe7d82eb1aec907762bf7bf0b SHA512 988cae4291c8d6a5bce012b78d651c602c02ad38c3790e9ed9aa7c815ae84c98767718ab9b0d346ddbc9c83cb886d455590128af750183618c0bf0f0c5a79564 |
28 |
DIST cloud-init-17.2.tar.gz 810821 BLAKE2B df1a7c1ed1fc48a7801a53bd89839d963debca6abf7f892d61bf7ec9222ab33bf78221e65d79028e0445cac4c5fe1e0c1620d49aea26c036ee17933d9c1893f5 SHA512 ad1c7f6ca9762b70a1f06a6b538032a7de0c5371fd792260d5959df113f4f51509d184b2207ffa23b41f395c1903d551d66aaf2a2ad60af3594cf1f18d1e4a38 |
29 |
|
30 |
diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild |
31 |
index 4072bd36f06..0b0b7bcaac9 100644 |
32 |
--- a/app-emulation/cloud-init/cloud-init-9999.ebuild |
33 |
+++ b/app-emulation/cloud-init/cloud-init-9999.ebuild |
34 |
@@ -1,12 +1,12 @@ |
35 |
-# Copyright 1999-2018 Gentoo Foundation |
36 |
+# Copyright 1999-2018 Gentoo Authors |
37 |
# Distributed under the terms of the GNU General Public License v2 |
38 |
|
39 |
EAPI=6 |
40 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
41 |
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 ) |
42 |
|
43 |
-inherit distutils-r1 eutils git-r3 multilib systemd |
44 |
+inherit distutils-r1 git-r3 |
45 |
|
46 |
-DESCRIPTION="cloud initialisation magic" |
47 |
+DESCRIPTION="Cloud instance initialisation magic" |
48 |
HOMEPAGE="https://launchpad.net/cloud-init" |
49 |
EGIT_REPO_URI="https://git.launchpad.net/cloud-init" |
50 |
|
51 |
@@ -16,15 +16,15 @@ KEYWORDS="" |
52 |
IUSE="test" |
53 |
|
54 |
CDEPEND=" |
55 |
- dev-python/six[${PYTHON_USEDEP}] |
56 |
- dev-python/configobj[${PYTHON_USEDEP}] |
57 |
dev-python/jinja[${PYTHON_USEDEP}] |
58 |
- dev-python/jsonpatch[${PYTHON_USEDEP}] |
59 |
dev-python/oauthlib[${PYTHON_USEDEP}] |
60 |
- dev-python/prettytable[${PYTHON_USEDEP}] |
61 |
dev-python/pyserial[${PYTHON_USEDEP}] |
62 |
+ >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}] |
63 |
dev-python/pyyaml[${PYTHON_USEDEP}] |
64 |
dev-python/requests[${PYTHON_USEDEP}] |
65 |
+ dev-python/jsonpatch[${PYTHON_USEDEP}] |
66 |
+ dev-python/jsonschema[${PYTHON_USEDEP}] |
67 |
+ dev-python/six[${PYTHON_USEDEP}] |
68 |
" |
69 |
DEPEND=" |
70 |
dev-python/setuptools[${PYTHON_USEDEP}] |
71 |
@@ -34,33 +34,37 @@ DEPEND=" |
72 |
dev-python/mock[${PYTHON_USEDEP}] |
73 |
dev-python/nose[${PYTHON_USEDEP}] |
74 |
dev-python/unittest2[${PYTHON_USEDEP}] |
75 |
- dev-python/pep8[${PYTHON_USEDEP}] |
76 |
- dev-python/flake8[${PYTHON_USEDEP}] |
77 |
- dev-python/hacking[${PYTHON_USEDEP}] |
78 |
+ dev-python/coverage[${PYTHON_USEDEP}] |
79 |
+ dev-python/contextlib2[${PYTHON_USEDEP}] |
80 |
) |
81 |
" |
82 |
RDEPEND=" |
83 |
${CDEPEND} |
84 |
+ net-analyzer/macchanger |
85 |
sys-apps/iproute2 |
86 |
sys-fs/growpart |
87 |
virtual/logger |
88 |
" |
89 |
|
90 |
-PATCHES=( "${FILESDIR}/cloud-init-0.7.8-gentooinit.patch" ) |
91 |
+PATCHES=( |
92 |
+ "${FILESDIR}"/${PN}-18.4-fix-packages-module.patch |
93 |
+ "${FILESDIR}"/${PN}-18.4-gentoo-support-upstream-templates.patch |
94 |
+) |
95 |
|
96 |
python_prepare_all() { |
97 |
+ # Fix location of documentation installation |
98 |
+ sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die |
99 |
sed -i 's/version=get_version(),/version=9999,/g' setup.py || die |
100 |
- sed -i '/^argparse/d' requirements.txt || die |
101 |
- sed -i '/^hacking/d' test-requirements.txt || die |
102 |
distutils-r1_python_prepare_all |
103 |
} |
104 |
|
105 |
python_test() { |
106 |
- emake test |
107 |
+ # Do not use Makefile target as it does not setup environment correclty |
108 |
+ esetup.py nosetests -v --where cloudinit --where tests/unittests || die |
109 |
} |
110 |
|
111 |
python_install() { |
112 |
- distutils-r1_python_install "--init-system=sysvinit_openrc" |
113 |
+ distutils-r1_python_install --init-system=sysvinit_openrc,systemd --distro gentoo |
114 |
} |
115 |
|
116 |
python_install_all() { |
117 |
@@ -68,19 +72,13 @@ python_install_all() { |
118 |
|
119 |
distutils-r1_python_install_all |
120 |
|
121 |
- chmod +x "${D}"/etc/init.d/cloud-config |
122 |
- chmod +x "${D}"/etc/init.d/cloud-final |
123 |
- chmod +x "${D}"/etc/init.d/cloud-init |
124 |
- chmod +x "${D}"/etc/init.d/cloud-init-local |
125 |
- |
126 |
- insinto /etc/cloud/templates |
127 |
- doins "${FILESDIR}/hosts.gentoo.tmpl" |
128 |
- insinto /etc/cloud |
129 |
- doins "${FILESDIR}/cloud.cfg" |
130 |
+ # installs as non-executable |
131 |
+ chmod +x "${D}"/etc/init.d/* |
132 |
+} |
133 |
|
134 |
- systemd_dounit "${S}"/systemd/cloud-config.service |
135 |
- systemd_dounit "${S}"/systemd/cloud-config.target |
136 |
- systemd_dounit "${S}"/systemd/cloud-final.service |
137 |
- systemd_dounit "${S}"/systemd/cloud-init-local.service |
138 |
- systemd_dounit "${S}"/systemd/cloud-init.service |
139 |
+pkg_postinst() { |
140 |
+ elog "cloud-init-local needs to be run in the boot runlevel because it" |
141 |
+ elog "modifies services in the default runlevel. When a runlevel is started" |
142 |
+ elog "it is cached, so modifications that happen to the current runlevel" |
143 |
+ elog "while you are in it are not acted upon." |
144 |
} |