Merge remote-tracking branch 'alma-origin/c8' into HEAD
This commit is contained in:
Stepan Oksanichenko
commit
76d004474a
|
|
@ -1,5 +1,5 @@
|
|||
SOURCES/kernel-abi-stablelists-4.18.0-348.tar.bz2
|
||||
SOURCES/kernel-kabi-dw-4.18.0-348.tar.bz2
|
||||
SOURCES/linux-4.18.0-348.7.1.el8_5.tar.xz
|
||||
SOURCES/linux-4.18.0-348.12.2.el8_5.tar.xz
|
||||
SOURCES/rheldup3.x509
|
||||
SOURCES/rhelkpatch1.x509
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
2d622b532a9ac503406373ef5fa5bea1192086d1 SOURCES/kernel-abi-stablelists-4.18.0-348.tar.bz2
|
||||
109f15ce9699bfa93bd9dc4f8e88013ce341e0e7 SOURCES/kernel-kabi-dw-4.18.0-348.tar.bz2
|
||||
a3793e19a4f8237adb530a9ea1230ccafdf2c2ff SOURCES/linux-4.18.0-348.7.1.el8_5.tar.xz
|
||||
1d7adef0581dde87e580cbb1e59dc0e7cc077ccd SOURCES/linux-4.18.0-348.12.2.el8_5.tar.xz
|
||||
95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509
|
||||
d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509
|
||||
|
|
|
|||
|
|
@ -42,10 +42,10 @@
|
|||
# define buildid .local
|
||||
|
||||
%define rpmversion 4.18.0
|
||||
%define pkgrelease 348.7.1.el8_5
|
||||
%define pkgrelease 348.12.2.el8_5
|
||||
|
||||
# allow pkg_release to have configurable %%{?dist} tag
|
||||
%define specrelease 348.7.1%{?dist}
|
||||
%define specrelease 348.12.2%{?dist}
|
||||
|
||||
%define pkg_release %{specrelease}%{?buildid}
|
||||
|
||||
|
|
@ -359,6 +359,9 @@ BuildRequires: kmod, patch, bash, coreutils, tar, git, which
|
|||
BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk
|
||||
BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, python3-devel
|
||||
BuildRequires: net-tools, hostname, bc, bison, flex, elfutils-devel, dwarves
|
||||
%ifnarch %nobuildarches noarch
|
||||
BuildRequires: bpftool
|
||||
%endif
|
||||
%if %{with_doc}
|
||||
BuildRequires: xmlto, asciidoc, python3-sphinx
|
||||
%endif
|
||||
|
|
@ -1724,6 +1727,9 @@ BuildKernel() {
|
|||
# the F17 UsrMove feature.
|
||||
ln -sf $DevelDir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
|
||||
|
||||
# Generate vmlinux.h and put it to kernel-devel path
|
||||
bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h
|
||||
|
||||
# prune junk from kernel-devel
|
||||
find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -exec rm -f {} \;
|
||||
|
||||
|
|
@ -1848,8 +1854,12 @@ pushd tools/vm/
|
|||
popd
|
||||
%endif
|
||||
|
||||
if [ -f $DevelDir/vmlinux.h ]; then
|
||||
RPM_VMLINUX_H=$DevelDir/vmlinux.h
|
||||
fi
|
||||
|
||||
%global bpftool_make \
|
||||
make EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT V=1
|
||||
make EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT VMLINUX_H="${RPM_VMLINUX_H}" V=1
|
||||
%if %{with_bpftool}
|
||||
pushd tools/bpf/bpftool
|
||||
%{bpftool_make}
|
||||
|
|
@ -1869,7 +1879,7 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
|
|||
pushd tools/testing/selftests
|
||||
# We need to install here because we need to call make with ARCH set which
|
||||
# doesn't seem possible to do in the install section.
|
||||
%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding net/mptcp netfilter tc-testing" FORCE_TARGETS=1 INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests install
|
||||
%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding net/mptcp netfilter tc-testing" FORCE_TARGETS=1 INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install
|
||||
|
||||
# 'make install' for bpf is broken and upstream refuses to fix it.
|
||||
# Install the needed files manually.
|
||||
|
|
@ -2107,6 +2117,10 @@ install -m755 page_owner_sort %{buildroot}%{_bindir}/page_owner_sort
|
|||
popd
|
||||
%endif
|
||||
|
||||
if [ -f $DevelDir/vmlinux.h ]; then
|
||||
RPM_VMLINUX_H=$DevelDir/vmlinux.h
|
||||
fi
|
||||
|
||||
%if !%{with_realtime}
|
||||
%if %{with_bpftool}
|
||||
pushd tools/bpf/bpftool
|
||||
|
|
@ -2618,6 +2632,43 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Mon Jan 17 2022 Frantisek Hrbata <fhrbata@redhat.com> [4.18.0-348.12.2.el8_5]
|
||||
- vfs: Out-of-bounds write of heap buffer in fs_context.c (Frantisek Hrbata) [2040585 2040586] {CVE-2022-0185}
|
||||
- xfs: map unwritten blocks in XFS_IOC_{ALLOC,FREE}SP just like fallocate (Bruno Meneguele) [2034864 2034865] {CVE-2021-4155}
|
||||
|
||||
* Wed Jan 12 2022 Bruno Meneguele <bmeneg@redhat.com> [4.18.0-348.12.1.el8_5]
|
||||
- tcp: don't free a FIN sk_buff in tcp_remove_empty_skb() (Guillaume Nault) [2021574 2016210]
|
||||
- kernel.spec: Add support to use vmlinux.h (Jiri Olsa) [2031053 1989087]
|
||||
- spec: Add vmlinux.h to kernel-devel package (Jiri Olsa) [2031053 1989087]
|
||||
- x86/mce: Avoid infinite loop for copy from user recovery (Prarit Bhargava) [2008789 1999550]
|
||||
- x86/mce: Rename kill_it to kill_current_task (Prarit Bhargava) [2008789 1999550]
|
||||
- x86/mce: Recover from poison found while copying from user space (Prarit Bhargava) [2008789 1999550]
|
||||
- x86/mce: Delay clearing IA32_MCG_STATUS to the end of do_machine_check() (Prarit Bhargava) [2008789 1999550]
|
||||
- x86/mce: Send #MC singal from task work (Prarit Bhargava) [2008789 1999550]
|
||||
|
||||
* Tue Jan 04 2022 Bruno Meneguele <bmeneg@redhat.com> [4.18.0-348.11.1.el8_5]
|
||||
- blk-mq: avoid to iterate over stale request (Ming Lei) [2034396 1997338]
|
||||
- rcu: Tighten rcu_advance_cbs_nowake() checks (Daniel Vacek) [2032579 2013408]
|
||||
|
||||
* Wed Dec 29 2021 Bruno Meneguele <bmeneg@redhat.com> [4.18.0-348.10.1.el8_5]
|
||||
- selftests: add a test case for mirred egress to ingress (Xin Long) [2024411 1983894]
|
||||
- net: sched: act_mirred: drop dst for the direction from egress to ingress (Xin Long) [2024411 1983894]
|
||||
|
||||
* Mon Dec 20 2021 Bruno Meneguele <bmeneg@redhat.com> [4.18.0-348.9.1.el8_5]
|
||||
- ixgbe: Revert "bpf, devmap: Move drop error path to devmap for XDP_REDIRECT" (Ken Cox) [2029845 2024240]
|
||||
- i40e: Revert "bpf, devmap: Move drop error path to devmap for XDP_REDIRECT" (Stefan Assmann) [2029845 2024225]
|
||||
- rcu/nocb: Perform deferred wake up before last idle's need_resched() check (Waiman Long) [2029449 2008340]
|
||||
|
||||
* Tue Dec 14 2021 Bruno Meneguele <bmeneg@redhat.com> [4.18.0-348.8.1.el8_5]
|
||||
- ice: Fix VF true promiscuous mode (Jonathan Toppins) [2026698 1970643]
|
||||
- ice: Remove toggling of antispoof for VF trusted promiscuous mode (Jonathan Toppins) [2026698 1970643]
|
||||
- ice: Fix replacing VF hardware MAC to existing MAC filter (Jonathan Toppins) [2026698 1970643]
|
||||
- ice: Fix not stopping Tx queues for VFs (Jonathan Toppins) [2026698 1970643]
|
||||
- ice: Fix race conditions between virtchnl handling and VF ndo ops (Jonathan Toppins) [2026698 1970643]
|
||||
- net/netif_receive_skb_core: Use migrate_disable() (Luis Claudio R. Goncalves) [2027689 2024168]
|
||||
- crypto: jitter - consider 32 LSB for APT (Herbert Xu) [2029365 1994390]
|
||||
- xfs: fix I_DONTCACHE (Carlos Maiolino) [2028534 2024969]
|
||||
|
||||
* Wed Dec 08 2021 Bruno Meneguele <bmeneg@redhat.com> [4.18.0-348.7.1.el8_5]
|
||||
- sched: Fix CPU hotplug / tighten is_per_cpu_kthread() (Waiman Long) [2026450 2024869]
|
||||
- sched: Prepare to use balance_push in ttwu() (Waiman Long) [2026450 2024869]
|
||||
|
|
|
|||
Loading…
Reference in New Issue