From 4df3bf9762850b34cd1ead5c80374d1a0fc3362e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 12 Jul 2021 08:41:54 +0100 Subject: gentoo resync : 12.07.2021 --- app-emulation/cloud-init/Manifest | 1 - ...it-20.1-gentoo-support-upstream-templates.patch | 93 ---------------------- 2 files changed, 94 deletions(-) delete mode 100644 app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch (limited to 'app-emulation/cloud-init') diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest index d93647e4483d..17bea4ffffc2 100644 --- a/app-emulation/cloud-init/Manifest +++ b/app-emulation/cloud-init/Manifest @@ -2,7 +2,6 @@ AUX 18.4-add-support-for-package_upgrade.patch 1734 BLAKE2B 1eb4fd07bec989b1584e AUX 18.4-fix-filename-for-storing-locale.patch 1045 BLAKE2B 0167101d78f821fefc3d05447d3fe35d7328cdebcb3a0eebdaaf2f14b8e2f46efe7c0fb4031baa3a8600546a47f98641719112992c8e50cc1ab0181851937f81 SHA512 8a3b1bf35a445cbc7c3d4849c4c9ebd716209bc3b38bc060cd3b27b1b09749da8dcf35c8e0963300f7cc21f43fda96e5928f9f3c86c22a784cc60b840a1cc419 AUX 18.4-fix-update_package_sources-function.patch 880 BLAKE2B f8a50714d5763f43c177de8e65369203e4d3b94de98126b85fca22ee4a89f9568c6081078b03dd4bb6cdcd07c51bc55b093e94092a06fd7eeec610ce22780f67 SHA512 8b82d0e565a9f8b4f6464382e01b79c95ad0ced600bf2ba1c6377eea704f86108cf68bc20c99f65e68c6b2d7a7ccc02624bfef400dd76990ef18f00f1e220f6c AUX cloud-init-18.4-fix-packages-module.patch 704 BLAKE2B e5deb163e7d97365befb63bf6978900d250356a3b29972b5c8ec6dd19c202d03cf0a07bbf1e8b437c3ec80b810f5c1af456bd589adfde290636b3fc10028ad36 SHA512 ea28c8d5c9a4ebd0d65dea8dd09e5c9c9973fc3456ff8a4e35b3eb4eb856e5c4809b922ef5d958682fb7429ba23eafd80e0fdee629967b7f838d4127db5e1ac7 -AUX cloud-init-20.1-gentoo-support-upstream-templates.patch 3505 BLAKE2B 6f4b75493e6354c73ad87546337d4520f334883cd0bcd7f3f7eb34276a5c6d57dfbd46f5dc22306ab9843164b56638196238025431a319ad67c9e3d03945ef05 SHA512 3151504396a55baca141a8f509e93007bfe93e4e5945cfcd17ef98a2394ba64564cd7233e792233389776c5baa0b1fd3609a868a5f386dcf5d84563e00d7885b AUX cloud-init-20.4-gentoo-support-upstream-templates.patch 3467 BLAKE2B 0d6185373ef7de03de60f3ae277a808a8457c8bbce23ab5a10ff3382c0ace244fe5d054285d2eeeb99956863156f3ff0000b7f6f84b706489d19c29cb1dbeadf SHA512 d5209c78ede276b6d614baad2ff586008694e4533114394207f377a67cbb8cd9a73547c8e0a9daa55051fa56ccb099b3a0f2bcf824cda0cbef0de858332c95f8 AUX cloud-init-21.2-gentoo-support-upstream-templates.patch 3793 BLAKE2B 4e5cbc9fa872cc1d148861be1d1fb0615a68e69c6acbec8173580590c8d2c5e50df44e067d3b8ea77dd0b23ef658837a2a317c98712f8b42e9a14398d4cfe996 SHA512 9d436f223dacfd018df4caf407b0da3de5e9cc1932d3aad56f455c664d2b9f3dc8ab40d8607f9ef4481ee778ae897717161d3cb1a7d4d99041585a00a97d8774 DIST cloud-init-20.4.tar.gz 1228898 BLAKE2B c5697af31e7219a060a82732fbae2e89dd00786e5b0feb638f1f64f6ce861df041ef687a6095cc3bdb5478f4f4c1504286155808102aea9cae853caa97d4ba1b SHA512 da2fa4673b253468380c4472795fd449809c8ac84d8f13ec1472b9b7e7d54e187ae06e5a81a36774793b05f4e1212dca57bc19aa8955b4c7fa7183cb100bfbb9 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 deleted file mode 100644 index c840f4fde3eb..000000000000 --- a/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 823454f1ea140ec47f5f9c5c3c5ad62eb458eb8a Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -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 - -- cgit v1.2.3