From 53f6cb07ba7a99de525ae67a2d294d91d0135d1a Mon Sep 17 00:00:00 2001 From: eabdullin Date: Sun, 11 Jan 2026 19:55:06 +0000 Subject: [PATCH] Revert OL modifications --- SOURCES/0100-add-oracle-support.patch | 28 --------------------------- SPECS/WALinuxAgent.spec | 6 +----- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 SOURCES/0100-add-oracle-support.patch diff --git a/SOURCES/0100-add-oracle-support.patch b/SOURCES/0100-add-oracle-support.patch deleted file mode 100644 index f7b665c..0000000 --- a/SOURCES/0100-add-oracle-support.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 246586f31209b70667b494db30c847c5b87fe7a3 Mon Sep 17 00:00:00 2001 -From: Darren Archibald -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 ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index e4d7cf7..82ec9fe 100755 ---- a/setup.py -+++ b/setup.py -@@ -96,7 +96,7 @@ - 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 - diff --git a/SPECS/WALinuxAgent.spec b/SPECS/WALinuxAgent.spec index 829a6d3..69d3c8c 100644 --- a/SPECS/WALinuxAgent.spec +++ b/SPECS/WALinuxAgent.spec @@ -3,7 +3,7 @@ Name: WALinuxAgent Version: 2.13.1.1 -Release: 2.0.1%{?dist}.1 +Release: 2%{?dist}.1 Summary: The Microsoft Azure Linux Agent License: Apache-2.0 @@ -20,7 +20,6 @@ Patch5: wla-Use-systemctl-instead-of-service-to-manager-services.patch Patch6: wla-docs-add-waagent-manpage-3401.patch # For RHEL-129954 - Update walagent to 2.14 to support FIPS 140-3 on Azure [rhel-10.1.z] Patch7: wla-Jira-https-issues.redhat.com-browse-RHEL-129954.patch -Patch1000: 0100-add-oracle-support.patch BuildArch: noarch @@ -133,9 +132,6 @@ rm -rf %{_unitdir}/waagent.service.d/ %endif %changelog -* Tue Jan 06 2026 EL Errata - 2.13.1.1-2.0.1 -- Add oracle support to fix waagent.service build issue - * Fri Nov 28 2025 Miroslav Rezanina - 2.13.1.1-2.el10_1.1 - wla-Jira-https-issues.redhat.com-browse-RHEL-129954.patch [RHEL-129954] - Resolves: RHEL-129954