diff --git a/0033-Read-the-driver-list-supported-by-ANCK.patch b/0033-Read-the-driver-list-supported-by-ANCK.patch new file mode 100644 index 0000000000000000000000000000000000000000..0746346a3a6fc033fef4c855107b6bcc510eadf5 --- /dev/null +++ b/0033-Read-the-driver-list-supported-by-ANCK.patch @@ -0,0 +1,134 @@ +From 16314396e430511f4afafba0aff83c54e3220689 Mon Sep 17 00:00:00 2001 +From: Bitao Hu +Date: Tue, 15 Nov 2022 15:28:58 +0800 +Subject: [Patch] Read the driver list supported by ANCK to determine driver compatibility problem, when migrating to Anolis8 with ANCK. + +Signed-off-by: Bitao Hu +--- + .../actors/kernel/checkkerneldrivers/actor.py | 16 ++++- + .../files/removed_drivers_anck.txt | 69 +++++++++++++++++++ + ...d_drivers.txt => removed_drivers_rhck.txt} | 0 + 3 files changed, 82 insertions(+), 3 deletions(-) + create mode 100644 repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/files/removed_drivers_anck.txt + rename repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/files/{removed_drivers.txt => removed_drivers_rhck.txt} (100%) + +diff --git a/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py b/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py +index 19fefc3..6c4b042 100644 +--- a/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py ++++ b/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py +@@ -4,7 +4,7 @@ from leapp.libraries.actor.checkkerneldrivers import ( + get_present_drivers, + get_removed_drivers, + ) +-from leapp.models import PCIDevices ++from leapp.models import (PCIDevices, CustomTargetRepository) + from leapp.reporting import Report, create_report + from leapp import reporting + from leapp.tags import ChecksPhaseTag, IPUWorkflowTag +@@ -23,12 +23,22 @@ class CheckKernelDrivers(Actor): + files/removed_drivers.txt file. + """ + name = 'check_kernel_drivers' +- consumes = (PCIDevices,) ++ consumes = (PCIDevices, CustomTargetRepository) + produces = (Report,) + tags = (ChecksPhaseTag, IPUWorkflowTag) + + def process(self): +- removed_file = 'files/removed_drivers.txt' ++ toANCK = False ++ removed_file = '' ++ for repo in self.consume(CustomTargetRepository): ++ if repo.repoid == 'anolis_plus': ++ toANCK = True ++ break ++ if toANCK == True: ++ removed_file = 'files/removed_drivers_anck.txt' ++ else: ++ removed_file = 'files/removed_drivers_rhck.txt' ++ + conflicting = check_drivers(get_removed_drivers(removed_file), get_present_drivers()) + + if conflicting: +diff --git a/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/files/removed_drivers_anck.txt b/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/files/removed_drivers_anck.txt +new file mode 100644 +index 0000000..1ab9e3e +--- /dev/null ++++ b/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/files/removed_drivers_anck.txt +@@ -0,0 +1,69 @@ ++# Support for the following device drivers has been removed in Anolis 8. ++ ++at91_ether ++osdblk ++ebt_ulog ++ablk_helper ++pcompress ++salsa20-x86_64 ++zlib ++gve ++hid-lenovo-tpkbd ++hid-ps3remote ++hmcdrv ++iavf ++idma64 ++igc ++ib_ipath ++ipg ++gpio-ir-recv ++ir-lirc-codec ++ir-rc5-sz-decoder ++dell-led ++rtsx_pci ++rtsx_usb ++nft_meta_bridge ++nft_exthdr ++nft_meta ++nft_rbtree ++pata_arasan_cf ++pata_cs5536 ++pch_dma ++pch_gbe ++pch_phub ++ptp_pch ++rtw88 ++rtwpci ++libsrp ++scsi_tgt ++snd-firewire-speakers ++snd-scs1x ++snd-tea575x-tuner ++wacom ++uio_pdrv_genirq ++vringh ++videobuf-dvb ++btcx-risc ++mt9v011 ++output ++stk1160 ++poseidon ++tvp5150 ++w83697hf_wdt ++w83697ug_wdt ++xen-acpi-processor ++dvb-usb-friio ++dvb-usb-it913x ++ipt_ULOG ++xgmac ++sctp_probe ++nf_conntrack_ipv4 ++nf_conntrack_ipv6 ++nfnetlink_cthelper ++libore ++objlayoutdriver ++snd-soc-sst-baytrail-pcm ++stm_p_basic ++stm_p_sys-t ++i7300_idle ++it913x-fe +diff --git a/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/files/removed_drivers.txt b/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/files/removed_drivers_rhck.txt +similarity index 100% +rename from repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/files/removed_drivers.txt +rename to repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/files/removed_drivers_rhck.txt +-- +2.27.0 + diff --git a/leapp-repository.spec b/leapp-repository.spec index d03a12b66a4bc6af98468ae1e28d233dc7acfe2f..1f1360b73f50f550fdc1b275d429fa5db1d839c9 100644 --- a/leapp-repository.spec +++ b/leapp-repository.spec @@ -11,7 +11,7 @@ }\ py2_byte_compile "%1" "%2"} -%define anolis_release 8 +%define anolis_release 9 Name: leapp-repository Version: 0.13.0 @@ -58,6 +58,7 @@ Patch29: 0029-Service-configuration-remains-after-migration.patch Patch30: 0030-fix-subprocess-check_output-method-for-backup-service-configuration.patch Patch31: 0031-Deal-with-EPEL-repositories-create-by-user-mannally.patch Patch32: 0032-Keep-PermitRootLogin-authentication-behavior-after-m.patch +Patch33: 0033-Read-the-driver-list-supported-by-ANCK.patch BuildArch: noarch BuildRequires: python-devel @@ -180,6 +181,9 @@ done; # no files here %changelog +* Thu Nov 15 2022 Bitao Hu - 0.13.0-2.9 +- Read the driver list supported by ANCK to determine driver compatibility problem, when migrating to Anolis8 with ANCK. + * Sun Nov 13 2022 Weisson - 0.13.0-2.8 - Keep PermitRootLogin authentication behavior after migration.