From c4b8703dc05cca38c457f0245f7c66a0a581c456 Mon Sep 17 00:00:00 2001 From: Zhou Kang Date: Wed, 7 Jun 2023 11:25:25 +0000 Subject: [PATCH] fix path of relocation --- native-turbo.spec | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/native-turbo.spec b/native-turbo.spec index 77c4dbc..0cfbe95 100644 --- a/native-turbo.spec +++ b/native-turbo.spec @@ -3,7 +3,7 @@ %global __cargo_common_opts %{?__cargo_common_opts} --all Name: sysboost Version: 1.0.0 -Release: 4 +Release: 5 Summary: Numa Aware Scheduling License: Mulan PSL v2 URL: https://gitee.com/openeuler/native-turbo @@ -12,6 +12,7 @@ Source0: %{name}.tar.xz BuildRequires: meson >= 0.49.2, clang >= 12.0.1 BuildRequires: make >= 4.0, bison >= 2.7, binutils >= 2.30-17, gcc >= 10.3.1 +BuildRequires: xz BuildRequires: ncurses-devel BuildRequires: rust rust-packaging cargo BuildRequires: kernel-devel @@ -25,6 +26,7 @@ sysboost can merge ELF files to improve performance. %package devel Summary: Development files for %{name} Requires: %{name} = %{version}-%{release} +Requires: xz BuildRequires: binutils %description devel @@ -63,23 +65,27 @@ make mkdir -p $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system mkdir -p $RPM_BUILD_ROOT/lib/modules/sysboost +mkdir -p $RPM_BUILD_ROOT/usr/lib/relocation install -m 440 $RPM_BUILD_DIR/native-turbo/sysboost/src/binfmt_rto/binfmt_rto.ko $RPM_BUILD_ROOT/lib/modules/sysboost/ pushd native-turbo/build -install -D -p -m 750 ./sysboost/sysboost $RPM_BUILD_ROOT/%{_bindir}/sysboost -install -D -p -m 750 ./sysboost/src/static_template/sysboost_static_template $RPM_BUILD_ROOT/%{_bindir}/sysboost_static_template -install -D -p -m 750 ./sysboost/src/libhook/libhook.so $RPM_BUILD_ROOT/%{_bindir}/libhook.so +install -D -p -m 500 ./sysboost/sysboost $RPM_BUILD_ROOT/%{_bindir}/sysboost +xz ./sysboost/src/static_template/sysboost_static_template +install -D -p -m 400 ./sysboost/src/static_template/sysboost_static_template.xz $RPM_BUILD_ROOT/usr/lib/relocation/sysboost_static_template.relocation +xz ./sysboost/src/libhook/libhook.so +install -D -p -m 400 ./sysboost/src/libhook/libhook.so.xz $RPM_BUILD_ROOT/usr/lib/relocation/libhook.so.relocation popd pushd native-turbo/sysboost -install -D -p -m 640 %{name}.service $RPM_BUILD_ROOT/usr/lib/systemd/system/%{name}.service -install -D -p -m 750 ./target/release/sysboostd $RPM_BUILD_ROOT%{_bindir}/ +install -D -p -m 440 %{name}.service $RPM_BUILD_ROOT/usr/lib/systemd/system/%{name}.service +install -D -p -m 500 ./target/release/sysboostd $RPM_BUILD_ROOT%{_bindir}/ popd install -m 755 $RPM_BUILD_DIR/objreloc $RPM_BUILD_ROOT%{_bindir}/ mkdir -p %{buildroot}/etc/sysboost.d/ +# for DB mkdir -p %{buildroot}/var/lib/sysboost/ %check @@ -89,11 +95,11 @@ mkdir -p %{buildroot}/var/lib/sysboost/ %dir /etc/sysboost.d/ %dir /var/lib/sysboost/ %{_bindir}/sysboost -%{_bindir}/sysboost_static_template -%{_bindir}/libhook.so %{_bindir}/sysboostd +/usr/lib/relocation/sysboost_static_template.relocation +/usr/lib/relocation/libhook.so.relocation /usr/lib/systemd/system/%{name}.service -%attr(0440,root,root) /lib/modules/sysboost/* +%attr(0400,root,root) /lib/modules/sysboost/* %files devel %defattr(0755,root,root) @@ -111,6 +117,12 @@ mkdir -p %{buildroot}/var/lib/sysboost/ %systemd_postun_with_restart %{name}.service %changelog +* Wed Jun 7 2023 Zhou Kang - 1.0.0-5 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: fix path of relocation + * Fri May 19 2023 liutie - 1.0.0-4 - Type:enhancement - ID:NA