diff --git a/Enable-ipv6-network-by-default.patch b/Enable-ipv6-network-by-default.patch deleted file mode 100644 index 432a1d788eb54404c6fdaa210bda0d5d0a860baa..0000000000000000000000000000000000000000 --- a/Enable-ipv6-network-by-default.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cloud-init-19.1.14/config/cloud.cfg.tmpl 2021-12-14 11:10:30.000000000 +0800 -+++ cloud-init-19.1.14-edit/config/cloud.cfg.tmpl 2022-05-23 20:57:09.060790268 +0800 -@@ -22,7 +22,7 @@ - - manage_etc_hosts: localhost - --{% if variant in ["sles","opensuse","aliyun"]%} -+{% if variant in ["sles","opensuse"]%} - network: - config: disabled - {% endif%} diff --git a/cloud-init-19.1.17.tgz b/cloud-init-19.1.17.tgz deleted file mode 100644 index efb9e6ca12bca791051bde7b988ec14bfd759f5b..0000000000000000000000000000000000000000 Binary files a/cloud-init-19.1.17.tgz and /dev/null differ diff --git a/cloud-init-80cf5dc.tar.gz b/cloud-init-80cf5dc.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..62aa84e7fb806694bec7661bf58d1f512dc0b5be Binary files /dev/null and b/cloud-init-80cf5dc.tar.gz differ diff --git a/cloud-init.spec b/cloud-init.spec index 936b1fc33d28757d712ee28af387b62ac39d8e2b..def5cadaea74bf3c2f6e4a8cf62a738ff6b26bb3 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,4 +1,5 @@ %define anolis_release .0.1 +%define commitid 80cf5dc %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} @@ -16,7 +17,7 @@ # Or: http://www.rpm.org/max-rpm/ch-rpm-inside.html Name: cloud-init -Version: 19.1.17 +Version: 23.2.2 Release: 1%{anolis_release}%{?dist} Summary: Cloud instance init scripts @@ -24,9 +25,7 @@ Group: System Environment/Base License: Dual-licesed GPLv3 or Apache 2.0 URL: http://launchpad.net/cloud-init -Source0: cloud-init-19.1.17.tgz - -Patch0: Enable-ipv6-network-by-default.patch +Source0: %{name}-%{commitid}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath} @@ -66,6 +65,8 @@ BuildRequires: shadow-utils BuildRequires: sudo BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: python3-pyserial +BuildRequires: python3-netifaces # System util packages needed %ifarch %{?ix86} x86_64 ia64 @@ -96,6 +97,8 @@ Requires: shadow-utils Requires: sudo Requires: python3-devel Requires: python3-setuptools +Requires: python3-pyserial +Requires: python3-netifaces # Custom patches @@ -116,8 +119,7 @@ need special scripts to run during initialization to retrieve and install ssh keys and to let the user run various scripts. %prep -%setup -q -n cloud-init-19.1.17 -%patch0 -p1 +%setup -q -n %{name}-%{commitid} # Custom patches activation @@ -209,7 +211,9 @@ fi %files -/lib/udev/rules.d/66-azure-ephemeral.rules +/etc/cloud/clean.d/README +/etc/systemd/system/sshd-keygen@.service.d/disable-sshd-keygen-if-cloud-init-active.conf +/usr/lib/udev/rules.d/66-azure-ephemeral.rules %if "%{init_system}" == "systemd" /usr/lib/systemd/system-generators/cloud-init-generator @@ -221,9 +225,6 @@ fi %attr(0755, root, root) %{_initddir}/cloud-init %endif -%{_sysconfdir}/NetworkManager/dispatcher.d/hook-network-manager -%{_sysconfdir}/dhcp/dhclient-exit-hooks.d/hook-dhclient - # Program binaries %{_bindir}/cloud-init* %{_bindir}/cloud-id* @@ -251,6 +252,9 @@ fi %{python_sitelib}/* %changelog +* Tue Jan 23 2024 Xiaoping Liu - 23.2.2-1.0.1 +- update to 23.2.2 + * Tue Jun 28 2022 Chang Gao - 19.1.17-1.0.1 - Reversion to 19.1.17 - cancel disable network config