Merge pull request #3439 from citrus-it/cloudinit

cloud-init - update from 23.1.2 to 23.4.1

build/cloud-init/build.sh

@@ -17,24 +17,21 @@
 . ../../lib/build.sh
 
 PROG=cloud-init
-VER=23.1.2
+VER=23.4.1
 DASHREV=0
 PKG=system/management/cloud-init
 SUMMARY="Cloud instance initialisation tools"
 DESC="Cloud-init is the industry standard multi-distribution method for "
 DESC+="cross-platform cloud instance initialisation"
 
-PYMVER=${PYTHONVER%%.*}    # 3
-SPYVER=${PYTHONVER//./}    # 39
-
 set_builddir $PROG-illumos-$VER-$DASHREV
 
 RUN_DEPENDS_IPS+="
-    library/python-$PYMVER/idna-$SPYVER
-    library/python-$PYMVER/jsonschema-$SPYVER
-    library/python-$PYMVER/pyrsistent-$SPYVER
-    library/python-$PYMVER/six-$SPYVER
-    library/python-$PYMVER/pyyaml-$SPYVER
+    library/python-$PYTHONMAJVER/idna-$PYTHONPKGVER
+    library/python-$PYTHONMAJVER/jsonschema-$PYTHONPKGVER
+    library/python-$PYTHONMAJVER/pyrsistent-$PYTHONPKGVER
+    library/python-$PYTHONMAJVER/six-$PYTHONPKGVER
+    library/python-$PYTHONMAJVER/pyyaml-$PYTHONPKGVER
 "
 
 # Force using the legacy setup.py backend as the PEP518 build ends up putting
@@ -53,7 +50,7 @@ function install_deps {
 
     logmsg "--- installing python dependencies"
     logcmd mkdir -p $DESTDIR/$_site || logerr "mkdir $DESTDIR/$_site"
-    logcmd $_pip -r $TMPDIR/$BUILDDIR/requirements.txt
+    logcmd $_pip -r $TMPDIR/$BUILDDIR/frozen-requirements.txt
     logcmd $_pip pyserial
 
     export PYTHONPATH=$DESTDIR/$_site

doc/packages.md

@@ -97,7 +97,7 @@
 | system/library/dbus			| 1.14.10		| https://dbus.freedesktop.org/releases/dbus | Odd minor versions are dev/unstable
 | system/library/libdbus-glib		| 0.112			| https://dbus.freedesktop.org/releases/dbus-glib/
 | system/library/pcap			| 1.10.4		| http://www.tcpdump.org/#latest-releases
-| system/management/cloud-init		| 23.1.2		| https://github.com/canonical/cloud-init/releases
+| system/management/cloud-init		| 23.4.1		| https://github.com/canonical/cloud-init/releases
 | system/management/ipmitool		| 1.8.19		| https://github.com/ipmitool/ipmitool/releases
 | system/management/snmp/net-snmp	| 5.9.4			| https://github.com/net-snmp/net-snmp/tags
 | system/network/lldp			| 0.4alpha		| https://sourceforge.net/projects/openlldp/files/

lib/functions.sh

@@ -2849,6 +2849,7 @@ build_dependency() {
 
 set_python_version() {
     PYTHONVER=$1
+    PYTHONMAJVER=${PYTHONVER%%.*}
     PYTHONPKGVER=${PYTHONVER//./}
     PYTHONPATH=/usr
     PYTHON=$PYTHONPATH/bin/python$PYTHONVER