diff --git a/sysboost.spec b/sysboost.spec index bf23aa7bbcbe50ded97ea531a37182e5f35e3493..29f8d41b704144cb2af2025ead89313903a1dffe 100644 --- a/sysboost.spec +++ b/sysboost.spec @@ -3,7 +3,7 @@ %global __cargo_common_opts %{?__cargo_common_opts} --all Name: sysboost Version: 1.0.0 -Release: 1 +Release: 2 Summary: Sysboost Rpm Build License: Mulan PSL v2 URL: https://gitee.com/openeuler/sysboost @@ -36,19 +36,23 @@ export RPM_BUILD_SOURCE=%_topdir/SOURCES tar xf $RPM_BUILD_SOURCE/%{name}.tar.xz %build -## build binfmt.ko +# build sysboost_loader.ko namer=%{kern_devel_ver} -#pushd $RPM_BUILD_DIR/%{name}/src/binfmt_rto -#%ifarch aarch64 -# make %{?_smp_mflags} ARCH=arm64 KDIR=/lib/modules/${namer}/build -#%else -#make %{?_smp_mflags} ARCH=x86_64 KDIR=/lib/modules/${namer}/build -#%endif -#popd - -# build sysboostd and sysboost -pushd $RPM_BUILD_DIR/%{name} +pushd $RPM_BUILD_DIR/%{name}/src/sysboost_loader +%ifarch aarch64 +make %{?_smp_mflags} ARCH=arm64 KDIR=/lib/modules/${namer}/build +%else +# make %{?_smp_mflags} ARCH=x86_64 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 @@ -61,43 +65,62 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysboost.d/ mkdir -p $RPM_BUILD_ROOT/var/lib/sysboost/ mkdir -p $RPM_BUILD_ROOT/usr/lib/sysboost.d/profile/ mkdir -p $RPM_BUILD_ROOT/usr/bin +mkdir -p $RPM_BUILD_ROOT/usr/lib/relocation # install binfmt.ko -#pushd $RPM_BUILD_DIR/%{name} -#install -m 400 ./src/binfmt_rto/binfmt_rto.ko $RPM_BUILD_ROOT/lib/modules/sysboost/ -#popd +%ifarch aarch64 +pushd $RPM_BUILD_DIR/%{name} +install -m 400 ./src/sysboost_loader/sysboost_loader.ko $RPM_BUILD_ROOT/lib/modules/sysboost/ +popd +%endif pushd $RPM_BUILD_DIR/%{name} -install -D -p -m 400 %{name}.service $RPM_BUILD_ROOT/usr/lib/systemd/system/%{name}.service -install -D -p -m 500 %{name}d_exec_stop.sh $RPM_BUILD_ROOT/etc/systemd/system/%{name}d_exec_stop.sh -install -D -p -m 500 ./target/release/sysboostd $RPM_BUILD_ROOT%{_bindir}/ -#install -D -p -m 400 ./profile/* $RPM_BUILD_ROOT/usr/lib/sysboost.d/profile/ +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}/ +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 +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 +popd + %check %files %defattr(400,root,root,-) %dir %attr(700, root, root) /etc/sysboost.d/ %dir %attr(700, root, root) /var/lib/sysboost/ -#%dir %attr(500, root, root) /lib/modules/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/sysboost +%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 -#%attr(0400,root,root) /lib/modules/sysboost/* +%ifarch aarch64 +%attr(0400,root,root) /lib/modules/sysboost/* +%endif +%attr(500, root, root) /usr/lib/relocation/sysboost_static_template.relocation %files profile -#%dir %attr(500, root, root) /usr/lib/sysboost.d/profile/ -#%attr(0400,root,root) /usr/lib/sysboost.d/profile/* +%dir %attr(500, root, root) /usr/lib/sysboost.d/profile/ +%attr(0400,root,root) /usr/lib/sysboost.d/profile/* %doc %changelog +* Tue Oct 17 2023 Liu Yuntao - 1.0.0-2 +- DESC: 1. sync from openeuler-23.09 +- 2. update pathes corresponding to code refactor + * Thu Aug 24 2023 liutie - 1.0.0-1 - ID:NA - SUG:NA