!99 update syscare to 1.2.0-1

From: @renoseven 
Reviewed-by: @snoweay 
Signed-off-by: @snoweay
This commit is contained in:
openeuler-ci-bot 2023-11-22 03:12:40 +00:00 committed by Gitee
commit 693eb0ac0b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 7 additions and 39 deletions

View File

@ -1,9 +1,9 @@
#!/bin/bash -e #!/bin/bash -e
readonly REPO_NAME="syscare" readonly REPO_NAME="syscare"
readonly REPO_PROVIDER="renoseven" readonly REPO_PROVIDER="openeuler"
readonly REPO_URL="https://gitee.com/$REPO_PROVIDER/$REPO_NAME" readonly REPO_URL="https://gitee.com/$REPO_PROVIDER/$REPO_NAME"
readonly REPO_BRANCH="master" readonly REPO_BRANCH="openEuler-22.03"
echo "Cloning source code..." echo "Cloning source code..."
repo_version=$(grep "Version" "$REPO_NAME.spec" | head -n 1 | awk -F ' ' '{print $NF}') repo_version=$(grep "Version" "$REPO_NAME.spec" | head -n 1 | awk -F ' ' '{print $NF}')

View File

@ -12,8 +12,8 @@
############ Package syscare ############### ############ Package syscare ###############
############################################ ############################################
Name: syscare Name: syscare
Version: 1.1.0 Version: 1.2.0
Release: 6 Release: 1
Summary: System hot-fix service Summary: System hot-fix service
License: MulanPSL-2.0 and GPL-2.0-only License: MulanPSL-2.0 and GPL-2.0-only
URL: https://gitee.com/openeuler/syscare URL: https://gitee.com/openeuler/syscare
@ -21,7 +21,6 @@ Source0: %{name}-%{version}.tar.gz
BuildRequires: cmake >= 3.14 make BuildRequires: cmake >= 3.14 make
BuildRequires: rust >= 1.51 cargo >= 1.51 BuildRequires: rust >= 1.51 cargo >= 1.51
BuildRequires: gcc gcc-c++ BuildRequires: gcc gcc-c++
Requires: %{pkg_kmod} >= %{build_version}
Requires: coreutils systemd Requires: coreutils systemd
Requires: kpatch-runtime Requires: kpatch-runtime
@ -53,7 +52,6 @@ cd build
%make_install %make_install
mkdir -p %{buildroot}/lib/modules/%{kernel_name}/extra/syscare mkdir -p %{buildroot}/lib/modules/%{kernel_name}/extra/syscare
mv -f %{buildroot}/usr/libexec/syscare/upatch.ko %{buildroot}/lib/modules/%{kernel_name}/extra/syscare
mv -f %{buildroot}/usr/libexec/syscare/upatch_hijacker.ko %{buildroot}/lib/modules/%{kernel_name}/extra/syscare mv -f %{buildroot}/usr/libexec/syscare/upatch_hijacker.ko %{buildroot}/lib/modules/%{kernel_name}/extra/syscare
############### PostInstall ################ ############### PostInstall ################
@ -87,39 +85,7 @@ fi
%attr(644,root,root) /usr/lib/systemd/system/syscare.service %attr(644,root,root) /usr/lib/systemd/system/syscare.service
%attr(755,root,root) /usr/bin/syscared %attr(755,root,root) /usr/bin/syscared
%attr(755,root,root) /usr/bin/syscare %attr(755,root,root) /usr/bin/syscare
%attr(755,root,root) /usr/libexec/syscare/upatch-tool %attr(755,root,root) /usr/libexec/syscare/upatch-manage
############################################
########## Package syscare-kmod ############
############################################
%package kmod
Summary: Syscare kernel module.
BuildRequires: make gcc
BuildRequires: kernel-devel
Requires: kernel >= %{kernel_version}
############### Description ################
%description kmod
Syscare dependency - kernel module.
############### PostInstall ################
%post kmod
echo "/lib/modules/%{kernel_name}/extra/syscare/upatch.ko" | /sbin/weak-modules --add-module --no-initramfs
depmod
############### PreUninstall ###############
%preun kmod
# Nothing
############## PostUninstall ###############
%postun kmod
echo "/lib/modules/%{kernel_name}/extra/syscare/upatch.ko" | /sbin/weak-modules --remove-module --no-initramfs
depmod
################## Files ###################
%files kmod
%dir /lib/modules/%{kernel_name}/extra/syscare
%attr(640,root,root) /lib/modules/%{kernel_name}/extra/syscare/upatch.ko
############################################ ############################################
########## Package syscare-build ########### ########## Package syscare-build ###########
@ -241,6 +207,8 @@ Syscare build dependency - eBPF.
################ Change log ################ ################ Change log ################
############################################ ############################################
%changelog %changelog
* Wed Nov 22 2023 renoseven<dev@renoseven.net> - 1.2.0-1
- Fix various issue
* Wed Oct 11 2023 renoseven<dev@renoseven.net> - 1.1.0-6 * Wed Oct 11 2023 renoseven<dev@renoseven.net> - 1.1.0-6
- Support build patch for kernel moudules - Support build patch for kernel moudules
- Fix various issue - Fix various issue