diff --git a/generate_package.sh b/generate_package.sh index cd19e1a468685a3dd877d5ce7c1f788733dbc688..b9b3c407a8a486c31e502825b1b6969a1a32d64d 100755 --- a/generate_package.sh +++ b/generate_package.sh @@ -1,9 +1,9 @@ #!/bin/bash -e readonly REPO_NAME="syscare" -readonly REPO_PROVIDER="renoseven" +readonly REPO_PROVIDER="openeuler" readonly REPO_URL="https://gitee.com/$REPO_PROVIDER/$REPO_NAME" -readonly REPO_BRANCH="master" +readonly REPO_BRANCH="openEuler-22.03" echo "Cloning source code..." repo_version=$(grep "Version" "$REPO_NAME.spec" | head -n 1 | awk -F ' ' '{print $NF}') diff --git a/syscare-1.1.0.tar.gz b/syscare-1.2.0.tar.gz similarity index 72% rename from syscare-1.1.0.tar.gz rename to syscare-1.2.0.tar.gz index dd9f047e341eb9bae3b866aaafe07bc6797bc8f5..b9bae513182743546b47ec55c69ea2429bec54e3 100644 Binary files a/syscare-1.1.0.tar.gz and b/syscare-1.2.0.tar.gz differ diff --git a/syscare.spec b/syscare.spec index cb1e51b99666848144969931b51e442d00157b2a..be4ad1c7bd085cc7167f1019ba81a9cb0ab458be 100644 --- a/syscare.spec +++ b/syscare.spec @@ -12,8 +12,8 @@ ############ Package syscare ############### ############################################ Name: syscare -Version: 1.1.0 -Release: 6 +Version: 1.2.0 +Release: 1 Summary: System hot-fix service License: MulanPSL-2.0 and GPL-2.0-only URL: https://gitee.com/openeuler/syscare @@ -21,7 +21,6 @@ Source0: %{name}-%{version}.tar.gz BuildRequires: cmake >= 3.14 make BuildRequires: rust >= 1.51 cargo >= 1.51 BuildRequires: gcc gcc-c++ -Requires: %{pkg_kmod} >= %{build_version} Requires: coreutils systemd Requires: kpatch-runtime @@ -53,7 +52,6 @@ cd build %make_install 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 ############### PostInstall ################ @@ -87,39 +85,7 @@ fi %attr(644,root,root) /usr/lib/systemd/system/syscare.service %attr(755,root,root) /usr/bin/syscared %attr(755,root,root) /usr/bin/syscare -%attr(755,root,root) /usr/libexec/syscare/upatch-tool - -############################################ -########## 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 +%attr(755,root,root) /usr/libexec/syscare/upatch-manage ############################################ ########## Package syscare-build ########### @@ -241,6 +207,8 @@ Syscare build dependency - eBPF. ################ Change log ################ ############################################ %changelog +* Wed Nov 22 2023 renoseven - 1.2.0-1 +- Fix various issue * Wed Oct 11 2023 renoseven - 1.1.0-6 - Support build patch for kernel moudules - Fix various issue