diff --git a/generate_package.sh b/generate_package.sh index b9b3c407a8a486c31e502825b1b6969a1a32d64d..07c0d87468c5ab5c98976e9fe90256598fc9b09b 100755 --- a/generate_package.sh +++ b/generate_package.sh @@ -19,7 +19,7 @@ echo "Checking out dest branch..." git checkout "$REPO_BRANCH" echo "Vendoring dependencies..." -cargo vendor --respect-source-config --sync upatch/Cargo.toml +cargo vendor --respect-source-config --sync Cargo.toml mkdir -p .cargo cat << EOF > .cargo/config.toml diff --git a/syscare-1.2.0.tar.gz b/syscare-1.2.1.tar.gz similarity index 70% rename from syscare-1.2.0.tar.gz rename to syscare-1.2.1.tar.gz index d2f5be22dff5b930928823d3b98e6395b0f36670..616f843d63e0d3623da168d9c2a4b2bce16a9901 100644 Binary files a/syscare-1.2.0.tar.gz and b/syscare-1.2.1.tar.gz differ diff --git a/syscare.spec b/syscare.spec index fca58152c47938602458a33e486883514acccfb4..5b7c1dfce318f7a00c17c4becf226baf503300b4 100644 --- a/syscare.spec +++ b/syscare.spec @@ -5,22 +5,18 @@ %define pkg_kmod %{name}-kmod %define pkg_build %{name}-build -%define pkg_build_kmod %{pkg_build}-kmod -%define pkg_build_ebpf %{pkg_build}-ebpf ############################################ ############ Package syscare ############### ############################################ Name: syscare -Version: 1.2.0 -Release: 10 +Version: 1.2.1 +Release: 1 Summary: System hot-fix service License: MulanPSL-2.0 and GPL-2.0-only URL: https://gitee.com/openeuler/syscare Source0: %{name}-%{version}.tar.gz -Patch0001: 0001-upatch-fix-memory-leak.patch - BuildRequires: cmake >= 3.14 make BuildRequires: rust >= 1.51 cargo >= 1.51 BuildRequires: gcc gcc-c++ @@ -54,9 +50,6 @@ make cd build %make_install -mkdir -p %{buildroot}/lib/modules/%{kernel_name}/extra/syscare -mv -f %{buildroot}/usr/libexec/syscare/upatch_hijacker.ko %{buildroot}/lib/modules/%{kernel_name}/extra/syscare - ############### PostInstall ################ %post mkdir -p /usr/lib/syscare/patches @@ -107,8 +100,6 @@ fi %package build Summary: Syscare build tools. BuildRequires: elfutils-libelf-devel -Suggests: %{pkg_build_kmod} -Requires: (%{pkg_build_kmod} >= %{build_version} or %{pkg_build_ebpf} >= %{build_version}) Requires: coreutils Requires: patch Requires: kpatch @@ -165,70 +156,16 @@ fi %attr(755,root,root) /usr/libexec/syscare/c++-hijacker %attr(755,root,root) /usr/libexec/syscare/gcc-hijacker %attr(755,root,root) /usr/libexec/syscare/g++-hijacker - -############################################ -######## Package syscare-build-kmod ######## -############################################ -%package build-kmod -Summary: Kernel module for syscare patch build tools. -BuildRequires: make gcc -BuildRequires: kernel-devel -Requires: kernel >= %{kernel_version} - -############### Description ################ -%description build-kmod -Syscare build dependency - kernel module. - -############### PostInstall ################ -%post build-kmod -echo "/lib/modules/%{kernel_name}/extra/syscare/upatch_hijacker.ko" | /sbin/weak-modules --add-module --no-initramfs -depmod > /dev/null 2>&1 - -############### PreUninstall ############### -%preun build-kmod -# Nothing - -############## PostUninstall ############### -%postun build-kmod -echo "/lib/modules/%{kernel_name}/extra/syscare/upatch_hijacker.ko" | /sbin/weak-modules --remove-module --no-initramfs -depmod > /dev/null 2>&1 - -################## Files ################### -%files build-kmod -%dir /lib/modules/%{kernel_name}/extra/syscare -%attr(640,root,root) /lib/modules/%{kernel_name}/extra/syscare/upatch_hijacker.ko - -############################################ -######## Package syscare-build-ebpf ######## -############################################ -%package build-ebpf -Summary: eBPF for syscare patch build tools. -BuildRequires: make llvm clang bpftool -BuildRequires: libbpf libbpf-devel libbpf-static - -############### Description ################ -%description build-ebpf -Syscare build dependency - eBPF. - -############### PostInstall ################ -%post build-ebpf - -############### PreUninstall ############### -%preun build-ebpf -# Nothing - -############## PostUninstall ############### -%postun build-ebpf -# Nothing - -################## Files ################### -%files build-ebpf -%attr(755,root,root) /usr/libexec/syscare/upatch_hijacker +%attr(755,root,root) /usr/libexec/syscare/gnu-as-hijacker +%attr(755,root,root) /usr/libexec/syscare/gnu-compiler-hijacker +%attr(755,root,root) /usr/libexec/syscare/upatch_hijacker.ko ############################################ ################ Change log ################ ############################################ %changelog +* Thu Mar 28 2024 ningyu - 1.2.1-1 +- update to 1.2.1 * Tue Dec 26 2023 ningyu - 1.2.0-10 - fix memory leak * Fri Dec 22 2023 ningyu - 1.2.0-9