From 2c2cdf344ee1e7923e4cc816545a569a45bf856f Mon Sep 17 00:00:00 2001 From: Justin M. Forbes Date: Jun 14 2022 21:31:31 +0000 Subject: Linux v5.18.4 rebase Signed-off-by: Justin M. Forbes --- diff --git a/kernel-tools.spec b/kernel-tools.spec index fffd3dc..4c376b4 100644 --- a/kernel-tools.spec +++ b/kernel-tools.spec @@ -5,19 +5,19 @@ # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. %global released_kernel 1 -%global baserelease 300 +%global baserelease 200 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching # on top of -- for example, 3.1-rc7-git1 starts with a 3.0 base, # which yields a base_sublevel of 0. -%global base_sublevel 17 +%global base_sublevel 18 ## If this is a released kernel ## %if 0%{?released_kernel} # Do we have a -stable update to apply? -%global stable_update 11 +%global stable_update 4 # Set rpm version accordingly %if 0%{?stable_update} %global stablerev %{stable_update} @@ -70,12 +70,9 @@ BuildRequires: zlib-devel binutils-devel newt-devel python3-docutils perl(ExtUti BuildRequires: audit-libs-devel glibc-devel glibc-headers glibc-static python3-devel java-devel BuildRequires: asciidoc xmlto libcap-devel BuildRequires: openssl-devel libbabeltrace-devel +BuildRequires: libtracefs-devel libtraceevent-devel procps-ng-devel BuildRequires: libbpf-devel BuildRequires: clang llvm -# bpftool will look for a matching vmlinux.h here -%ifnarch i686 armvv7hl -BuildRequires: kernel-devel -%endif # Used to mangle unversioned shebangs to be Python 3 BuildRequires: /usr/bin/pathfix.py %ifnarch s390x %{arm} @@ -84,6 +81,9 @@ BuildRequires: numactl-devel %ifarch aarch64 BuildRequires: opencsd-devel >= 1.0.0 %endif +%ifarch i686 x86_64 +BuildRequires: libnl3-devel +%endif BuildRequires: pciutils-devel gettext ncurses-devel BuildConflicts: rhbuildsys(DiskFree) < 500Mb BuildRequires: rpm-build, elfutils @@ -110,9 +110,6 @@ Source5000: patch-5.%{upstream_sublevel}-rc%{rcrev}.xz %endif %endif -# ongoing complaint, full discussion delayed until ksummit/plumbers -Patch0: 0001-iio-Use-event-header-from-kernel-tree.patch - # rpmlint cleanup Patch6: 0002-perf-Don-t-make-sourced-script-executable.patch @@ -193,6 +190,16 @@ License: GPLv2 This package includes libraries and header files needed for development of applications which use perf library from kernel source. +%package -n rtla +Summary: RTLA: Real-Time Linux Analysis tools +License: GPLv2 +%description -n rtla +The rtla tool is a meta-tool that includes a set of commands that +aims to analyze the real-time properties of Linux. But, instead of +testing Linux as a black box, rtla leverages kernel tracing +capabilities to provide precise information about the properties +and root causes of unexpected results. + %prep %setup -q -n kernel-%{kversion}%{?dist} -c @@ -207,7 +214,6 @@ cd linux-%{kversion} xzcat %{SOURCE5000} | patch -p1 -F1 -s %endif -%patch0 -p1 %patch6 -p1 # END OF PATCH APPLICATIONS @@ -235,15 +241,14 @@ cd linux-%{kversion} %endif %global perf_make \ - make EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} -%global perf_python3 -C tools/perf PYTHON=%{__python3} + make %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3} # perf # make sure check-headers.sh is executable chmod +x tools/perf/check-headers.sh -%{perf_make} %{perf_python3} all +%{perf_make} DESTDIR=$RPM_BUILD_ROOT all %global tools_make \ - make CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" HOSTCFLAGS="%{?build_hostcflags}" HOSTLDFLAGS="%{?build_hostldflags}" V=1 + CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" make %{?make_opts} # cpupower # make sure version-gen.sh is executable. @@ -267,7 +272,10 @@ chmod +x tools/power/cpupower/utils/version-gen.sh %{tools_make} popd pushd tools/power/x86/intel-speed-select - %{tools_make} CFLAGS+="-D_GNU_SOURCE -Iinclude" + %{tools_make} + popd + pushd tools/arch/x86/intel_sdsi + %{tools_make} CFLAGS="${RPM_OPT_FLAGS}" popd %endif pushd tools/thermal/tmon/ @@ -279,19 +287,12 @@ popd pushd tools/gpio/ %{tools_make} popd - -# This is a bit messy, but if we have a kernel-devel installed from this version, and it includes a vmlinux.h -# we want to use that. Otherwise, we need to pass an empty so it will generate one from the running kernel. -%ifnarch i686 armv7hl -develpackage=$(rpm -qa | grep "kernel-devel" | grep %{kversion}) -vmlinux_h=$(rpm -ql $develpackage | grep vmlinux.h) -if [ -f $vmlinux_h ]; then - RPM_VMLINUX_H=$vmlinux_h -fi -%endif +pushd tools/tracing/rtla +%{tools_make} +popd %global bpftool_make \ - make EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT VMLINUX_H="${RPM_VMLINUX_H}" V=1 + make EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT V=1 pushd tools/bpf/bpftool %{bpftool_make} @@ -315,9 +316,9 @@ popd %install cd linux-%{kversion} - +pwd # perf tool binary and supporting scripts/binaries -%{perf_make} %{perf_python3} DESTDIR=%{buildroot} lib=%{_lib} install-bin +%{perf_make} DESTDIR=$RPM_BUILD_ROOT lib=%{_lib} install-bin # remove the 'trace' symlink. rm -f %{buildroot}%{_bindir}/trace @@ -331,7 +332,7 @@ rm -rf %{buildroot}/usr/lib/perf/examples rm -rf %{buildroot}/usr/lib/perf/include/bpf/ # python-perf extension -%{perf_make} %{perf_python3} DESTDIR=%{buildroot} install-python_ext +%{perf_make} DESTDIR=%{buildroot} install-python_ext # perf man pages (note: implicit rpm magic compresses them later) install -d %{buildroot}/%{_mandir}/man1 @@ -367,7 +368,10 @@ install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower %{tools_make} DESTDIR=%{buildroot} install popd pushd tools/power/x86/intel-speed-select - %{tools_make} CFLAGS+="-D_GNU_SOURCE -Iinclude" DESTDIR=%{buildroot} install + %{tools_make} CFLAGS+="-D_GNU_SOURCE -Iinclude -I/usr/include/libnl3" DESTDIR=%{buildroot} install + popd + pushd tools/arch/x86/intel_sdsi + %{tools_make} DESTDIR=%{buildroot} install popd %endif pushd tools/thermal/tmon @@ -379,6 +383,16 @@ popd pushd tools/gpio %{tools_make} DESTDIR=%{buildroot} install popd +pushd tools/tracing/rtla/ +%{tools_make} DESTDIR=%{buildroot} install +rm -f %{buildroot}%{_bindir}/osnoise +rm -f %{buildroot}%{_bindir}/timerlat +(cd %{buildroot} + + ln -sf rtla ./%{_bindir}/osnoise + ln -sf rtla ./%{_bindir}/timerlat +) +popd pushd tools/kvm/kvm_stat %{tools_make} INSTALL_ROOT=%{buildroot} install-tools popd @@ -436,6 +450,7 @@ popd %{_bindir}/turbostat %{_mandir}/man8/turbostat* %{_bindir}/intel-speed-select +%{_sbindir}/intel_sdsi %endif %{_bindir}/tmon %{_bindir}/iio_event_monitor @@ -503,7 +518,22 @@ popd %{_docdir}/libperf/html/libperf-sampling.html %license linux-%{kversion}/COPYING +%files -n rtla +%{_bindir}/rtla +%{_bindir}/osnoise +%{_bindir}/timerlat +%{_mandir}/man1/rtla-osnoise-hist.1.gz +%{_mandir}/man1/rtla-osnoise-top.1.gz +%{_mandir}/man1/rtla-osnoise.1.gz +%{_mandir}/man1/rtla-timerlat-hist.1.gz +%{_mandir}/man1/rtla-timerlat-top.1.gz +%{_mandir}/man1/rtla-timerlat.1.gz +%{_mandir}/man1/rtla.1.gz + %changelog +* Tue Jun 14 2022 Justin M. Forbes - 5.18.4-200 +- Linux v5.18.4 + * Wed May 25 2022 Justin M. Forbes - 5.17.11-300 - Linux v5.17.11 diff --git a/sources b/sources index f5f112e..21b35b4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (linux-5.17.tar.xz) = 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b -SHA512 (patch-5.17.11.xz) = 59023e87e038f5bebf95f2a4149651090614868ab89c75ceb8c39952f367a98dc40fce406a6b0b7cab92400b8e575878cec3ef933ff77f8004a12fb52f5b68c5 +SHA512 (linux-5.18.tar.xz) = dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5 +SHA512 (patch-5.18.4.xz) = 4fe7bc40e9dabde0bbf050818f47ee3ddcfe1fcfcbb2246f05bd67df8abb0f27e46413979e9cf4b2c8ed89a590e4a663b0a75148a9c64fc17770949b98644949