From 2de8154b9a9cad464dc07a6c9b3f7b4dd81cb512 Mon Sep 17 00:00:00 2001 From: ZhouWeitao Date: Fri, 10 Mar 2023 14:33:17 +0800 Subject: [PATCH] comment patch 0025 out since openssl11-compat fixed it Signed-off-by: ZhouWeitao --- 0025-add-check-openssl11-libs.patch | 49 ----------------------------- leapp-repository.spec | 3 +- 2 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 0025-add-check-openssl11-libs.patch diff --git a/0025-add-check-openssl11-libs.patch b/0025-add-check-openssl11-libs.patch deleted file mode 100644 index f53d236..0000000 --- a/0025-add-check-openssl11-libs.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e04cfbf28b7c7c47d30c830b5ca9c8aabda2189d Mon Sep 17 00:00:00 2001 -From: mgb01105731 -Date: Tue, 8 Feb 2022 16:34:19 +0800 -Subject: add check openssl11-libs - ---- - .../actors/checkopenssl11libs/actor.py | 30 +++++++++++++++++++ - 1 file changed, 30 insertions(+) - create mode 100644 repos/system_upgrade/el7toel8/actors/checkopenssl11libs/actor.py - -diff --git a/repos/system_upgrade/el7toel8/actors/checkopenssl11libs/actor.py b/repos/system_upgrade/el7toel8/actors/checkopenssl11libs/actor.py -new file mode 100644 -index 0000000..f5ca177 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checkopenssl11libs/actor.py -@@ -0,0 +1,30 @@ -+from leapp.actors import Actor -+from leapp.libraries.common.rpms import has_package -+from leapp.models import InstalledRPM -+from leapp.reporting import Report, create_report -+from leapp import reporting -+from leapp.reporting import create_report -+from leapp.tags import ChecksPhaseTag, IPUWorkflowTag -+ -+ -+class Checkopenssl11libs(Actor): -+ """ -+ Check if openssl11-libs is installed. If yes, stop upgrade -+ """ -+ -+ name = 'check-openssl11-libs' -+ consumes = (InstalledRPM,) -+ produces = (Report,) -+ tags = (ChecksPhaseTag, IPUWorkflowTag) -+ -+ def process(self): -+ if has_package(InstalledRPM, 'openssl11-libs'): -+ create_report([ -+ reporting.Title('Openssl11-libs is installed, openssl11-libs cannot be processed during upgrade.'), -+ reporting.Summary( -+ 'Package openssl11-libs is conflicated with openssl-libs from Anolis OS 8 while upgrading.\n' -+ 'You should first backup your application files and data when your app requires openssl11-libs. Secondly, remove openssl11-libs from your OS and finally exec upgrade.'), -+ reporting.Severity(reporting.Severity.HIGH), -+ reporting.Remediation(hint='Please uninstall openssl11-libs, and then preupgrade again.'), -+ reporting.Flags([reporting.Flags.INHIBITOR]) -+ ]) --- -2.19.1.6.gb485710b - diff --git a/leapp-repository.spec b/leapp-repository.spec index 80e5d03..e094cc7 100644 --- a/leapp-repository.spec +++ b/leapp-repository.spec @@ -50,7 +50,7 @@ Patch21: 0021-support-anolis7.patch Patch22: 0022-add-checklvm2cluster.patch Patch23: 0023-fix-kernel-version-check-of-anolis-kernel.patch Patch24: 0024-remove-unofficial-url.patch -Patch25: 0025-add-check-openssl11-libs.patch +#Patch25: 0025-add-check-openssl11-libs.patch Patch26: 0026-Add-checkbaota-actor.patch Patch27: 0027-upgrade-write-efi-vars-for-ecs-firmware.patch Patch28: 0028-add-disablerepo-option-to-upgrade-kernel-to-RHCK.patch @@ -195,6 +195,7 @@ done; %changelog * Mon Mar 7 2023 Bitao Hu - 0.13.0-2.18 - Add grub2-tools update into answerfile. +- Comment patch 0025 out since openssl11-compat fixed it * Mon Mar 6 2023 Weisson - 0.13.0-2.17 - Provides more information for debug purpose when exception happens in system requirement check. -- Gitee