From 3d4aa640d0f8889791bda846ce95c2c81e9d3c99 Mon Sep 17 00:00:00 2001 From: mgb01105731 Date: Tue, 12 Jul 2022 16:44:02 +0800 Subject: [PATCH] support upgrade kernel to ANCK --- 0027-support-upgrade-kernel-to-ANCK.patch | 41 +++++++++++++++++++++++ leapp-repository.spec | 6 +++- leapp_upgrade_repositories.repo | 6 ++++ 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 0027-support-upgrade-kernel-to-ANCK.patch diff --git a/0027-support-upgrade-kernel-to-ANCK.patch b/0027-support-upgrade-kernel-to-ANCK.patch new file mode 100644 index 0000000..9b51d04 --- /dev/null +++ b/0027-support-upgrade-kernel-to-ANCK.patch @@ -0,0 +1,41 @@ +From f1c989736cd5d056a46bfde66326499b3b70b5bf 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 + +--- + .../libraries/scancustomrepofile.py | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 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 +--- 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(): + return + api.produce(CustomTargetRepositoryFile(file=CUSTOM_REPO_PATH)) + for repo in repofile.data: +- api.produce(CustomTargetRepository( +- repoid=repo.repoid, +- name=repo.name, +- baseurl=repo.baseurl, +- enabled=repo.enabled, +- )) ++ if repo.enabled: ++ api.produce(CustomTargetRepository( ++ repoid=repo.repoid, ++ name=repo.name, ++ baseurl=repo.baseurl, ++ enabled=repo.enabled, ++ )) +-- +2.19.1.6.gb485710b + diff --git a/leapp-repository.spec b/leapp-repository.spec index 45428dd..4f57c69 100644 --- a/leapp-repository.spec +++ b/leapp-repository.spec @@ -11,7 +11,7 @@ }\ py2_byte_compile "%1" "%2"} -%define anolis_release 2 +%define anolis_release 3 Name: leapp-repository Version: 0.13.0 @@ -52,6 +52,7 @@ Patch23: 0023-fix-kernel-version-check-of-anolis-kernel.patch Patch24: 0024-remove-unofficial-url.patch Patch25: 0025-add-check-openssl11-libs.patch Patch26: 0026-Add-checkbaota-actor.patch +Patch27: 0027-support-upgrade-kernel-to-ANCK.patch BuildArch: noarch BuildRequires: python-devel @@ -174,6 +175,9 @@ done; # no files here %changelog +* Tue Jul 12 2022 mgb01105731 - 0.13.0-2.3 +- Support upgrade kernel to ANCK + * Tue Jun 14 2022 Weitao Zhou - 0.13.0-2.2 - Add checkbaota actor diff --git a/leapp_upgrade_repositories.repo b/leapp_upgrade_repositories.repo index 818fcc9..0e10e44 100644 --- a/leapp_upgrade_repositories.repo +++ b/leapp_upgrade_repositories.repo @@ -17,3 +17,9 @@ gpgcheck=0 name=anolis highavailability baseurl=http://mirrors.openanolis.org/anolis/8/HighAvailability/$basearch/os gpgcheck=0 + +[anolis_plus] +name=anolis plus +baseurl=http://mirrors.openanolis.org/anolis/8/Plus/$basearch/os +gpgcheck=0 +enabled=0 -- Gitee