From 5240bf773d264d3e8885bdcf857500e653b7d761 Mon Sep 17 00:00:00 2001 From: Tie Liu Date: Tue, 11 Jul 2023 15:47:03 +0800 Subject: [PATCH] change subpackage name --- native-turbo.spec | 72 +++++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 49 deletions(-) diff --git a/native-turbo.spec b/native-turbo.spec index ae8de3c..d97fbe4 100644 --- a/native-turbo.spec +++ b/native-turbo.spec @@ -1,7 +1,7 @@ #needsrootforbuild %global __cargo_skip_build 0 %global __cargo_common_opts %{?__cargo_common_opts} --all -Name: sysboost +Name: native-turbo Version: 1.0.0 Release: 4 Summary: Numa Aware Scheduling @@ -13,20 +13,18 @@ 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: ncurses-devel -BuildRequires: rust rust-packaging cargo -BuildRequires: kernel-devel %description sysboost can merge ELF files to improve performance. # Add devel subpackage -%package devel +%package tools Summary: Development files for %{name} Requires: %{name} = %{version}-%{release} BuildRequires: binutils -%description devel -The %{name}-devel package contains some tools of sysboost. +%description tools +The %{name}-tools package contains some tools of sysboost. %prep export RPM_BUILD_DIR=%_topdir/BUILD @@ -35,23 +33,8 @@ export RPM_BUILD_SOURCE=%_topdir/SOURCES tar -Jxf $RPM_BUILD_SOURCE/%{name}.tar.xz cp $RPM_BUILD_SOURCE/objreloc.sh $RPM_BUILD_DIR/objreloc -cp $RPM_BUILD_DIR/native-turbo/sysboost/Cargo.toml $RPM_BUILD_DIR/ - -%cargo_prep - -%cargo_generate_buildrequires %build -cd $RPM_BUILD_DIR/native-turbo/sysboost/src/binfmt_rto -%ifarch aarch64 -make %{?_smp_mflags} ARCH=arm64 KDIR=/lib/modules/`uname -r`/build -%else -make %{?_smp_mflags} ARCH=x86_64 KDIR=/lib/modules/`uname -r`/build -%endif - -cd $RPM_BUILD_DIR/native-turbo/sysboost -%cargo_build -a - cd $RPM_BUILD_DIR/native-turbo make release make @@ -59,45 +42,32 @@ make %install mkdir -p $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{_libdir} -mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system -mkdir -p $RPM_BUILD_ROOT/lib/modules/sysboost - -install -m 440 $RPM_BUILD_DIR/native-turbo/sysboost/src/binfmt_rto/binfmt_rto.ko $RPM_BUILD_DIR/lib/modules/sysboost +mkdir -p $RPM_BUILD_ROOT/usr/include/ 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 755 ./lib/libsi_array.a $RPM_BUILD_ROOT/%{_libdir}/libsi_array.a -install -D -p -m 755 ./lib/libsi_hashmap.a $RPM_BUILD_ROOT/%{_libdir}/libsi_hashmap.a -install -D -p -m 755 ./lib/libsi_ring.a $RPM_BUILD_ROOT/%{_libdir}/libsi_ring.a -install -D -p -m 755 ./lib/libsi_sys.a $RPM_BUILD_ROOT/%{_libdir}/libsi_sys.a +install -D -p -m 644 ./lib/libsi_array.a $RPM_BUILD_ROOT/%{_libdir}/libsi_array.a +install -D -p -m 644 ./lib/libsi_hashmap.a $RPM_BUILD_ROOT/%{_libdir}/libsi_hashmap.a +install -D -p -m 644 ./lib/libsi_ring.a $RPM_BUILD_ROOT/%{_libdir}/libsi_ring.a +install -D -p -m 644 ./lib/libsi_sys.a $RPM_BUILD_ROOT/%{_libdir}/libsi_sys.a 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}/ +pushd native-turbo +install -D -p -m 644 ./lib/sys/include/* $RPM_BUILD_ROOT/usr/include/ +install -D -p -m 644 ./lib/hashmap/si_hashmap.h $RPM_BUILD_ROOT/usr/include/si_hashmap.h +install -D -p -m 644 ./lib/array/si_array.h $RPM_BUILD_ROOT/usr/include/si_array.h +install -D -p -m 644 ./lib/ring/si_ring_core.h $RPM_BUILD_ROOT/usr/include/si_ring_core.h +install -D -p -m 644 ./lib/ring/si_ring.h $RPM_BUILD_ROOT/usr/include/si_ring.h popd install -m 755 $RPM_BUILD_DIR/objreloc $RPM_BUILD_ROOT%{_bindir}/ -mkdir -p %{buildroot}/etc/sysboost.d/ -mkdir -p %{buildroot}/var/lib/sysboost/ - %check %files -%defattr(-,root,root,-) -%dir /etc/sysboost.d/ -%dir /var/lib/sysboost/ -%{_bindir}/sysboost -%{_bindir}/sysboost_static_template -%{_bindir}/libhook.so -%{_bindir}/sysboostd -/usr/lib/systemd/system/%{name}.service -%attr(0440,root,root) /lib/modules/sysboost/* +%{_libdir}/* +/usr/include/* -%files devel +%files tools %defattr(0755,root,root) %{_bindir}/objreloc @@ -117,7 +87,7 @@ mkdir -p %{buildroot}/var/lib/sysboost/ - Type:enhancement - ID:NA - SUG:NA -- DESC: create static libs +- DESC: create static libs and change devel subpackage name * Tue May 16 2023 liutie - 1.0.0-3 - Type:enhancement @@ -138,3 +108,7 @@ mkdir -p %{buildroot}/var/lib/sysboost/ - DESC: Independently generate the objreloc tool * Thu Apr 6 2023 liutie - 1.0.0-0 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: init \ No newline at end of file