From 509789a0d6bccfe1c1aab5baee8a529aa41a1e1a Mon Sep 17 00:00:00 2001 From: xueZhixin Date: Wed, 3 Dec 2025 15:34:17 +0800 Subject: [PATCH 1/2] feat: fix build error --- migration-tools.spec | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/migration-tools.spec b/migration-tools.spec index 7d63d35..7b5f341 100644 --- a/migration-tools.spec +++ b/migration-tools.spec @@ -1,6 +1,6 @@ Name: migration-tools Version: 1.0.3 -Release: 25 +Release: 27 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 @@ -28,10 +28,10 @@ Patch018: 0018-add-interface-in-agent.patch Patch019: 0019-update-the-initilization-repo-file.patch Patch020: 0020-rebrand-for-openeuler.patch Patch021: 0021-Solve-startup-issues.patch -Patch022: 0001-modify-web-success-migration-page.patch -Patch023: 0022-add-migrate-to-2403.patch -Patch024: 0023-fix-2403-can-not-start-systemd-logind-service.patch -Patch025: 0024-support-migration-to-2503.patch +Patch022: 0022-modify-web-success-migration-page.patch +Patch023: 0023-add-migrate-to-2403.patch +Patch024: 0024-fix-2403-can-not-start-systemd-logind-service.patch +Patch025: 0025-support-migration-to-2503.patch BuildArch: noarch @@ -39,7 +39,6 @@ BuildRequires: systemd %description UOS Migration Software -%if 0%{?rhel} >= 7 %package -n migration-tools-agent Summary: migration-tools-agent License: MulanPSL-2.0 @@ -59,7 +58,6 @@ Requires: /usr/bin/yumdownloader %description -n migration-tools-agent Migration software agent side -%endif %package -n migration-tools-server Summary: migration-tools-server @@ -92,12 +90,10 @@ mkdir -p $RPM_BUILD_ROOT/etc/migration-tools mkdir -p $RPM_BUILD_ROOT%{_unitdir} %{__cp} -r * $RPM_BUILD_ROOT/usr/lib/migration-tools-server/ -%if 0%{?rhel} >= 7 mkdir -p $RPM_BUILD_ROOT/usr/lib/migration-tools-agent %{__cp} -r * $RPM_BUILD_ROOT/usr/lib/migration-tools-agent/ %{__cp} -r $RPM_BUILD_ROOT/usr/lib/migration-tools-server/server/migration-tools-agent.service $RPM_BUILD_ROOT%{_unitdir} -%endif # Install server config %{__cp} -r $RPM_BUILD_ROOT/usr/lib/migration-tools-server/server/migration-tools.conf $RPM_BUILD_ROOT/etc/migration-tools @@ -125,17 +121,21 @@ rm -rf /usr/bin/migration-tools /usr/lib/migration-tools-server %{_unitdir}/migration-tools-server.service -%if 0%{?rhel} >= 7 %files -n migration-tools-agent /etc/migration-tools /var/tmp/migration-tools /usr/lib/migration-tools-agent %{_unitdir}/migration-tools-agent.service -%endif %changelog -* Thu Aug 28 2025 xuezhixin - 1.0.3-25 -- add 0024-support-migration-to-2503.patch +* Tue Dec 02 2025 xuezhixin - 1.0.3-27 +- fix build error + +* Fri Aug 29 2025 xuezhixin - 1.0.3-26 +- add 0025-support-migration-to-2503.patch + +* Tue Jul 29 2025 lixin - 1.0.3-25 +- rename patches * Thu Mar 20 2025 xuezhixin - 1.0.3-24 - update requres -- Gitee From 23a0da157d230cb73c41bfe26fa540cc59e72f91 Mon Sep 17 00:00:00 2001 From: xueZhixin Date: Wed, 3 Dec 2025 15:37:39 +0800 Subject: [PATCH 2/2] feat: sync 25.09 --- ...ion-page.patch => 0022-modify-web-success-migration-page.patch | 0 0022-add-migrate-to-2403.patch => 0023-add-migrate-to-2403.patch | 0 ...ch => 0024-fix-2403-can-not-start-systemd-logind-service.patch | 0 ...igration-to-2503.patch => 0025-support-migration-to-2503.patch | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename 0001-modify-web-success-migration-page.patch => 0022-modify-web-success-migration-page.patch (100%) rename 0022-add-migrate-to-2403.patch => 0023-add-migrate-to-2403.patch (100%) rename 0023-fix-2403-can-not-start-systemd-logind-service.patch => 0024-fix-2403-can-not-start-systemd-logind-service.patch (100%) rename 0024-support-migration-to-2503.patch => 0025-support-migration-to-2503.patch (100%) diff --git a/0001-modify-web-success-migration-page.patch b/0022-modify-web-success-migration-page.patch similarity index 100% rename from 0001-modify-web-success-migration-page.patch rename to 0022-modify-web-success-migration-page.patch diff --git a/0022-add-migrate-to-2403.patch b/0023-add-migrate-to-2403.patch similarity index 100% rename from 0022-add-migrate-to-2403.patch rename to 0023-add-migrate-to-2403.patch diff --git a/0023-fix-2403-can-not-start-systemd-logind-service.patch b/0024-fix-2403-can-not-start-systemd-logind-service.patch similarity index 100% rename from 0023-fix-2403-can-not-start-systemd-logind-service.patch rename to 0024-fix-2403-can-not-start-systemd-logind-service.patch diff --git a/0024-support-migration-to-2503.patch b/0025-support-migration-to-2503.patch similarity index 100% rename from 0024-support-migration-to-2503.patch rename to 0025-support-migration-to-2503.patch -- Gitee