!3 【NestOS】22.03-lts-sp1选型升级至2.8.0.11

From: @duyiwei7w 
Reviewed-by: @fu-shanqing 
Signed-off-by: @fu-shanqing

0001-Install-systemd-unit-for-default-OS.patch

@@ -1,42 +0,0 @@
-From 53a8080be30553ecbd9262d721c9d3374b8e48e5 Mon Sep 17 00:00:00 2001
-From: Vitaly Kuznetsov <vkuznets@redhat.com>
-Date: Thu, 3 Jun 2021 12:48:02 +0200
-Subject: [PATCH] Install systemd unit for 'default' OS
-
-Fedora is not in the list but uses systemd and not sysv.
-
-Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
----
- azurelinuxagent/common/osutil/default.py | 2 +-
- setup.py                                 | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/azurelinuxagent/common/osutil/default.py b/azurelinuxagent/common/osutil/default.py
-index 066e143136d7..fcb7d9b857dd 100644
---- a/azurelinuxagent/common/osutil/default.py
-+++ b/azurelinuxagent/common/osutil/default.py
-@@ -146,7 +146,7 @@ class DefaultOSUtil(object):
- 
-     @staticmethod
-     def get_systemd_unit_file_install_path():
--        return "/lib/systemd/system"
-+        return "/usr/lib/systemd/system"
- 
-     @staticmethod
-     def get_agent_bin_path():
-diff --git a/setup.py b/setup.py
-index c258e4b878cc..b2ed8f4cde36 100755
---- a/setup.py
-+++ b/setup.py
-@@ -194,7 +194,7 @@ def get_data_files(name, version, fullname):  # pylint: disable=R0912
-         set_conf_files(data_files)
-         set_logrotate_files(data_files)
-         set_udev_files(data_files)
--        set_sysv_files(data_files)
-+        set_systemd_files(data_files, dest=systemd_dir_path)
-     return data_files
- 
- 
--- 
-2.31.1
-

WALinuxAgent.spec

@@ -2,7 +2,7 @@
 %global dracut_modname 97walinuxagent
 
 Name:             WALinuxAgent
-Version:          2.5.0.2
+Version:          2.8.0.11
 Release:          1
 Summary:          The Microsoft Azure Linux Agent
 
@@ -11,8 +11,6 @@ URL:              https://github.com/Azure/%{name}
 Source0:          https://github.com/Azure/%{name}/archive/v%{version}.tar.gz
 Source1:          module-setup.sh
 
-# Python3.9 fixes
-Patch0: 0001-Install-systemd-unit-for-default-OS.patch
 
 BuildArch:        noarch
 BuildRequires:    python3-devel
@@ -49,7 +47,6 @@ Udev rules specific to Microsoft Azure Virtual Machines.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %py3_build
@@ -74,7 +71,7 @@ sed -i 's,#!/usr/bin/env python,#!/usr/bin/python2,' %{buildroot}%{_sbindir}/waa
 %else
 rm -f %{buildroot}%{_sbindir}/waagent2.0
 %endif
-sed -i 's,/usr/bin/python ,/usr/bin/python3 ,' %{buildroot}%{_unitdir}/waagent.service
+sed -i 's,/usr/bin/python ,/usr/bin/python3 ,' %{buildroot}/lib/systemd/system/waagent.service
 
 mv %{buildroot}%{_sysconfdir}/logrotate.d/waagent.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 
@@ -96,7 +93,9 @@ install -m0755 -D -t %{buildroot}%{_prefix}/lib/dracut/modules.d/%{dracut_modnam
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_sbindir}/waagent
 %config(noreplace) %{_sysconfdir}/waagent.conf
-%{_unitdir}/waagent.service
+/lib/systemd/system//waagent.service
+/lib/systemd/system//azure.slice
+/lib/systemd/system//azure-vmextensions.slice
 %{python3_sitelib}/azurelinuxagent
 %{python3_sitelib}/*.egg-info
 
@@ -110,6 +109,9 @@ install -m0755 -D -t %{buildroot}%{_prefix}/lib/dracut/modules.d/%{dracut_modnam
 %endif
 
 %changelog
+* Tue Nov 08 2022 duyiwei <duyiwei@kylinos.cn> - 2.8.0.11-1
+- upgrade to 2.8.0.11
+
 * Fri Jun 10 2022 fushanqing <fushanqing@kylinos.cn> - 2.5.0.2-1
 - update to 2.5.0.2