diff --git a/ubturbo-1.0.0.tar.gz b/ubturbo-1.0.0.tar.gz index 50e694ca759c188ba885a23c0a7d5e0be4e0e569..807e0f768f27aefa5d053c2b7942aa6700d15edd 100644 Binary files a/ubturbo-1.0.0.tar.gz and b/ubturbo-1.0.0.tar.gz differ diff --git a/ubturbo.spec b/ubturbo.spec index 3a1ac77ba8a335d609bbd94ee490b603a65c7c6f..967feaa947949b8663981c5ee3bbec5c9b256689 100644 --- a/ubturbo.spec +++ b/ubturbo.spec @@ -1,5 +1,5 @@ %global version 1.0.0 -%global release_version 1 +%global release_version 2 %global __strip /bin/true Name: ubturbo @@ -16,7 +16,7 @@ BuildRequires: kernel-devel >= 5.10.0-136.12.0.86 make >= 4.3 gcc >= 10.3.1 cmak BuildRequires: libboundscheck BuildRequires: make BuildRequires: gcc flex bison elfutils-libelf-devel openssl openssl-devel ncurses-devel dwarves -BuildRequires: cmake coreutils +BuildRequires: cmake coreutils cpio BuildRequires: chrpath BuildRequires: patchelf BuildRequires: libboundscheck @@ -36,7 +36,7 @@ ubturbo %define ucache_dir /lib/modules/ucache %define smap_libsmap_dir /usr/lib64 %define udev_rules_dir %{_sysconfdir}/udev/rules.d -%define kernel_devel_version 6.6.0 +%define kernel_devel_version 6.6.0-126.0.0.102.oe2403sp3.aarch64 #define rmrs %define debug_package %{nil} @@ -72,10 +72,15 @@ pwd tar -zxvf v1.11.0.tar.gz cd %{_builddir} -cd %{_builddir}/ubturbo/plugins/smap/src/drivers && make -j`nproc` -C /lib/modules/6.6.0*/build M=%{_builddir}/ubturbo/plugins/smap/src/drivers modules +wget http://121.36.84.172/dailybuild/EBS-openEuler-24.03-LTS-SP3/rc7_openeuler-2025-12-05-07-07-41/everything/aarch64/Packages/kernel-devel-6.6.0-126.0.0.102.oe2403sp3.aarch64.rpm +rpm2cpio kernel-devel-6.6.0-126.0.0.102.oe2403sp3.aarch64.rpm --force | cpio -div +ls -l + +cd %{_builddir} +cd %{_builddir}/ubturbo/plugins/smap/src/drivers && make -j`nproc` -C %{_builddir}/usr/src/kernels/%{kernel_devel_version} M=%{_builddir}/ubturbo/plugins/smap/src/drivers modules cp %{_builddir}/ubturbo/plugins/smap/src/drivers/Module.symvers %{_builddir}/ubturbo/plugins/smap/src/tiering/depends -cd %{_builddir}/ubturbo/plugins/smap/src/tiering && make -j`nproc` -C /lib/modules/6.6.0*/build M=%{_builddir}/ubturbo/plugins/smap/src/tiering modules -cd %{_builddir}/ubturbo/plugins/smap/src/ucache && make -j`nproc` -C /lib/modules/6.6.0*/build M=%{_builddir}/ubturbo/plugins/smap/src/ucache modules +cd %{_builddir}/ubturbo/plugins/smap/src/tiering && make -j`nproc` -C %{_builddir}/usr/src/kernels/%{kernel_devel_version} M=%{_builddir}/ubturbo/plugins/smap/src/tiering modules +cd %{_builddir}/ubturbo/plugins/smap/src/ucache && make -j`nproc` -C %{_builddir}/usr/src/kernels/%{kernel_devel_version} M=%{_builddir}/ubturbo/plugins/smap/src/ucache modules rm -rf %{_builddir}/ubturbo/plugins/smap/3rdparty/spdlog mv %{_builddir}/spdlog-1.11.0 %{_builddir}/spdlog @@ -124,6 +129,18 @@ ls %{_builddir}/ubturbo/dist/release/bin find ${RPM_BUILD_ROOT}/%{ubturbo_lib_dir} -name "*.so" -exec patchelf --set-rpath '$ORIGIN/../lib' {} \; patchelf --set-rpath '$ORIGIN/../lib' ${RPM_BUILD_ROOT}/%{ubturbo_bin_dir}/ub_turbo_exec +#install devel +mkdir -p -m755 ${RPM_BUILD_ROOT}/%{ubturbo_include_dir} +ls %{_builddir}/ubturbo/include +ls %{_builddir}/ubturbo/src/sdk/include +%{__install} -b -m 0644 %{_builddir}/ubturbo/include/turbo_conf.h ${RPM_BUILD_ROOT}/%{ubturbo_include_dir} +%{__install} -b -m 0644 %{_builddir}/ubturbo/include/turbo_def.h ${RPM_BUILD_ROOT}/%{ubturbo_include_dir} +%{__install} -b -m 0644 %{_builddir}/ubturbo/include/turbo_ipc_client.h ${RPM_BUILD_ROOT}/%{ubturbo_include_dir} +%{__install} -b -m 0644 %{_builddir}/ubturbo/include/turbo_ipc_server.h ${RPM_BUILD_ROOT}/%{ubturbo_include_dir} +%{__install} -b -m 0644 %{_builddir}/ubturbo/include/turbo_logger.h ${RPM_BUILD_ROOT}/%{ubturbo_include_dir} +%{__install} -b -m 0644 %{_builddir}/ubturbo/src/sdk/include/turbo_serialize.h ${RPM_BUILD_ROOT}/%{ubturbo_include_dir} +%{__install} -b -m 0644 %{_builddir}/ubturbo/src/sdk/turbo_rmrs_interface.h ${RPM_BUILD_ROOT}/%{ubturbo_include_dir} + %clean rm -rf ${RPM_BUILD_ROOT} @@ -150,6 +167,16 @@ rm -rf ${RPM_BUILD_ROOT} %{ubturbo_bin_dir}/ub_turbo_exec %{ubturbo_bin_dir}/cat.sh +%files devel +%defattr(-,ubturbo,ubturbo) +%dir %{ubturbo_include_dir} +%{ubturbo_include_dir}/turbo_conf.h +%{ubturbo_include_dir}/turbo_def.h +%{ubturbo_include_dir}/turbo_ipc_client.h +%{ubturbo_include_dir}/turbo_ipc_server.h +%{ubturbo_include_dir}/turbo_logger.h +%{ubturbo_include_dir}/turbo_serialize.h +%{ubturbo_include_dir}/turbo_rmrs_interface.h %pre smap %post smap @@ -797,5 +824,7 @@ fi main "$@" %changelog +* Mon Dec 15 2025 Wang Sheng - 1.0.0-2 +- Update ubturbo.spec, specify kernel-devel's version * Wed Dec 3 2025 Wang Sheng - 1.0.0-1 - Package init \ No newline at end of file