diff --git a/0001-Add-Zhaoxin-support-to-enable-tsc_reliable-and-arch_random-features.patch b/0001-Add-Zhaoxin-support-to-enable-tsc_reliable-and-arch_random-features.patch deleted file mode 100644 index 3e20db217c983936e6b222c17048dd94752bd267..0000000000000000000000000000000000000000 --- a/0001-Add-Zhaoxin-support-to-enable-tsc_reliable-and-arch_random-features.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c348db31ccce60f2808dd84c1f43f36a1556141a Mon Sep 17 00:00:00 2001 -From: Runa Guo-oc -Date: Fri, 22 Aug 2025 11:15:57 +0800 -Subject: [PATCH] Add Zhaoxin support to enable tsc_reliable and arch_random features - -Signed-off-by: Runa Guo-oc -Link: https://lore.kernel.org/r/20250522104032.17519-1-RunaGuo-oc@zhaoxin.com -Signed-off-by: Jens Axboe ---- - arch/arch-x86-common.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/arch/arch-x86-common.h b/arch/arch-x86-common.h -index f32835c..ac26126 100644 ---- a/arch/arch-x86-common.h -+++ b/arch/arch-x86-common.h -@@ -68,7 +68,8 @@ static inline void arch_init(char *envp[]) - (unsigned int *) &str[4]); - - str[12] = '\0'; -- if (!strcmp(str, "GenuineIntel")) -+ if (!strcmp(str, "GenuineIntel") || !strcmp(str, " Shanghai ") || -+ !strcmp(str, "CentaurHauls")) - arch_init_intel(); - else if (!strcmp(str, "AuthenticAMD") || !strcmp(str, "HygonGenuine")) - arch_init_amd(); --- -2.43.0 - diff --git a/fio-3.40.tar.bz2 b/fio-3.41.tar.bz2 similarity index 32% rename from fio-3.40.tar.bz2 rename to fio-3.41.tar.bz2 index 429bbbb284450a08fe98a6c0d91bfc32e4d42257..f1c7ee1c22d20cde31402b207ac3916434502337 100644 --- a/fio-3.40.tar.bz2 +++ b/fio-3.41.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc1b5c8ef9efa20d44fe90b59515fddf8b4e884d782a0b33b26a70ab48ec04c1 -size 7557078 +oid sha256:ba95867d541a680b0e743b1ecb385e0874a88e422566a1a27eb15f1edf703a30 +size 7572544 diff --git a/fio.spec b/fio.spec index 5f1cc55ccfaf7c9b924cb2cb1dde413bb8f130e1..3bb85ab86b1137218878dd7c26d3eaf79825f209 100644 --- a/fio.spec +++ b/fio.spec @@ -1,5 +1,5 @@ Name: fio -Version: 3.40 +Version: 3.41 Release: 1 Summary: Multithreaded IO generation tool @@ -7,8 +7,6 @@ License: GPL-2.0-only URL: http://git.kernel.dk/?p=fio.git;a=summary Source0: http://brick.kernel.dk/snaps/%{name}-%{version}.tar.bz2 -Patch0001: 0001-Add-Zhaoxin-support-to-enable-tsc_reliable-and-arch_random-features.patch - BuildRequires: gcc BuildRequires: libaio-devel BuildRequires: zlib-devel @@ -56,7 +54,7 @@ sed -e 's,/usr/local/lib/,%{_libdir}/,g' -i os/os-linux.h %build ./configure --disable-optimizations --dynamic-libengines -EXTFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %make_build +EXTFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" %make_build %install make install prefix=%{_prefix} mandir=%{_mandir} libdir=%{_libdir}/fio DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" @@ -65,7 +63,7 @@ make install prefix=%{_prefix} mandir=%{_mandir} libdir=%{_libdir}/fio DESTDIR=$ make test %files -%doc COPYING +%license COPYING %{_bindir}/* %{_datadir}/%{name} %{_libdir}/fio/*.so @@ -76,6 +74,9 @@ make test %changelog +* Mon Oct 13 2025 Funda Wang - 3.41-1 +- update to 3.41 + * Fri Aug 29 2025 wangkai <13474090681@163.com> - 3.40-1 - Update to 3.40