diff --git a/syscare-0.1.2.rc3.tar.gz b/syscare-0.1.2.rc4.tar.gz similarity index 61% rename from syscare-0.1.2.rc3.tar.gz rename to syscare-0.1.2.rc4.tar.gz index 3f172be..3b468df 100644 Binary files a/syscare-0.1.2.rc3.tar.gz and b/syscare-0.1.2.rc4.tar.gz differ diff --git a/syscare.spec b/syscare.spec index 58b691d..ef94008 100644 --- a/syscare.spec +++ b/syscare.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: syscare -Version: 0.1.2.rc3 +Version: 0.1.2.rc4 Release: 1 Summary: system hot-fix service @@ -9,8 +9,6 @@ License: MulanPSL-2.0 GPL-2.0-only URL: https://gitee.com/openeuler/syscare Source0: %{name}-%{version}.tar.gz -ExclusiveArch: x86_64 - BuildRequires: rust cargo gcc gcc-g++ cmake make BuildRequires: elfutils-libelf-devel BuildRequires: kernel-devel @@ -25,6 +23,7 @@ The host can fix the system problem without rebooting. Summary: Tools for build syscare patch. Requires: %{name} = %{version}-%{release} Requires: kpatch make gcc openssl-devel dwarves python3-devel bison flex +Requires: elfutils-libelf-devel Requires: rpm-build %description build @@ -46,49 +45,69 @@ cd tmp_build %make_install mkdir -p %{buildroot}/lib/modules/%{kernel_version}/extra/syscare +%ifarch x86_64 install -m 0640 %{buildroot}/usr/libexec/%{name}/upatch.ko %{buildroot}/lib/modules/%{kernel_version}/extra/syscare +%endif mkdir -p %{buildroot}/usr/lib/systemd/system +%ifarch aarch64 +install -m 0644 %{_builddir}/%{name}-%{version}/misc/%{name}-restore-arm64.service %{buildroot}/usr/lib/systemd/system/%{name}-restore.service +%else install -m 0644 %{_builddir}/%{name}-%{version}/misc/%{name}-restore.service %{buildroot}/usr/lib/systemd/system install -m 0644 %{_builddir}/%{name}-%{version}/misc/%{name}-pre.service %{buildroot}/usr/lib/systemd/system +%endif mkdir -p %{buildroot}/usr/lib/syscare +%ifarch x86_64 cd %{buildroot} find lib -name "upatch.ko" \ -fprintf %{_builddir}/%{name}-%{version}/ko.files.list "/%p\n" +%endif %post %systemd_post %{name}-restore.service +%ifarch x86_64 %{_bindir}/systemctl enable %{name}-pre.service +%endif depmod -A %preun %systemd_preun %{name}-restore.service +%ifarch x86_64 %systemd_preun %{name}-pre.service +%endif %postun depmod -A +%ifarch x86_64 %files -f ko.files.list +%endif %files %defattr(-,root,root,-) %dir /usr/lib/syscare %attr(755,root,root) /usr/bin/syscare +%ifarch x86_64 %attr(755,root,root) /usr/libexec/%{name}/upatch-tool -%attr(755,root,root) /usr/libexec/%{name}/auto-recovery.sh %attr(640,root,root) /usr/libexec/%{name}/upatch.ko -%attr(644,root,root) /usr/lib/systemd/system/%{name}-restore.service %attr(644,root,root) /usr/lib/systemd/system/%{name}-pre.service +%endif +%attr(755,root,root) /usr/libexec/%{name}/auto-recovery.sh +%attr(644,root,root) /usr/lib/systemd/system/%{name}-restore.service %files build %defattr(-,root,root,-) %dir /usr/libexec/%{name} +%attr(755,root,root) /usr/libexec/%{name}/syscare-build +%ifarch x86_64 %attr(755,root,root) /usr/libexec/%{name}/upatch-diff %attr(755,root,root) /usr/libexec/%{name}/upatch-build -%attr(755,root,root) /usr/libexec/%{name}/syscare-build +%endif %changelog +* Mon Dec 12 2022 snoweay - 0.1.2.rc4-1 +- Enable syscare of arm64 just for kernel patch. * Fri Dec 9 2022 snoweay - 0.1.2.rc3-1 - Enable upatch.ko compile. Fix some recovery issues. * Thu Dec 8 2022 snoweay - 0.1.2.rc2-1