From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- .../cloud-init/files/cloud-init-0.7.6-gentoo.patch | 51 -------------- .../files/cloud-init-0.7.6_p1212-gentoo.patch | 33 --------- .../files/cloud-init-0.7.7-gentooinit.patch | 42 ------------ .../files/cloud-init-0.7.8-gentooinit.patch | 38 ----------- .../cloud-init/files/cloud-init-0.7.9-tests.patch | 13 ---- app-emulation/cloud-init/files/cloud.cfg | 79 ---------------------- app-emulation/cloud-init/files/hosts.gentoo.tmpl | 23 ------- 7 files changed, 279 deletions(-) delete mode 100644 app-emulation/cloud-init/files/cloud-init-0.7.6-gentoo.patch delete mode 100644 app-emulation/cloud-init/files/cloud-init-0.7.6_p1212-gentoo.patch delete mode 100644 app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch delete mode 100644 app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch delete mode 100644 app-emulation/cloud-init/files/cloud-init-0.7.9-tests.patch delete mode 100644 app-emulation/cloud-init/files/cloud.cfg delete mode 100644 app-emulation/cloud-init/files/hosts.gentoo.tmpl (limited to 'app-emulation/cloud-init/files') diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.6-gentoo.patch b/app-emulation/cloud-init/files/cloud-init-0.7.6-gentoo.patch deleted file mode 100644 index 27abd3812ab4..000000000000 --- a/app-emulation/cloud-init/files/cloud-init-0.7.6-gentoo.patch +++ /dev/null @@ -1,51 +0,0 @@ -# Note: Gentoo places ip in /sbin/ not /bin/ -diff -Nuar cloud-init-0.7.6.orig/cloudinit/sources/DataSourceOpenNebula.py cloud-init-0.7.6/cloudinit/sources/DataSourceOpenNebula.py ---- cloud-init-0.7.6.orig/cloudinit/sources/DataSourceOpenNebula.py 2014-10-10 08:26:25.000000000 -0700 -+++ cloud-init-0.7.6/cloudinit/sources/DataSourceOpenNebula.py 2016-04-25 15:24:51.483130933 -0700 -@@ -435,7 +435,7 @@ - # http://opennebula.org/documentation:rel3.8:cong#network_configuration - for k in context.keys(): - if re.match(r'^ETH\d+_IP$', k): -- (out, _) = util.subp(['/sbin/ip', 'link']) -+ (out, _) = util.subp(['/bin/ip', 'link']) - net = OpenNebulaNetwork(out, context) - results['network-interfaces'] = net.gen_conf() - break - -# Note Gentoo installs its own RC files -diff -Nuar cloud-init-0.7.6.orig/setup.py cloud-init-0.7.6/setup.py ---- cloud-init-0.7.6.orig/setup.py 2014-10-10 08:26:25.000000000 -0700 -+++ cloud-init-0.7.6/setup.py 2016-04-25 15:24:51.488131027 -0700 -@@ -141,7 +141,7 @@ - author='Scott Moser', - author_email='scott.moser@canonical.com', - url='http://launchpad.net/cloud-init/', -- packages=setuptools.find_packages(exclude=['tests']), -+ packages=setuptools.find_packages(exclude=['tests.*', 'tests']), - scripts=['bin/cloud-init', - 'tools/cloud-init-per', - ], -@@ -160,9 +160,4 @@ - [f for f in glob('doc/examples/seed/*') if is_f(f)]), - ], - install_requires=read_requires(), -- cmdclass={ -- # Use a subclass for install that handles -- # adding on the right init system configuration files -- 'install': InitsysInstallData, -- }, - ) - -# https://bugs.launchpad.net/cloud-init/+bug/1380424 -diff -Nuar cloud-init-0.7.6.orig/tests/unittests/test_distros/test_netconfig.py cloud-init-0.7.6/tests/unittests/test_distros/test_netconfig.py ---- cloud-init-0.7.6.orig/tests/unittests/test_distros/test_netconfig.py 2014-10-10 08:26:25.000000000 -0700 -+++ cloud-init-0.7.6/tests/unittests/test_distros/test_netconfig.py 2016-04-25 15:24:51.485130971 -0700 -@@ -174,7 +174,7 @@ - self.assertCfgEquals(expected_buf, str(write_buf)) - self.assertEquals(write_buf.mode, 0644) - -- def test_simple_write_freebsd(self): -+ def _test_simple_write_freebsd(self): - fbsd_distro = self._get_distro('freebsd') - util_mock = self.mocker.replace(util.write_file, - spec=False, passthrough=False) diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.6_p1212-gentoo.patch b/app-emulation/cloud-init/files/cloud-init-0.7.6_p1212-gentoo.patch deleted file mode 100644 index ef5d950842fe..000000000000 --- a/app-emulation/cloud-init/files/cloud-init-0.7.6_p1212-gentoo.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nuar --exclude '*~' trunk.orig/setup.py trunk/setup.py ---- trunk.orig/setup.py 2016-04-25 14:44:43.000000000 -0700 -+++ trunk/setup.py 2016-04-25 15:44:45.254496814 -0700 -@@ -1,3 +1,4 @@ -+#!/usr/bin/python2 - # vi: ts=4 expandtab - # - # Distutils magic for ec2-init -@@ -74,6 +75,7 @@ - 'sysvinit': [f for f in glob('sysvinit/redhat/*') if is_f(f)], - 'sysvinit_freebsd': [f for f in glob('sysvinit/freebsd/*') if is_f(f)], - 'sysvinit_deb': [f for f in glob('sysvinit/debian/*') if is_f(f)], -+ 'sysvinit_openrc': [f for f in glob('sysvinit/gentoo/*') if is_f(f)], - 'systemd': [f for f in (glob('systemd/*.service') + - glob('systemd/*.target')) if is_f(f)], - 'systemd.generators': [f for f in glob('systemd/*-generator') if is_f(f)], -@@ -83,6 +85,7 @@ - 'sysvinit': '/etc/rc.d/init.d', - 'sysvinit_freebsd': '/usr/local/etc/rc.d', - 'sysvinit_deb': '/etc/init.d', -+ 'sysvinit_openrc': '/etc/init.d', - 'systemd': pkg_config_read('systemd', 'systemdsystemunitdir'), - 'systemd.generators': pkg_config_read('systemd', - 'systemdsystemgeneratordir'), -@@ -205,7 +208,7 @@ - author='Scott Moser', - author_email='scott.moser@canonical.com', - url='http://launchpad.net/cloud-init/', -- packages=setuptools.find_packages(exclude=['tests']), -+ packages=setuptools.find_packages(exclude=['tests.*', 'tests']), - scripts=['bin/cloud-init', - 'tools/cloud-init-per'], - license='GPLv3', diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch b/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch deleted file mode 100644 index ddb4f38201cc..000000000000 --- a/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py -index 7b3a76b..635a836 100644 ---- a/cloudinit/sources/DataSourceOpenNebula.py -+++ b/cloudinit/sources/DataSourceOpenNebula.py -@@ -407,7 +407,7 @@ def read_context_disk_dir(source_dir, asuser=None): - # http://opennebula.org/documentation:rel3.8:cong#network_configuration - for k in context: - if re.match(r'^ETH\d+_IP$', k): -- (out, _) = util.subp(['/sbin/ip', 'link']) -+ (out, _) = util.subp(['ip', 'link']) - net = OpenNebulaNetwork(out, context) - results['network-interfaces'] = net.gen_conf() - break -diff --git a/setup.py b/setup.py -index bbadd7b..1578a3d 100755 ---- a/setup.py -+++ b/setup.py -@@ -74,6 +74,7 @@ INITSYS_FILES = { - 'sysvinit': [f for f in glob('sysvinit/redhat/*') if is_f(f)], - 'sysvinit_freebsd': [f for f in glob('sysvinit/freebsd/*') if is_f(f)], - 'sysvinit_deb': [f for f in glob('sysvinit/debian/*') if is_f(f)], -+ 'sysvinit_openrc': [f for f in glob('sysvinit/gentoo/*') if is_f(f)], - 'systemd': [f for f in (glob('systemd/*.service') + - glob('systemd/*.target')) if is_f(f)], - 'systemd.generators': [f for f in glob('systemd/*-generator') if is_f(f)], -@@ -83,6 +84,7 @@ INITSYS_ROOTS = { - 'sysvinit': '/etc/rc.d/init.d', - 'sysvinit_freebsd': '/usr/local/etc/rc.d', - 'sysvinit_deb': '/etc/init.d', -+ 'sysvinit_openrc': '/etc/init.d', - 'systemd': pkg_config_read('systemd', 'systemdsystemunitdir'), - 'systemd.generators': pkg_config_read('systemd', - 'systemdsystemgeneratordir'), -@@ -205,7 +207,7 @@ setuptools.setup( - author='Scott Moser', - author_email='scott.moser@canonical.com', - url='http://launchpad.net/cloud-init/', -- packages=setuptools.find_packages(exclude=['tests']), -+ packages=setuptools.find_packages(exclude=['tests.*', 'tests']), - scripts=['tools/cloud-init-per'], - license='GPLv3', - data_files=data_files, diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch b/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch deleted file mode 100644 index ff0e0149fa3b..000000000000 --- a/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/setup.py b/setup.py -index bbadd7b..1578a3d 100755 ---- a/setup.py -+++ b/setup.py -@@ -205,7 +207,7 @@ setuptools.setup( - author='Scott Moser', - author_email='scott.moser@canonical.com', - url='http://launchpad.net/cloud-init/', -- packages=setuptools.find_packages(exclude=['tests']), -+ packages=setuptools.find_packages(exclude=['tests.*', 'tests']), - scripts=['tools/cloud-init-per'], - license='GPLv3', - data_files=data_files, -diff --git a/sysvinit/gentoo/cloud-init b/sysvinit/gentoo/cloud-init -index 5afc0f2..531a715 100644 ---- a/sysvinit/gentoo/cloud-init -+++ b/sysvinit/gentoo/cloud-init -@@ -2,6 +2,7 @@ - # add depends for network, dns, fs etc - depend() { - after cloud-init-local -+ after net - before cloud-config - provide cloud-init - } -diff --git a/sysvinit/gentoo/cloud-init-local b/sysvinit/gentoo/cloud-init-local -index 9bd0b56..0f8cf65 100644 ---- a/sysvinit/gentoo/cloud-init-local -+++ b/sysvinit/gentoo/cloud-init-local -@@ -2,7 +2,7 @@ - - depend() { - after localmount -- after netmount -+ before net - before cloud-init - provide cloud-init-local - } diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.9-tests.patch b/app-emulation/cloud-init/files/cloud-init-0.7.9-tests.patch deleted file mode 100644 index b80a60a47b7f..000000000000 --- a/app-emulation/cloud-init/files/cloud-init-0.7.9-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index bbadd7b..1578a3d 100755 ---- a/setup.py -+++ b/setup.py -@@ -205,7 +207,7 @@ setuptools.setup( - author='Scott Moser', - author_email='scott.moser@canonical.com', - url='http://launchpad.net/cloud-init/', -- packages=setuptools.find_packages(exclude=['tests']), -+ packages=setuptools.find_packages(exclude=['tests.*', 'tests']), - scripts=['tools/cloud-init-per'], - license='GPLv3', - data_files=data_files, diff --git a/app-emulation/cloud-init/files/cloud.cfg b/app-emulation/cloud-init/files/cloud.cfg deleted file mode 100644 index d62e3a22241b..000000000000 --- a/app-emulation/cloud-init/files/cloud.cfg +++ /dev/null @@ -1,79 +0,0 @@ -# The top level settings are used as module -# and system configuration. - -# A set of users which may be applied and/or used by various modules -# when a 'default' entry is found it will reference the 'default_user' -# from the distro configuration specified below -users: - - default - -# If this is set, 'root' will not be able to ssh in and they -# will get a message to login instead as the above $user (ubuntu) -disable_root: true -ssh_pwauth: false - -# This will cause the set+update hostname module to not operate (if true) -# preserve_hostname: false - -syslog_fix_perms: root:root - -ssh_deletekeys: false -ssh_genkeytypes: [rsa, dsa] - -cloud_init_modules: - - seed_random - - bootcmd - - write-files - - growpart - - resizefs - - set_hostname - - update_hostname - - update_etc_hosts - - ca-certs - - users-groups - - ssh - -cloud_config_modules: - - disk_setup - - mounts - - ssh-import-id - - set-passwords - - timezone - - puppet - - chef - - salt-minion - - mcollective - - disable-ec2-metadata - - runcmd - -cloud_final_modules: - - scripts-vendor - - scripts-per-once - - scripts-per-boot - - scripts-per-instance - - scripts-user - - ssh-authkey-fingerprints - - keys-to-console - - phone-home - - final-message - - power-state-change - -# System and/or distro specific settings -# (not accessible to handlers/transforms) -system_info: - # This will affect which distro class gets used - distro: gentoo - # Default user name + that default users groups (if added/used) - default_user: - name: gentoo - lock_passwd: True - gecos: Gentoo - groups: [users, wheel] - primary_group: users - no-user-group: true - sudo: ["ALL=(ALL) NOPASSWD:ALL"] - shell: /bin/bash - # Other config here will be given to the distro class and/or path classes - paths: - cloud_dir: /var/lib/cloud/ - templates_dir: /etc/cloud/templates/ diff --git a/app-emulation/cloud-init/files/hosts.gentoo.tmpl b/app-emulation/cloud-init/files/hosts.gentoo.tmpl deleted file mode 100644 index bc0bca47c5ce..000000000000 --- a/app-emulation/cloud-init/files/hosts.gentoo.tmpl +++ /dev/null @@ -1,23 +0,0 @@ -## 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: template --#} -# Your system has configured 'manage_etc_hosts' as 'template'. -# 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 \ No newline at end of file -- cgit v1.2.3