diff --git a/0028-support-upgrade-kernel-to-ANCK.patch b/0028-add-disablerepo-option-to-upgrade-kernel-to-RHCK.patch similarity index 50% rename from 0028-support-upgrade-kernel-to-ANCK.patch rename to 0028-add-disablerepo-option-to-upgrade-kernel-to-RHCK.patch index 9b51d04aff6c3d72c2a0ffed70ff415d69fb92b8..4a5672dde73ab27134fc3501202ae8d8aca74cd5 100644 --- a/0028-support-upgrade-kernel-to-ANCK.patch +++ b/0028-add-disablerepo-option-to-upgrade-kernel-to-RHCK.patch @@ -1,27 +1,32 @@ -From f1c989736cd5d056a46bfde66326499b3b70b5bf Mon Sep 17 00:00:00 2001 +From ad08c0a1c09acdaa5d4999f1f0ae51da4f82e54f Mon Sep 17 00:00:00 2001 From: mgb01105731 -Date: Tue, 12 Jul 2022 16:19:13 +0800 -Subject: [PATCH] =?UTF-8?q?#42781502=20;=20Report=20is=20https://yuque.ant?= - =?UTF-8?q?fin.com/docs/share/1e95ae1f-7cb3-4e77-b172-e5123ab24bbb=3F#=20?= - =?UTF-8?q?=E3=80=8Acentos=E8=BF=81=E7=A7=BBanolis=EF=BC=88leapp=E5=B7=A5?= - =?UTF-8?q?=E5=85=B7=EF=BC=89=E5=A2=9E=E5=8A=A0=E6=8C=87=E5=AE=9A=E5=86=85?= - =?UTF-8?q?=E6=A0=B8=E7=89=88=E6=9C=AC=E5=8A=9F=E8=83=BD=E9=AA=8C=E8=AF=81?= - =?UTF-8?q?=EF=BC=89=E3=80=8B?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +Date: Fri, 9 Sep 2022 17:52:19 +0800 +Subject: [PATCH] add --disablerepo option to upgrade kernel to RHCK --- - .../libraries/scancustomrepofile.py | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) + .../libraries/scancustomrepofile.py | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/repos/system_upgrade/el7toel8/actors/scancustomrepofile/libraries/scancustomrepofile.py b/repos/system_upgrade/el7toel8/actors/scancustomrepofile/libraries/scancustomrepofile.py -index c294193..137b07a 100644 +index c294193..a5a30bd 100644 --- a/repos/system_upgrade/el7toel8/actors/scancustomrepofile/libraries/scancustomrepofile.py +++ b/repos/system_upgrade/el7toel8/actors/scancustomrepofile/libraries/scancustomrepofile.py -@@ -27,9 +27,10 @@ def process(): +@@ -3,7 +3,7 @@ import os + from leapp.libraries.common import repofileutils + from leapp.libraries.stdlib import api + from leapp.models import CustomTargetRepository, CustomTargetRepositoryFile +- ++from leapp.libraries.common import config + + CUSTOM_REPO_PATH = "/etc/leapp/files/leapp_upgrade_repositories.repo" + +@@ -26,10 +26,14 @@ def process(): + if not repofile.data: return api.produce(CustomTargetRepositoryFile(file=CUSTOM_REPO_PATH)) ++ disablelist=[] ++ if config.get_env('LEAPP_DISABLE_REPOS'): ++ disablelist = [repoid for repoid in config.get_env('LEAPP_DISABLE_REPOS').split(',')] for repo in repofile.data: - api.produce(CustomTargetRepository( - repoid=repo.repoid, @@ -29,7 +34,7 @@ index c294193..137b07a 100644 - baseurl=repo.baseurl, - enabled=repo.enabled, - )) -+ if repo.enabled: ++ if repo.enabled and repo.repoid not in disablelist: + api.produce(CustomTargetRepository( + repoid=repo.repoid, + name=repo.name, @@ -37,5 +42,5 @@ index c294193..137b07a 100644 + enabled=repo.enabled, + )) -- -2.19.1.6.gb485710b +2.19.2 diff --git a/leapp-repository.spec b/leapp-repository.spec index 9b3bbf406aedbd3baa4dc46f358229620dcb3eea..a1cbe4b39732208dbe6480f00c1dbe06936cc088 100644 --- a/leapp-repository.spec +++ b/leapp-repository.spec @@ -11,7 +11,7 @@ }\ py2_byte_compile "%1" "%2"} -%define anolis_release 5 +%define anolis_release 6 Name: leapp-repository Version: 0.13.0 @@ -53,7 +53,7 @@ Patch24: 0024-remove-unofficial-url.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-support-upgrade-kernel-to-ANCK.patch +Patch28: 0028-add-disablerepo-option-to-upgrade-kernel-to-RHCK.patch Patch29: 0029-Service-configuration-remains-after-migration.patch BuildArch: noarch @@ -177,6 +177,9 @@ done; # no files here %changelog +* Tue Sep 13 2022 mgb01105731 - 0.13.0-2.6 +- add disablerepo option to upgrade kernel to RHCK + * Tue Sep 6 2022 Weisson - 0.13.0-2.5 - Service configuration remains after migration diff --git a/leapp_upgrade_repositories.repo b/leapp_upgrade_repositories.repo index 7f8bdfa13612630a1a90bd1ee82c514fc24b9f16..5c24268d09711ca620c311435d458cba68dc28ad 100644 --- a/leapp_upgrade_repositories.repo +++ b/leapp_upgrade_repositories.repo @@ -22,4 +22,4 @@ gpgcheck=0 name=anolis plus baseurl=https://mirrors.openanolis.cn/anolis/8/Plus/$basearch/os gpgcheck=0 -enabled=0 +enabled=1