From 94838def772349387e16cc642b3642020e22deda Mon Sep 17 00:00:00 2001
From: Gonéri Le Bouder <goneri@lebouder.net>
Date: Thu, 12 Mar 2020 14:37:08 -0400
Subject: Add Netbsd support (#62)

Add support for the NetBSD Operating System.

Features in this branch:
* Add BSD distro parent class from which NetBSD and FreeBSD can
  specialize
* Add *bsd util functions to cloudinit.net and cloudinit.net.bsd_utils
* subclass cloudinit.distro.freebsd.Distro from bsd.Distro
* Add new cloudinit.distro.netbsd and cloudinit.net.renderer for
  netbsd
* Add lru_cached util.is_NetBSD functions
* Add NetBSD detection for ConfigDrive and NoCloud datasources

This branch has been tested with:

- NoCloud and OpenStack (with and without config-drive)
- NetBSD 8.1. and 9.0
- FreeBSD 11.2 and 12.1
- Python 3.7 only, because of the dependency oncrypt.METHOD_BLOWFISH.
  This version is available in NetBSD 7, 8 and 9 anyway
---
 tools/build-on-netbsd | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100755 tools/build-on-netbsd

(limited to 'tools/build-on-netbsd')

diff --git a/tools/build-on-netbsd b/tools/build-on-netbsd
new file mode 100755
index 00000000..1e2b9cff
--- /dev/null
+++ b/tools/build-on-netbsd
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+fail() { echo "FAILED:" "$@" 1>&2; exit 1; }
+
+# Check dependencies:
+depschecked=/tmp/c-i.dependencieschecked
+pkgs="
+   bash
+   dmidecode
+   py37-configobj
+   py37-jinja2
+   py37-oauthlib
+   py37-requests
+   py37-setuptools
+   py37-six
+   py37-yaml
+   sudo
+"
+[ -f "$depschecked" ] || pkg_add ${pkgs} || fail "install packages"
+
+touch $depschecked
+
+# Build the code and install in /usr/pkg/:
+python3.7 setup.py build
+python3.7 setup.py install -O1 --distro netbsd --skip-build --init-system sysvinit_netbsd
+mv -v /usr/local/etc/rc.d/cloud* /etc/rc.d
+
+# Enable cloud-init in /etc/rc.conf:
+sed -i.bak -e "/^cloud.*=.*/d" /etc/rc.conf
+echo '
+# You can safely remove the following lines starting with "cloud"
+cloudinitlocal="YES"
+cloudinit="YES"
+cloudconfig="YES"
+cloudfinal="YES"' >> /etc/rc.conf
+
+echo "Installation completed."
-- 
cgit v1.2.3


From b9ff0dc950558ecd2a8469eded26bd6ae4082771 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <oddbloke@ubuntu.com>
Date: Tue, 17 Mar 2020 15:48:51 -0400
Subject: cloudinit: remove six from packaging/tooling (#253)

---
 .pylintrc              | 1 -
 packages/pkg-deps.json | 3 ---
 requirements.txt       | 3 ---
 tools/build-on-freebsd | 1 -
 tools/build-on-netbsd  | 1 -
 tox.ini                | 1 -
 6 files changed, 10 deletions(-)

(limited to 'tools/build-on-netbsd')

diff --git a/.pylintrc b/.pylintrc
index c83546a6..4d5d066d 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -50,7 +50,6 @@ ignored-modules=
  http.client,
  httplib,
  pkg_resources,
- six.moves,
  # cloud_tests requirements.
  boto3,
  botocore,
diff --git a/packages/pkg-deps.json b/packages/pkg-deps.json
index 64d6d78d..d09ec33f 100644
--- a/packages/pkg-deps.json
+++ b/packages/pkg-deps.json
@@ -50,9 +50,6 @@
          },
          "requests" : {
             "3" : "python36-requests"
-         },
-         "six" : {
-            "3" : "python36-six"
          }
       },
       "requires" : [
diff --git a/requirements.txt b/requirements.txt
index dd10d85d..5817da3b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -32,6 +32,3 @@ jsonpatch
 
 # For validating cloud-config sections per schema definitions
 jsonschema
-
-# For Python 2/3 compatibility
-six
diff --git a/tools/build-on-freebsd b/tools/build-on-freebsd
index 876368a9..60beeee0 100755
--- a/tools/build-on-freebsd
+++ b/tools/build-on-freebsd
@@ -29,7 +29,6 @@ pkgs="
     $py_prefix-oauthlib
     $py_prefix-requests
     $py_prefix-serial
-    $py_prefix-six
     $py_prefix-yaml
     sudo
 "
diff --git a/tools/build-on-netbsd b/tools/build-on-netbsd
index 1e2b9cff..d2a7067d 100755
--- a/tools/build-on-netbsd
+++ b/tools/build-on-netbsd
@@ -12,7 +12,6 @@ pkgs="
    py37-oauthlib
    py37-requests
    py37-setuptools
-   py37-six
    py37-yaml
    sudo
 "
diff --git a/tox.ini b/tox.ini
index 7591d9f3..416ddcb8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -72,7 +72,6 @@ deps =
     pyserial==3.0.1
     configobj==5.0.6
     requests==2.9.1
-    six==1.10.0
     # test-requirements
     httpretty==0.9.6
     mock==1.3.0
-- 
cgit v1.2.3