diff --git a/0001-upatch-Disable-kmod-compile.patch b/0001-upatch-Disable-kmod-compile.patch new file mode 100644 index 0000000..a509994 --- /dev/null +++ b/0001-upatch-Disable-kmod-compile.patch @@ -0,0 +1,23 @@ +From 62960a89c36155163cb30d086ae4dca3f96fd221 Mon Sep 17 00:00:00 2001 +From: snoweay +Date: Thu, 8 Dec 2022 03:05:32 +0000 +Subject: [PATCH] upatch: Disable kmod compile + +Signed-off-by: snoweay +--- + upatch/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/upatch/CMakeLists.txt b/upatch/CMakeLists.txt +index 3e8e127..d063259 100644 +--- a/upatch/CMakeLists.txt ++++ b/upatch/CMakeLists.txt +@@ -11,4 +11,4 @@ endif() + add_subdirectory(upatch-build) + add_subdirectory(upatch-diff) + add_subdirectory(upatch-tool) +-add_subdirectory(kmod) ++#add_subdirectory(kmod) +-- +2.33.0 + diff --git a/syscare-0.1.2.tar.gz b/syscare-0.1.2.rc2.tar.gz similarity index 60% rename from syscare-0.1.2.tar.gz rename to syscare-0.1.2.rc2.tar.gz index 32a6744..c6b6bc8 100644 Binary files a/syscare-0.1.2.tar.gz and b/syscare-0.1.2.rc2.tar.gz differ diff --git a/syscare.spec b/syscare.spec index 90b9bc5..495e50e 100644 --- a/syscare.spec +++ b/syscare.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: syscare -Version: 0.1.2 +Version: 0.1.2.rc2 Release: 1 Summary: system hot-fix service @@ -13,9 +13,12 @@ ExclusiveArch: x86_64 BuildRequires: rust cargo gcc gcc-g++ cmake make BuildRequires: elfutils-libelf-devel +BuildRequires: kernel-devel Requires: kpatch-runtime +Patch0: 0001-upatch-Disable-kmod-compile.patch + %description SysCare is a system-level hot-fix software that provides single-machine-level and cluster-level security patches and system error hot-fixes for the operating system. The host can fix the system problem without rebooting. @@ -29,29 +32,51 @@ Requires: rpm-build %description build Syscare build tools. +%define kernel_version $(rpm -q --qf "\%%{VERSION}-\%%{RELEASE}.\%%{ARCH}" `rpm -q kernel-devel` | head -n 1) + %prep %autosetup -p1 %build -cmake . +mkdir -p tmp_build +cd tmp_build +cmake .. make %install +cd tmp_build %make_install +mkdir -p %{buildroot}/lib/modules/%{kernel_version}/extra/syscare +#install -m 0640 %{buildroot}/usr/libexec/%{name}/upatch.ko %{buildroot}/lib/modules/%{kernel_version}/extra/syscare + mkdir -p %{buildroot}/usr/lib/systemd/system 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 +#cd %{buildroot} +#find lib -name "upatch.ko" \ +# -fprintf %{_builddir}/%{name}-%{version}/ko.files.list "/%p\n" + %post %systemd_post %{name}-restore.service -%systemd_post %{name}-pre.service +%{_bindir}/systemctl enable %{name}-pre.service +#depmod -A +%preun +%systemd_preun %{name}-restore.service +%systemd_preun %{name}-pre.service + +%postun +#depmod -A + +#%files -f ko.files.list %files %defattr(-,root,root,-) %attr(755,root,root) /usr/bin/syscare %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 @@ -63,6 +88,8 @@ install -m 0644 %{_builddir}/%{name}-%{version}/misc/%{name}-pre.service %{build %attr(755,root,root) /usr/libexec/%{name}/syscare-build %changelog +* Thu Dec 8 2022 snoweay - 0.1.2.rc2-1 +- 0.1.2.rc2 version for test. Fix some issues.. * Thu Dec 1 2022 snoweay - 0.1.2-1 - 0.1.2 version for test. Fix some syscare cli bugs. * Mon Nov 28 2022 snoweay - 0.1.1-1