From 96cad4f0467f46e53dc52ea08228895fdafd36e2 Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Fri, 29 Dec 2023 17:03:30 +0000 Subject: [PATCH] cloud-init - update from 23.1.2 to 23.4.1 --- build/cloud-init/build.sh | 17 +++---- build/cloud-init/patches/requirements.patch | 52 --------------------- build/cloud-init/patches/series | 1 - doc/packages.md | 2 +- lib/functions.sh | 1 + 5 files changed, 9 insertions(+), 64 deletions(-) delete mode 100644 build/cloud-init/patches/requirements.patch delete mode 100644 build/cloud-init/patches/series diff --git a/build/cloud-init/build.sh b/build/cloud-init/build.sh index be75354fe6..c3609b495b 100755 --- a/build/cloud-init/build.sh +++ b/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 diff --git a/build/cloud-init/patches/requirements.patch b/build/cloud-init/patches/requirements.patch deleted file mode 100644 index 0eaa70b79f..0000000000 --- a/build/cloud-init/patches/requirements.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -wpruN --no-dereference '--exclude=*.orig' a~/requirements.txt a/requirements.txt ---- a~/requirements.txt 1970-01-01 00:00:00 -+++ a/requirements.txt 1970-01-01 00:00:00 -@@ -1,34 +1,34 @@ - # Pypi requirements for cloud-init to work - - # Used for untemplating any files or strings with parameters. --jinja2 -+jinja2==3.1.2 - - # This one is currently only used by the MAAS datasource. If that - # datasource is removed, this is no longer needed --oauthlib -+oauthlib==3.2.2 - - # This one is currently used only by the CloudSigma and SmartOS datasources. - # If these datasources are removed, this is no longer needed. - # --pyserial -+pyserial==3.5 - - # This is only needed for places where we need to support configs in a manner - # that the built-in config parser is not sufficent (ie - # when we need to preserve comments, or do not have a top-level - # section)... --configobj>=5.0.2 -+configobj==5.0.8 - - # All new style configurations are in the yaml format --pyyaml -+pyyaml==6.0.1 - - # Requests handles ssl correctly! --requests -+requests==2.31.0 - - # For patching pieces of cloud-config together --jsonpatch -+jsonpatch==1.32 - - # For validating cloud-config sections per schema definitions --jsonschema -+jsonschema==4.17.3 - - # Used by DataSourceVMware to inspect the host's network configuration during - # the "setup()" function. -@@ -37,4 +37,4 @@ - # and still participate in instance-data by gathering the network in detail at - # runtime and merge that information into the metadata and repersist that to - # disk. --netifaces>=0.10.4 -+netifaces==0.11.0 diff --git a/build/cloud-init/patches/series b/build/cloud-init/patches/series deleted file mode 100644 index f499a229b4..0000000000 --- a/build/cloud-init/patches/series +++ /dev/null @@ -1 +0,0 @@ -requirements.patch diff --git a/doc/packages.md b/doc/packages.md index 67f80fd29a..35b30fffbb 100644 --- a/doc/packages.md +++ b/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/ diff --git a/lib/functions.sh b/lib/functions.sh index 9e482b2e29..1fa7962e1c 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -2848,6 +2848,7 @@ build_dependency() { set_python_version() { PYTHONVER=$1 + PYTHONMAJVER=${PYTHONVER%%.*} PYTHONPKGVER=${PYTHONVER//./} PYTHONPATH=/usr PYTHON=$PYTHONPATH/bin/python$PYTHONVER