Revert OL modifications
This commit is contained in:
parent
4c0a9dcf87
commit
34b39ef95d
@ -1,31 +0,0 @@
|
||||
From 246586f31209b70667b494db30c847c5b87fe7a3 Mon Sep 17 00:00:00 2001
|
||||
From: Darren Archibald <darren.archibald@oracle.com>
|
||||
Date: Wed, 21 Sep 2022 05:40:34 -0700
|
||||
Subject: [PATCH] Add Oracle support
|
||||
|
||||
Add oracle support to fix waagent.service build issue
|
||||
|
||||
Signed-off-by: Darren Archibald <darren.archibald@oracle.com>
|
||||
|
||||
Updated for OL9.7
|
||||
Signed-off-by: Mark Will <mark.will@oracle.com>
|
||||
---
|
||||
setup.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index cf6e90b..f2a49f1 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -97,7 +97,7 @@ def get_data_files(name, version, fullname): # pylint: disable=R0912
|
||||
systemd_dir_path = osutil.get_systemd_unit_file_install_path()
|
||||
agent_bin_path = osutil.get_agent_bin_path()
|
||||
|
||||
- if name in ('redhat', 'rhel', 'centos', 'almalinux', 'cloudlinux', 'rocky'):
|
||||
+ if name in ('redhat', 'rhel', 'centos', 'almalinux', 'cloudlinux', 'rocky', 'oracle'):
|
||||
if version.startswith("8") or version.startswith("9"):
|
||||
# redhat8+ default to py3
|
||||
set_bin_files(data_files, dest=agent_bin_path,
|
||||
--
|
||||
2.27.0
|
||||
|
||||
0
SOURCES/tpm2-luks-import.sh
Normal file → Executable file
0
SOURCES/tpm2-luks-import.sh
Normal file → Executable file
@ -2,51 +2,49 @@
|
||||
%global dracut_modname_udev 97walinuxagent
|
||||
%global dracut_modname_cvm 97walinuxagentcvm
|
||||
|
||||
Name: WALinuxAgent
|
||||
Version: 2.13.1.1
|
||||
Release: 3.0.1%{?dist}.1
|
||||
Summary: The Microsoft Azure Linux Agent
|
||||
Name: WALinuxAgent
|
||||
Version: 2.13.1.1
|
||||
Release: 3%{?dist}.1
|
||||
Summary: The Microsoft Azure Linux Agent
|
||||
|
||||
License: ASL 2.0
|
||||
URL: https://github.com/Azure/%{name}
|
||||
Source0: https://github.com/Azure/%{name}/archive/v%{version}.tar.gz
|
||||
Source1: module-setup-udev.sh
|
||||
Source2: module-setup-cvm.sh
|
||||
Source3: 90-tpm2-import.rules
|
||||
Source4: tpm2-luks-import.sh
|
||||
License: ASL 2.0
|
||||
URL: https://github.com/Azure/%{name}
|
||||
Source0: https://github.com/Azure/%{name}/archive/v%{version}.tar.gz
|
||||
Source1: module-setup-udev.sh
|
||||
Source2: module-setup-cvm.sh
|
||||
Source3: 90-tpm2-import.rules
|
||||
Source4: tpm2-luks-import.sh
|
||||
|
||||
# For bz#2114830 - [Azure][WALA][RHEL-9.1] Provisioning failed if no ifcfg-eth0
|
||||
Patch0001: wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch
|
||||
Patch0001: wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch
|
||||
# For RHEL-7273 - [Azure][WALA] Consider to disable Log collector
|
||||
Patch0002: wla-Disable-automatic-log-collector.patch
|
||||
Patch0002: wla-Disable-automatic-log-collector.patch
|
||||
# For RHEL-5880 - [Azure][RHEL-9]68-azure-sriov-nm-unmanaged.rules cannot stop NetworkManager-wait-online.service checking SRIOV interface
|
||||
Patch0003: wla-redhat-Add-a-udev-rule-to-avoid-managing-slave-NICs-.patch
|
||||
Patch0003: wla-redhat-Add-a-udev-rule-to-avoid-managing-slave-NICs-.patch
|
||||
# For RHEL-109496 - [Azure][WALA][RHEL-9] Missing man page
|
||||
Patch4: wla-docs-add-waagent-manpage-3401.patch
|
||||
Patch4: wla-docs-add-waagent-manpage-3401.patch
|
||||
# For RHEL-97572 - [Azure][RHEL-9][WALA][Image mode] Cannot find 'service' command
|
||||
Patch5: wla-Use-systemctl-instead-of-service-to-manager-services.patch
|
||||
Patch5: wla-Use-systemctl-instead-of-service-to-manager-services.patch
|
||||
# For RHEL-124949 - Update walagent to 2.14 to support FIPS 140-3 on Azure [rhel-9.7.z]
|
||||
Patch6: wla-Support-for-FIPS-140-3-3324.patch
|
||||
Patch6: wla-Support-for-FIPS-140-3-3324.patch
|
||||
|
||||
Patch1000: 0100-add-oracle-support.patch
|
||||
BuildArch: noarch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-distro
|
||||
Requires: %name-udev = %version-%release
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-distro
|
||||
Requires: %name-udev = %version-%release
|
||||
%if 0%{?fedora}
|
||||
Requires: ntfsprogs
|
||||
Requires: ntfsprogs
|
||||
%endif
|
||||
Requires: openssh
|
||||
Requires: openssh-server
|
||||
Requires: openssl
|
||||
Requires: parted
|
||||
Requires: python3-pyasn1
|
||||
Requires: iptables
|
||||
Requires: openssh
|
||||
Requires: openssh-server
|
||||
Requires: openssl
|
||||
Requires: parted
|
||||
Requires: python3-pyasn1
|
||||
Requires: iptables
|
||||
|
||||
BuildRequires: systemd
|
||||
BuildRequires: systemd
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
@ -58,25 +56,25 @@ images that are built to run in the Microsoft Azure environment.
|
||||
|
||||
%if 0%{?with_legacy}
|
||||
%package legacy
|
||||
Summary: The Microsoft Azure Linux Agent (legacy)
|
||||
Requires: %name = %version-%release
|
||||
Requires: python2
|
||||
Requires: net-tools
|
||||
Summary: The Microsoft Azure Linux Agent (legacy)
|
||||
Requires: %name = %version-%release
|
||||
Requires: python2
|
||||
Requires: net-tools
|
||||
|
||||
%description legacy
|
||||
The Microsoft Azure Linux Agent supporting old version of extensions.
|
||||
%endif
|
||||
|
||||
%package udev
|
||||
Summary: Udev rules for Microsoft Azure
|
||||
Summary: Udev rules for Microsoft Azure
|
||||
|
||||
%description udev
|
||||
Udev rules specific to Microsoft Azure Virtual Machines.
|
||||
|
||||
%package cvm
|
||||
Summary: Microsoft Azure CVM specific tools
|
||||
Requires: tpm2-tools
|
||||
Requires: cryptsetup
|
||||
Summary: Microsoft Azure CVM specific tools
|
||||
Requires: tpm2-tools
|
||||
Requires: cryptsetup
|
||||
|
||||
%description cvm
|
||||
Scripts and udev rules specific to Microsoft Azure Confidential Virtual Machines.
|
||||
@ -164,9 +162,6 @@ rm -rf %{_unitdir}/waagent.service.d/
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Jan 28 2026 Craig Guiller <craig.guiller@oracle.com> - 2.13.1.1-3.0.1.el9_7.1
|
||||
- Add oracle support to fix waagent.service build issue
|
||||
|
||||
* Tue Dec 02 2025 Jon Maloy <jmaloy@redhat.com> - 2.13.1.1-3.el9_7.1
|
||||
- wla-Support-for-FIPS-140-3-3324.patch [RHEL-124949]
|
||||
- Resolves: RHEL-124949
|
||||
|
||||
Loading…
Reference in New Issue
Block a user