From 112ac2397d3b76113a20a667d35c0df16eb38ce4 Mon Sep 17 00:00:00 2001 From: Tie Liu Date: Mon, 8 May 2023 10:39:35 +0800 Subject: [PATCH] Independently generate the objreloc tool. --- native-turbo.spec | 27 ++++++----------------- objreloc.spec | 54 ++++++++++++++++++++++++++++++++++++++++++++++ sysboost.service | 4 ++-- sysboost.sysconfig | 0 4 files changed, 63 insertions(+), 22 deletions(-) create mode 100644 objreloc.spec delete mode 100644 sysboost.sysconfig diff --git a/native-turbo.spec b/native-turbo.spec index a00ff26..e79b0fa 100644 --- a/native-turbo.spec +++ b/native-turbo.spec @@ -1,13 +1,12 @@ Name: sysboost Version: 1.0.0 -Release: 0 +Release: 1 Summary: Numa Aware Scheduling License: Mulan PSL v2 URL: https://gitee.com/openeuler/native-turbo Source0: %{name}.tar.xz Source1: sysboost.service -Source2: sysboost.sysconfig BuildRequires: meson >= 0.49.2, clang >= 12.0.1 BuildRequires: make >= 4.0, bison >= 2.7, binutils >= 2.30-17, gcc >= 10.3.1 @@ -16,15 +15,6 @@ BuildRequires: ncurses-devel %description sysboost can merge ELF files to improve performance. -# Add devel subpackage -%package devel -Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} -BuildRequires: binutils - -%description devel -The %{name}-devel package contains some tools of sysboost. - %prep rm -rf src mkdir -p bin @@ -38,7 +28,6 @@ export SYSBOOST_DIR=$RPM_BUILD_DIR/src/gitee.com/%{name} tar -Jxf $RPM_BUILD_SOURCE/%{name}.tar.xz cp $RPM_BUILD_SOURCE/%{name}.service $RPM_BUILD_DIR/ -cp $RPM_BUILD_SOURCE/%{name}.sysconfig $RPM_BUILD_DIR/ mv $RPM_BUILD_DIR/native-turbo/sysboost/src/objreloc/objreloc.sh $RPM_BUILD_DIR/native-turbo/sysboost/src/objreloc/objreloc @@ -57,9 +46,6 @@ 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 640 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/systemd/system/%{name}.service -install -D -p -m 640 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name} - -install -m 755 $RPM_BUILD_DIR/native-turbo/sysboost/src/objreloc/objreloc $RPM_BUILD_ROOT%{_bindir}/ %check @@ -69,11 +55,6 @@ install -m 755 $RPM_BUILD_DIR/native-turbo/sysboost/src/objreloc/objreloc $RPM_B %{_bindir}/sysboost_static_template %{_bindir}/libhook.so /usr/lib/systemd/system/%{name}.service -%config(noreplace) /etc/sysconfig/%{name} - -%files devel -%defattr(0755,root,root) -%{_bindir}/objreloc %post %systemd_post %{name}.service @@ -85,4 +66,10 @@ install -m 755 $RPM_BUILD_DIR/native-turbo/sysboost/src/objreloc/objreloc $RPM_B %systemd_postun_with_restart %{name}.service %changelog +* Mon May 8 2023 liutie - 1.0.0-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: Independently generate the objreloc tool + * Thu Apr 6 2023 liutie - 1.0.0-0 \ No newline at end of file diff --git a/objreloc.spec b/objreloc.spec new file mode 100644 index 0000000..c692cbd --- /dev/null +++ b/objreloc.spec @@ -0,0 +1,54 @@ +Name: objreloc +Version: 1.0.0 +Release: 0 +Summary: Numa Aware Scheduling +License: Mulan PSL v2 +URL: https://gitee.com/openeuler/native-turbo + +Source0: sysboost.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: ncurses-devel + +%description +The package contains objreloc for relocations. + +%prep +rm -rf src +mkdir -p bin +mkdir -p pkg +mkdir -p src/gitee.com + +export RPM_BUILD_DIR=%_topdir/BUILD +export RPM_BUILD_SOURCE=%_topdir/SOURCES +export SYSBOOST_DIR=$RPM_BUILD_DIR/src/gitee.com/%{name} + +tar -Jxf $RPM_BUILD_SOURCE/sysboost.tar.xz + +mv $RPM_BUILD_DIR/native-turbo/sysboost/src/objreloc/objreloc.sh $RPM_BUILD_DIR/native-turbo/sysboost/src/objreloc/objreloc + +cd $RPM_BUILD_DIR/ + +%build + +%install +mkdir -p $RPM_BUILD_ROOT/%{_bindir} + +install -m 755 $RPM_BUILD_DIR/native-turbo/sysboost/src/objreloc/objreloc $RPM_BUILD_ROOT%{_bindir}/ + +%check + +%files +%defattr(0755,root,root) +%{_bindir}/objreloc +%doc + +%post + +%changelog +* Mon May 8 2023 liutie - 1.0.0-0 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: Independently generate the objreloc tool \ No newline at end of file diff --git a/sysboost.service b/sysboost.service index 801feba..854a684 100644 --- a/sysboost.service +++ b/sysboost.service @@ -5,7 +5,7 @@ After=sysboost.service [Service] Type=oneshot -ExecStart=/usr/bin/sysboost -daemon +ExecStart=/usr/bin/sysboostd [Install] -WantedBy=multi-user.target +WantedBy=multi-user.target \ No newline at end of file diff --git a/sysboost.sysconfig b/sysboost.sysconfig deleted file mode 100644 index e69de29..0000000