diff --git a/0028-support-upgrade-kernel-to-ANCK.patch b/0028-support-upgrade-kernel-to-ANCK.patch new file mode 100644 index 0000000000000000000000000000000000000000..9b51d04aff6c3d72c2a0ffed70ff415d69fb92b8 --- /dev/null +++ b/0028-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 f2f2fe1faead7e1848b5b602df2b842470d9929e..b3a84591df049bb3b9c8cb42507b90ec8e348132 100644 --- a/leapp-repository.spec +++ b/leapp-repository.spec @@ -11,7 +11,7 @@ }\ py2_byte_compile "%1" "%2"} -%define anolis_release 3 +%define anolis_release 4 Name: leapp-repository Version: 0.13.0 @@ -53,6 +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 BuildArch: noarch BuildRequires: python-devel @@ -175,6 +176,9 @@ done; # no files here %changelog +* Tue Sep 6 2022 mgb01105731 - 0.13.0-2.4 +- support upgrade kernel to ANCK + * Thu Sep 1 2022 Liwei Ge - 0.13.0-2.3 - Write efi vars for ecs firmware diff --git a/leapp_upgrade_repositories.repo b/leapp_upgrade_repositories.repo index 83e162219ba87f0506e373b7b26e4ce6337347f3..7f8bdfa13612630a1a90bd1ee82c514fc24b9f16 100644 --- a/leapp_upgrade_repositories.repo +++ b/leapp_upgrade_repositories.repo @@ -17,3 +17,9 @@ gpgcheck=0 name=anolis highavailability baseurl=https://mirrors.openanolis.cn/anolis/8/HighAvailability/$basearch/os gpgcheck=0 + +[anolis_plus] +name=anolis plus +baseurl=https://mirrors.openanolis.cn/anolis/8/Plus/$basearch/os +gpgcheck=0 +enabled=0