Skip to content

Commit

Permalink
remove fio
Browse files Browse the repository at this point in the history
  • Loading branch information
harp-intel committed Oct 25, 2024
1 parent 280992e commit e6548f0
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 25 deletions.
6 changes: 0 additions & 6 deletions THIRD_PARTY_PROGRAMS
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,6 @@ ethtool
* Copyright 2008-2010, 2013-2016 Ben Hutchings
* QSFP+/QSFP28 DOM support by Vidya Sagar Ravipati <[email protected]>
-------------------------------------------------------------
fio
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
-------------------------------------------------------------
iostat
* iostat: report CPU and I/O statistics
* (C) 1998-2023 by Sebastien GODARD (sysstat <at> orange.fr)
Expand Down
1 change: 0 additions & 1 deletion scripts/print_licenses.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ github_projects=(
"async-profiler/async-profiler"
"harp-intel/avx-turbo"
"mirror/dmidecode"
"axboe/fio"
"lyonel/lshw"
"pciutils/pciutils"
"intel/pcm"
Expand Down
20 changes: 3 additions & 17 deletions tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@
#

default: tools
.PHONY: default tools async-profiler avx-turbo cpuid dmidecode ethtool fio flamegraph ipmitool lshw lspci msr-tools pcm perf spectre-meltdown-checker sshpass stress-ng sysstat tsc turbostat
.PHONY: default tools async-profiler avx-turbo cpuid dmidecode ethtool flamegraph ipmitool lshw lspci msr-tools pcm perf spectre-meltdown-checker sshpass stress-ng sysstat tsc turbostat

tools: async-profiler avx-turbo cpuid dmidecode ethtool fio flamegraph ipmitool lshw lspci msr-tools pcm perf spectre-meltdown-checker sshpass stress-ng sysstat tsc turbostat
tools: async-profiler avx-turbo cpuid dmidecode ethtool flamegraph ipmitool lshw lspci msr-tools pcm perf spectre-meltdown-checker sshpass stress-ng sysstat tsc turbostat
mkdir -p bin
cp -R async-profiler bin/
cp avx-turbo/avx-turbo bin/
cp cpuid/cpuid bin/
cp dmidecode/dmidecode bin/
cp ethtool/ethtool bin/
cp fio/fio bin/
cp flamegraph/stackcollapse-perf.pl bin/
cp ipmitool/src/ipmitool.static bin/ipmitool
cp lshw/src/lshw-static bin/lshw
Expand Down Expand Up @@ -86,18 +85,6 @@ ifeq ("$(wildcard ethtool/Makefile)","")
endif
cd ethtool && make

fio:
ifeq ("$(wildcard fio)","")
git clone https://github.com/axboe/fio.git
else
cd fio && git checkout master && git pull
endif
cd fio && git checkout fio-3.36
ifeq ("$(wildcard fio/config.log)","")
cd fio && ./configure --build-static --disable-native
endif
cd fio && make

flamegraph:
ifeq ("$(wildcard flamegraph)","")
git clone https://github.com/brendangregg/FlameGraph.git flamegraph
Expand Down Expand Up @@ -214,7 +201,6 @@ reset:
cd cpuid && make clean
cd dmidecode && git clean -fdx && git reset --hard
cd ethtool && git clean -fdx && git reset --hard
cd fio && git clean -fdx && git reset --hard
cd flamegraph && git clean -fdx && git reset --hard
cd ipmitool && git clean -fdx && git reset --hard
cd lshw && git clean -fdx && git reset --hard
Expand All @@ -239,5 +225,5 @@ libcrypt.tar.gz:
libs: glibc-2.19.tar.bz2 zlib.tar.gz libcrypt.tar.gz

oss-source: reset libs
tar --exclude-vcs -czf oss_source.tgz async-profiler/ cpuid/ dmidecode/ ethtool/ fio/ flamegraph/ ipmitool/ lshw/ lspci/ msr-tools/ pcm/ linux_perf/tools/perf spectre-meltdown-checker/ sshpass/ stress-ng/ sysstat/ linux_turbostat/tools/power/x86/turbostat glibc-2.19.tar.bz2 zlib.tar.gz libcrypt.tar.gz
tar --exclude-vcs -czf oss_source.tgz async-profiler/ cpuid/ dmidecode/ ethtool/ flamegraph/ ipmitool/ lshw/ lspci/ msr-tools/ pcm/ linux_perf/tools/perf spectre-meltdown-checker/ sshpass/ stress-ng/ sysstat/ linux_turbostat/tools/power/x86/turbostat glibc-2.19.tar.bz2 zlib.tar.gz libcrypt.tar.gz
md5sum oss_source.tgz > oss_source.tgz.md5
2 changes: 1 addition & 1 deletion tools/build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64
RUN rm -rf /usr/local/go && wget -qO- https://go.dev/dl/go1.23.0.linux-amd64.tar.gz | tar -C /usr/local -xz
ENV PATH="${PATH}:/usr/local/go/bin"

# need up-to-date zlib (used by fio and stress-ng static builds) to fix security vulnerabilities
# need up-to-date zlib (used by stress-ng static build) to fix security vulnerabilities
RUN git clone https://github.com/madler/zlib.git && cd zlib && ./configure && make install
RUN cp /usr/local/lib/libz.a /usr/lib/x86_64-linux-gnu/libz.a

Expand Down

0 comments on commit e6548f0

Please sign in to comment.