3 files changed, 28 insertions, 33 deletions

diff --git a/recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch b/recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch
index f61b82ce..5c9c1e6f 100644
--- a/recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch
+++ b/recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch
@@ -16,19 +16,16 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  setup.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/setup.py b/setup.py
-index cbacf48e..5f13d9eb 100755
---- a/setup.py
-+++ b/setup.py
-@@ -87,7 +87,7 @@ def render_tmpl(template, mode=None):
+Index: git/setup.py
+===================================================================
+--- git.orig/setup.py
++++ git/setup.py
+@@ -87,7 +87,7 @@
  
      # older versions of tox use bdist (xenial), and then install from there.
      # newer versions just use install.
--    if not (sys.argv[1] == 'install' or sys.argv[1].startswith('bdist*')):
+-    if not (sys.argv[1] == "install" or sys.argv[1].startswith("bdist*")):
 +    if not ('install' in sys.argv or sys.argv[1].startswith('bdist*')):
          return template
  
      tmpl_ext = ".tmpl"
--- 
-2.25.1
-
diff --git a/recipes-extended/cloud-init/cloud-init/0001-setup.py-respect-udevdir-variable.patch b/recipes-extended/cloud-init/cloud-init/0001-setup.py-respect-udevdir-variable.patch
index 94ec98ac..e96b5cbd 100644
--- a/recipes-extended/cloud-init/cloud-init/0001-setup.py-respect-udevdir-variable.patch
+++ b/recipes-extended/cloud-init/cloud-init/0001-setup.py-respect-udevdir-variable.patch
@@ -16,27 +16,24 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  setup.py | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/setup.py b/setup.py
-index cbacf48e..5e137a6d 100755
---- a/setup.py
-+++ b/setup.py
-@@ -142,6 +142,7 @@ INITSYS_ROOTS = {
-     'sysvinit_deb': 'etc/init.d',
-     'sysvinit_openrc': 'etc/init.d',
-     'sysvinit_suse': 'etc/init.d',
+Index: git/setup.py
+===================================================================
+--- git.orig/setup.py
++++ git/setup.py
+@@ -159,6 +159,7 @@
+     "sysvinit_deb": "etc/init.d",
+     "sysvinit_openrc": "etc/init.d",
+     "sysvinit_suse": "etc/init.d",
 +    'udevdir': pkg_config_read('udev', 'udevdir'),
-     'systemd': pkg_config_read('systemd', 'systemdsystemunitdir'),
-     'systemd.generators': pkg_config_read('systemd',
-                                           'systemdsystemgeneratordir'),
-@@ -264,7 +265,7 @@ if not platform.system().endswith('BSD'):
-         (ETC + '/NetworkManager/dispatcher.d/',
-          ['tools/hook-network-manager']),
-         (ETC + '/dhcp/dhclient-exit-hooks.d/', ['tools/hook-dhclient']),
--        (LIB + '/udev/rules.d', [f for f in glob('udev/*.rules')])
-+        ('udevdir' + '/rules.d', [f for f in glob('udev/*.rules')])
-     ])
- # Use a subclass for install that handles
- # adding on the right init system configuration files
--- 
-2.27.0
-
+     "systemd": pkg_config_read("systemd", "systemdsystemunitdir"),
+     "systemd.generators": pkg_config_read(
+         "systemd", "systemdsystemgeneratordir"
+@@ -307,7 +308,7 @@
+                 ["tools/hook-network-manager"],
+             ),
+             (ETC + "/dhcp/dhclient-exit-hooks.d/", ["tools/hook-dhclient"]),
+-            (LIB + "/udev/rules.d", [f for f in glob("udev/*.rules")]),
++            ('udevdir' + "/rules.d", [f for f in glob("udev/*.rules")]),
+             (
+                 ETC + "/systemd/system/sshd-keygen@.service.d/",
+                 ["systemd/disable-sshd-keygen-if-cloud-init-active.conf"],
diff --git a/recipes-extended/cloud-init/cloud-init_20.3.bb b/recipes-extended/cloud-init/cloud-init_21.4.bb
index d5605b86..660b808e 100644
--- a/recipes-extended/cloud-init/cloud-init_20.3.bb
+++ b/recipes-extended/cloud-init/cloud-init_21.4.bb
@@ -4,7 +4,7 @@ SECTION = "devel/python"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c6dd79b6ec2130a3364f6fa9d6380408"
 
-SRCREV = "1431c8a1bddaabf85e1bbb32bf316a3aef20036e"
+SRCREV = "a97fd062f7dbd4b824fd006edd08927ef9dbf24a"
 SRC_URI = "git://github.com/canonical/cloud-init;branch=main;protocol=https \
     file://cloud-init-source-local-lsb-functions.patch \
     file://0001-setup.py-check-for-install-anywhere-in-args.patch \
@@ -55,5 +55,6 @@ RDEPENDS:${PN} = "python3 \
                   python3-jsonschema \
                   python3-pyyaml \
                   python3-oauthlib \
+                  bash \
                  "