diff --git a/.native-turbo.spec.un~ b/.native-turbo.spec.un~ deleted file mode 100644 index 2ebd69f..0000000 Binary files a/.native-turbo.spec.un~ and /dev/null differ diff --git a/native-turbo.spec b/native-turbo.spec index dea6524..a00ff26 100644 --- a/native-turbo.spec +++ b/native-turbo.spec @@ -16,7 +16,16 @@ BuildRequires: ncurses-devel %description sysboost can merge ELF files to improve performance. -%prep +# 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 mkdir -p pkg @@ -31,33 +40,41 @@ 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 + cd $RPM_BUILD_DIR/ %build cd native-turbo -make init -make all +make release +make %install cd native-turbo/build mkdir -p $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system install -D -p -m 750 ./sysboost/sysboost $RPM_BUILD_ROOT/%{_bindir}/sysboost -install -D -p -m 750 ./sysboost/src/static_template/static_template $RPM_BUILD_ROOT/%{_bindir}/static_template +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 %files %doc %{_bindir}/sysboost -%{_bindir}/static_template +%{_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 @@ -68,5 +85,4 @@ install -D -p -m 640 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name} %systemd_postun_with_restart %{name}.service %changelog -* Thu Apr 6 2023 liutie - 1.0.0-0 -- Package init +* Thu Apr 6 2023 liutie - 1.0.0-0 \ No newline at end of file diff --git a/native-turbo.spec~ b/native-turbo.spec~ deleted file mode 100644 index 67bf72d..0000000 --- a/native-turbo.spec~ +++ /dev/null @@ -1,72 +0,0 @@ -Name: sysboost -Version: 1 -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 -BuildRequires: ncurses-devel - -%description -sysboost can merge ELF files to improve performance. - -%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/%{name}.tar.xz - -cp $RPM_BUILD_SOURCE/%{name}.service $RPM_BUILD_DIR/ -cp $RPM_BUILD_SOURCE/%{name}.sysconfig $RPM_BUILD_DIR/ - -cd $RPM_BUILD_DIR/ - -%build -cd native-turbo -make init -make all - -%install -cd native-turbo/build -mkdir -p $RPM_BUILD_ROOT/%{_bindir} -mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system -install -D -p -m 750 ./sysboost/sysboost $RPM_BUILD_ROOT/%{_bindir}/sysboost -install -D -p -m 750 ./sysboost/src/static_template/static_template $RPM_BUILD_ROOT/%{_bindir}/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} - -%check - -%files -%doc -%{_bindir}/sysboost -%{_bindir}/static_template -%{_bindir}/libhook.so -/usr/lib/systemd/system/%{name}.service -%config(noreplace) /etc/sysconfig/%{name} - -%post -%systemd_post %{name}.service - -%preun -%systemd_preun %{name}.service - -%postun -%systemd_postun_with_restart %{name}.service - -%changelog -* Thu Apr 6 2023 liutie - 1.0.0 -- Package init diff --git a/sysboost.service b/sysboost.service index 1cd2235..801feba 100644 --- a/sysboost.service +++ b/sysboost.service @@ -5,9 +5,7 @@ After=sysboost.service [Service] Type=oneshot -ExecStartPre=/bin/bash -c 'grep -q "kunpeng" /proc/cpuinfo' -ExecStart=/usr/bin/sysboost -static /usr/bin/static_template /usr/bin/bash/bash /usr/bin/bash/libtinfo.so --output-file /usr/local/bin/sysboost-bash -#ExecStartPost=/bin/mv /usr/local/bin/sysboost-bash /bin/bash +ExecStart=/usr/bin/sysboost -daemon [Install] -WantedBy=multi-user.target \ No newline at end of file +WantedBy=multi-user.target diff --git a/sysboost.tar.xz b/sysboost.tar.xz index 83c2993..ef861c3 100644 Binary files a/sysboost.tar.xz and b/sysboost.tar.xz differ