Init 22.03-LTS-SP4

sysboost.spec

@@ -2,8 +2,8 @@
 %global __cargo_skip_build 0
 %global __cargo_common_opts %{?__cargo_common_opts} --all
 Name:           sysboost
-Version:        1.0.0
+Version:        1.0.5
-Release:        2
+Release:        1
 Summary:        Sysboost Rpm Build
 License:        Mulan PSL v2
 URL:            https://gitee.com/openeuler/sysboost
@@ -33,12 +33,15 @@ Indicates the preset profile for the bolt..
 export RPM_BUILD_DIR=%_topdir/BUILD
 export RPM_BUILD_SOURCE=%_topdir/SOURCES
 
+rm -rf $RPM_BUILD_SOURCE/%{name}
+rm -rf $RPM_BUILD_ROOT/
+rm -rf $RPM_BUILD_DIR/%{name}
 tar xf $RPM_BUILD_SOURCE/%{name}.tar.xz
 
 %build
-# build sysboost_loader.ko
+# build all
 namer=%{kern_devel_ver}
-pushd $RPM_BUILD_DIR/%{name}/src/sysboost_loader
+pushd $RPM_BUILD_DIR/%{name}
 %ifarch aarch64
 make %{?_smp_mflags} ARCH=arm64 KDIR=/lib/modules/${namer}/build
 %else
@@ -46,17 +49,6 @@ make %{?_smp_mflags} ARCH=arm64 KDIR=/lib/modules/${namer}/build
 %endif
 popd
 
-# build sysboostd
-pushd $RPM_BUILD_DIR/%{name}/src/sysboostd
-%cargo_build -a
-popd
-
-# build elfmerge
-pushd $RPM_BUILD_DIR/%{name}
-%meson
-%meson_build
-popd
-
 %install
 # prep install path
 mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system
@@ -77,14 +69,14 @@ popd
 pushd $RPM_BUILD_DIR/%{name}
 install -D -p ./src/sysboost.service/%{name}.service $RPM_BUILD_ROOT/usr/lib/systemd/system/%{name}.service
 install -D -p ./src/sysboost.service/%{name}d_exec_stop.sh $RPM_BUILD_ROOT/etc/systemd/system/%{name}d_exec_stop.sh
-install -D -p ./src/sysboostd/target/release/sysboostd $RPM_BUILD_ROOT%{_bindir}/
+install -D -p ./src/sysboostd/target/debug/sysboostd $RPM_BUILD_ROOT%{_bindir}/
+install -D -p ./build/src/elfmerge/elfmerge $RPM_BUILD_ROOT%{_bindir}/
 xz -dk ./profile/*.xz
 install -D -p ./profile/* $RPM_BUILD_ROOT/usr/lib/sysboost.d/profile/
-%meson_install
 popd
 
 # install sysboost_static_template
-pushd $RPM_BUILD_ROOT/usr/bin
+pushd $RPM_BUILD_DIR/%{name}/build/src/static_template/
 xz ./sysboost_static_template
 mv -f ./sysboost_static_template.xz ./sysboost_static_template.relocation
 install -D -p ./sysboost_static_template.relocation $RPM_BUILD_ROOT/usr/lib/relocation
@@ -98,11 +90,8 @@ popd
 %dir %attr(700, root, root) /var/lib/sysboost/
 %dir %attr(500, root, root) /lib/modules/sysboost/
 %dir %attr(500, root, root) /usr/lib/relocation
-%{_bindir}/*
-%{_libdir}/*
 %attr(500, root, root) /usr/bin/elfmerge
 %attr(500, root, root) /usr/bin/sysboostd
-%attr(600, root, root) /etc/sysboost.d
 /usr/lib/systemd/system/%{name}.service
 /etc/systemd/system/%{name}d_exec_stop.sh
 %ifarch aarch64
@@ -117,6 +106,9 @@ popd
 %doc
 
 %changelog
+* Wed Dec 11 2024 chenhaixiang <chenhaixiang3@huawei.com> - 1.0.5-1
+- Desc: init 22.03-LTS-SP4
+
 * Tue Oct 17 2023 Liu Yuntao <liuyuntao10@huawei.com> - 1.0.0-2
 - DESC: 1. sync from openeuler-23.09
 -       2. update pathes corresponding to code refactor