Merge remote-tracking branch 'up/f38' into f38-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2023-07-28 11:24:09 +03:00
commit ca00f77b91
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
3 changed files with 12 additions and 9 deletions

View File

@ -171,18 +171,18 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
# define buildid .local
%define specrpmversion 6.4.6
%define specversion 6.4.6
%define specrpmversion 6.4.7
%define specversion 6.4.7
%define patchversion 6.4
%define pkgrelease 200
%define kversion 6
%define tarfile_release 6.4.6
%define tarfile_release 6.4.7
# This is needed to do merge window version magic
%define patchlevel 4
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 200%{?buildid}.0.riscv64%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.4.6
%define kabiversion 6.4.7
# If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error
@ -3753,9 +3753,12 @@ fi\
#
#
%changelog
* Tue Jul 25 2023 David Abdurachmanov <davidlt@rivosinc.com> [6.4.6-0.riscv64]
* Fri Jul 28 2023 David Abdurachmanov <davidlt@rivosinc.com> [6.4.7-0.riscv64]
- Add support for riscv64
* Thu Jul 27 2023 Augusto Caringi <acaringi@redhat.com> [6.4.7-0]
- Linux v6.4.7
* Mon Jul 24 2023 Augusto Caringi <acaringi@redhat.com> [6.4.6-0]
- Change pathfix.py to %%py3_shebang_fix (Justin M. Forbes)
- Add config option coming to a stable update soon (Justin M. Forbes)

View File

@ -39,7 +39,7 @@
38 files changed, 498 insertions(+), 179 deletions(-)
diff --git a/Makefile b/Makefile
index 23ddaa3f3034..1ca016223132 100644
index b3dc3b5f14ca..fb6ef27d6de3 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \

View File

@ -1,3 +1,3 @@
SHA512 (linux-6.4.6.tar.xz) = b5f54c6ce93e09c51cc42aa9467924ca0aa0c2861061d6cb09336e044773e29cd1780eddb2fb07e3cd61f84964665ac9a04dbbae7268801affea67e7dcbdbb06
SHA512 (kernel-abi-stablelists-6.4.6.tar.bz2) = acd8f4a52dd0c8f86706ccfbfe120c6cabbf0fadfa4e08ef492d287da0a54d3c5af8f0d850e8a376f2cbe96b40f5cf4645b32e7d0d5f6405547059a1e5d53547
SHA512 (kernel-kabi-dw-6.4.6.tar.bz2) = 506b27ee49a0bb2521e54f3822ad60e5e4b9f02b79f3fa2dcdcd2bdd0733be6785b710042d3487896249fd0f9beb5369060d61a042ac916cba4e350b1321c009
SHA512 (linux-6.4.7.tar.xz) = d9b635c794ea1437a47156199429670ed9e887fa2aa2dae8220245a98c1d0d0b55b25ff5e19bcfa9a99d60d3f809d8e8e9fd0d2aeae83683eb4f853140c61031
SHA512 (kernel-abi-stablelists-6.4.7.tar.bz2) = 141fed2100b1f4868685c6f9fe0dd25a941103e336ead6bc224da3439d98045da9bd399189997fa350ea4cec82e89a2e5a3596ba9923f18a4752a174853555bc
SHA512 (kernel-kabi-dw-6.4.7.tar.bz2) = 47d8dd49caaf02cc283299aae358e4752f7638194db368cd94de27358304a7216d34a958ee21df1873d9cea192dca5b43571364d61f54fd99c3b2bb546b05538