commit: b144df77b41ff1ebf099898140cdbbb68eb4bde1 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Sun Apr 19 17:32:54 2020 +0000 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Sun Apr 19 17:32:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b144df77
app-emulation/cloud-init: 20.1 bump with py37/38 support Closes: https://bugs.gentoo.org/718208 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> app-emulation/cloud-init/Manifest | 1 + ...oud-init-9999.ebuild => cloud-init-20.1.ebuild} | 18 +++-- app-emulation/cloud-init/cloud-init-9999.ebuild | 18 +++-- ...it-20.1-gentoo-support-upstream-templates.patch | 93 ++++++++++++++++++++++ 4 files changed, 118 insertions(+), 12 deletions(-) diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest index dcc617fd5bc..c613182719d 100644 --- a/app-emulation/cloud-init/Manifest +++ b/app-emulation/cloud-init/Manifest @@ -1 +1,2 @@ DIST cloud-init-19.4.tar.gz 1091893 BLAKE2B 2ab8fef70b420c066d6d8f83871568eeac24f00879ecf3d58c3768dd809cff6a3b79c7e72d9a10204002101049ab86ab64f0c524362e00497a9222960ef380df SHA512 e69ea47eab41d69d64fa44102fbde59319da5f71a68f28a0f6ac65cd6866542b4fe58a71b84c903cfa9b1d2f26eb648cdf4de633b8df61e4f89c9fa4c2a2b1d3 +DIST cloud-init-20.1.tar.gz 1088152 BLAKE2B 1c075676bcf7454965beafaaa38f3cdf08f321ddd0303b7f710c49d2a69e0fb2ec8a81870a632b7504c47af6436555c97ea9fa9c8416955de78f8f551b5509b7 SHA512 ad28e4a0290165308ef2cdb8a935778ad99039978a204bee1098460de006bc3f375a3b81d0d72971fc4f4195d5d2ade9c648fb19e6d6eba12decf750dc54b6eb diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-20.1.ebuild similarity index 87% copy from app-emulation/cloud-init/cloud-init-9999.ebuild copy to app-emulation/cloud-init/cloud-init-20.1.ebuild index 6c2ca0f3c26..f1f5ed321e9 100644 --- a/app-emulation/cloud-init/cloud-init-9999.ebuild +++ b/app-emulation/cloud-init/cloud-init-20.1.ebuild @@ -1,18 +1,24 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python3_6 ) +EAPI=7 +PYTHON_COMPAT=( python3_6 python3_7 python3_8 ) -inherit distutils-r1 git-r3 +inherit distutils-r1 + +if [[ ${PV} == *9999 ]];then + inherit git-r3 + EGIT_REPO_URI="https://git.launchpad.net/cloud-init"; +else + SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"; + KEYWORDS="~amd64 ~x86" +fi DESCRIPTION="Cloud instance initialisation magic" HOMEPAGE="https://launchpad.net/cloud-init"; -EGIT_REPO_URI="https://git.launchpad.net/cloud-init"; LICENSE="GPL-3" SLOT="0" -KEYWORDS="" IUSE="test" RESTRICT="!test? ( test )" @@ -51,7 +57,7 @@ PATCHES=( # Fix Gentoo support # https://code.launchpad.net/~gilles-dartiguelongue/cloud-init/+git/cloud-init/+merge/358777 "${FILESDIR}/${PN}-18.4-fix-packages-module.patch" - "${FILESDIR}/${PN}-19.4-gentoo-support-upstream-templates.patch" + "${FILESDIR}/${PN}-20.1-gentoo-support-upstream-templates.patch" "${FILESDIR}"/18.4-fix-filename-for-storing-locale.patch "${FILESDIR}"/18.4-fix-update_package_sources-function.patch "${FILESDIR}"/18.4-add-support-for-package_upgrade.patch diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild index 6c2ca0f3c26..f1f5ed321e9 100644 --- a/app-emulation/cloud-init/cloud-init-9999.ebuild +++ b/app-emulation/cloud-init/cloud-init-9999.ebuild @@ -1,18 +1,24 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python3_6 ) +EAPI=7 +PYTHON_COMPAT=( python3_6 python3_7 python3_8 ) -inherit distutils-r1 git-r3 +inherit distutils-r1 + +if [[ ${PV} == *9999 ]];then + inherit git-r3 + EGIT_REPO_URI="https://git.launchpad.net/cloud-init"; +else + SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"; + KEYWORDS="~amd64 ~x86" +fi DESCRIPTION="Cloud instance initialisation magic" HOMEPAGE="https://launchpad.net/cloud-init"; -EGIT_REPO_URI="https://git.launchpad.net/cloud-init"; LICENSE="GPL-3" SLOT="0" -KEYWORDS="" IUSE="test" RESTRICT="!test? ( test )" @@ -51,7 +57,7 @@ PATCHES=( # Fix Gentoo support # https://code.launchpad.net/~gilles-dartiguelongue/cloud-init/+git/cloud-init/+merge/358777 "${FILESDIR}/${PN}-18.4-fix-packages-module.patch" - "${FILESDIR}/${PN}-19.4-gentoo-support-upstream-templates.patch" + "${FILESDIR}/${PN}-20.1-gentoo-support-upstream-templates.patch" "${FILESDIR}"/18.4-fix-filename-for-storing-locale.patch "${FILESDIR}"/18.4-fix-update_package_sources-function.patch "${FILESDIR}"/18.4-add-support-for-package_upgrade.patch diff --git a/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch b/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch new file mode 100644 index 00000000000..c840f4fde3e --- /dev/null +++ b/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch @@ -0,0 +1,93 @@ +From 823454f1ea140ec47f5f9c5c3c5ad62eb458eb8a Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <[email protected]> +Date: Wed, 24 Oct 2018 10:52:46 +0200 +Subject: [PATCH 2/5] Add support for gentoo in cloud.cfg and templates + +--- + config/cloud.cfg.tmpl | 8 ++++++-- + templates/hosts.gentoo.tmpl | 24 ++++++++++++++++++++++++ + tools/render-cloudcfg | 2 +- + 3 files changed, 31 insertions(+), 3 deletions(-) + create mode 100644 templates/hosts.gentoo.tmpl + +diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl +index 1fef133a..3f5a41a2 100644 +--- a/config/cloud.cfg.tmpl ++++ b/config/cloud.cfg.tmpl +@@ -134,7 +134,7 @@ cloud_final_modules: + # (not accessible to handlers/transforms) + system_info: + # This will affect which distro class gets used +-{% if variant in ["amazon", "arch", "centos", "debian", "fedora", "freebsd", "rhel", "suse", "ubuntu"] %} ++{% if variant in ["amazon", "arch", "centos", "debian", "fedora", "freebsd", "gentoo", "rhel", "suse", "ubuntu"] %} + distro: {{ variant }} + {% else %} + # Unknown/fallback distro. +@@ -172,7 +172,7 @@ system_info: + primary: http://ports.ubuntu.com/ubuntu-ports + security: http://ports.ubuntu.com/ubuntu-ports + ssh_svcname: ssh +-{% elif variant in ["amazon", "arch", "centos", "fedora", "rhel", "suse"] %} ++{% elif variant in ["amazon", "arch", "centos", "fedora", "gentoo", "rhel", "suse"] %} + # Default user name + that default users groups (if added/used) + default_user: + name: {{ variant }} +@@ -180,6 +180,10 @@ system_info: + {% endif %} + {% if variant == "suse" %} + groups: [cdrom, users] ++{% elif variant == "gentoo" %} ++ groups: [users, wheel] ++ primary_group: users ++ no_user_group: true + {% elif variant == "arch" %} + groups: [wheel, users] + {% else %} +diff --git a/templates/hosts.gentoo.tmpl b/templates/hosts.gentoo.tmpl +new file mode 100644 +index 00000000..cd045fa6 +--- /dev/null ++++ b/templates/hosts.gentoo.tmpl +@@ -0,0 +1,24 @@ ++## template:jinja ++{# ++This file /etc/cloud/templates/hosts.gentoo.tmpl is only utilized ++if enabled in cloud-config. Specifically, in order to enable it ++you need to add the following to config: ++ manage_etc_hosts: True ++-#} ++# Your system has configured 'manage_etc_hosts' as True. ++# As a result, if you wish for changes to this file to persist ++# then you will need to either ++# a.) make changes to the master file in /etc/cloud/templates/hosts.gentoo.tmpl ++# b.) change or remove the value of 'manage_etc_hosts' in ++# /etc/cloud/cloud.cfg or cloud-config from user-data ++# ++# The following lines are desirable for IPv4 capable hosts ++127.0.0.1 {{fqdn}} {{hostname}} ++127.0.0.1 localhost.localdomain localhost ++127.0.0.1 localhost4.localdomain4 localhost4 ++ ++# The following lines are desirable for IPv6 capable hosts ++::1 {{fqdn}} {{hostname}} ++::1 localhost.localdomain localhost ++::1 localhost6.localdomain6 localhost6 ++ +diff --git a/tools/render-cloudcfg b/tools/render-cloudcfg +index 8b7cb875..d109044e 100755 +--- a/tools/render-cloudcfg ++++ b/tools/render-cloudcfg +@@ -4,7 +4,7 @@ import argparse + import os + import sys + +-VARIANTS = ["amazon", "arch", "centos", "debian", "fedora", "freebsd", "rhel", +- "suse", "ubuntu", "unknown"] ++VARIANTS = ["amazon", "arch", "centos", "debian", "fedora", "freebsd", ++ "gentoo", "rhel", "suse", "ubuntu", "unknown"] + + if "avoid-pep8-E402-import-not-top-of-file": + _tdir = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) +-- +2.19.1 +
