diff --git a/0063-add-compare-with-package-result-in-abi-report.patch b/0063-add-compare-with-package-result-in-abi-report.patch new file mode 100644 index 0000000000000000000000000000000000000000..b89ffafd2a2c021156fae60d288e1e16e87bb7fc --- /dev/null +++ b/0063-add-compare-with-package-result-in-abi-report.patch @@ -0,0 +1,53 @@ +From b21342f766124ff7fbb737fa882329ae7873d970 Mon Sep 17 00:00:00 2001 +From: xuezhixin +Date: Mon, 13 Nov 2023 10:30:03 +0800 +Subject: [PATCH] =?UTF-8?q?ABI=E6=8A=A5=E5=91=8A=E5=A2=9E=E5=8A=A0?= + =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E5=8C=85=E5=AF=B9=E6=AF=94?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + sysmig_agent/Abisystmcompchk.py | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + +diff --git a/sysmig_agent/Abisystmcompchk.py b/sysmig_agent/Abisystmcompchk.py +index 541e9a8..7a810f9 100644 +--- a/sysmig_agent/Abisystmcompchk.py ++++ b/sysmig_agent/Abisystmcompchk.py +@@ -202,3 +202,32 @@ def is_ELFfile(filepath, logger): + # logger.info(str(e)) + pass + return False ++ ++ ++#Get migration behind rpm list, filter dist of '.uelc20' ++def get_migrate_behind_rpm_pkg(): ++ dist='.uelc20' ++ migration_before_uelc20_rpm = exp_rst_dir + 'migration-before-uelc20-rpm.csv' ++ migration_behind_uelc20_rpm = exp_rst_dir + 'migration-behind-uelc20-rpm.csv' ++ ++ rpm_pkg_list=[] ++ ++ ts = rpm.TransactionSet() ++ mi = ts.dbMatch() ++ ++ fhu = open(migration_behind_uelc20_rpm, 'w') ++ if system_version_id() == '7': ++ for rpm_pkg in mi: ++ if dist in rpm_pkg['release'].decode(): ++ fhu.write(rpm_pkg['name'].decode()+'\n') ++ rpm_pkg_list.append(rpm_pkg['name'].decode()) ++ else: ++ for rpm_pkg in mi: ++ if dist in rpm_pkg['release']: ++ fhu.write(rpm_pkg['name']+'\n') ++ rpm_pkg_list.append(rpm_pkg['name']) ++ fcw.close() ++ ++ return rpm_pkg_list ++ ++ +-- +2.20.1 + diff --git a/migration-tools.spec b/migration-tools.spec index 57b4787535ffe94a3af8be80c69074295b042271..5fe905818f14f66c77244306850e6da192ce5adb 100644 --- a/migration-tools.spec +++ b/migration-tools.spec @@ -1,6 +1,6 @@ Name: migration-tools Version: 1.0.2 -Release: 62 +Release: 63 License: MulanPSL-2.0 Summary: A tool to help users migrate the Centos system to the UOS system and openEuler system Source0: %{name}-%{version}.tar.gz @@ -69,6 +69,8 @@ Patch59: 0059-add-kernel-detection-result-to-abi-report.patch Patch60: 0060-add-four-detection-item-to-abi-report.patch Patch61: 0061-detection-abi-log.patch Patch62: 0062-add-detection-ELF-content-in-abi-file.patch +Patch63: 0063-add-compare-with-package-result-in-abi-report.patch + BuildArch: noarch BuildRequires: systemd @@ -167,6 +169,9 @@ rm -rf /usr/bin/migration-tools %endif %changelog +* Tue Nov 5 2024 xuezhixin - 1.0.2-63 +- 0063-add-compare-with-package-result-in-abi-report.patch + * Tue Nov 5 2024 xuezhixin - 1.0.2-62 - 0062-add-detection-ELF-content-in-abi-file.patch