summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-09-13 15:06:39 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2022-09-13 15:06:39 +0200
commitace4f084ae9a3aca637f5d90d932debd17b132a5 (patch)
treef222cfab48579e9755db9fae036de9849e809c0e
parentf6470bd8266b6153dbabfa09c0a91cb75e43d5a5 (diff)
parent423365575825f0f1bddf68bbb512a624ccf1e163 (diff)
downloadkernel-ace4f084ae9a3aca637f5d90d932debd17b132a5.tar.gz
kernel-ace4f084ae9a3aca637f5d90d932debd17b132a5.tar.xz
kernel-ace4f084ae9a3aca637f5d90d932debd17b132a5.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.0.0-0.rc5.20220913gite839a756012b.38.vanilla.1.fc36
-rw-r--r--Makefile.rhelver2
-rwxr-xr-xkernel.spec18
-rw-r--r--mod-internal.list3
-rw-r--r--sources6
4 files changed, 18 insertions, 11 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 611e8bc3e..41103edf4 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
-RHEL_RELEASE = 37
+RHEL_RELEASE = 38
#
# ZSTREAM
diff --git a/kernel.spec b/kernel.spec
index 0950c61da..54a1bc9e3 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -124,17 +124,17 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
# define buildid .local
%define specversion 6.0.0
%define patchversion 6.0
-%define pkgrelease 0.rc5.37
+%define pkgrelease 0.rc5.20220913gite839a756012b.38
%define kversion 6
-%define tarfile_release 6.0-rc5
+%define tarfile_release 6.0-rc5-15-ge839a756012b
# This is needed to do merge window version magic
%define patchlevel 0
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.37%{?buildid}%{?dist}
+%define specrelease 0.rc5.20220913gite839a756012b.38%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.0.0
@@ -2829,6 +2829,10 @@ fi\
%endif\
rm -f %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{1}}\
/bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\
+if [[ ! -e "/boot/symvers-%{KVERREL}%{?1:+%{1}}.gz" ]]; then\
+ ln -s "/lib/modules/%{KVERREL}%{?1:+%{1}}/symvers.gz" "/boot/symvers-%{KVERREL}%{?1:+%{1}}.gz"\
+ command -v restorecon &>/dev/null && restorecon "/boot/symvers-%{KVERREL}%{?1:+%{1}}.gz" \
+fi\
%{nil}
#
@@ -3155,6 +3159,12 @@ fi
#
#
%changelog
+* Tue Sep 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc5.e839a756012b.38]
+- redhat: create /boot symvers link if it doesn't exist (Jan Stancek)
+- redhat: set LC_ALL=C before sorting config content (Frantisek Hrbata)
+- redhat: remove duplicate kunit tests in mod-internal.list (Nico Pache)
+- Linux v6.0.0-0.rc5.e839a756012b
+
* Mon Sep 12 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc5.37]
- configs/fedora: Make Fedora work with HNS3 network adapter (Zamir SUN)
- redhat/configs/fedora/generic: Enable CONFIG_BLK_DEV_UBLK on Fedora (Richard W.M. Jones) [2122595]
diff --git a/mod-internal.list b/mod-internal.list
index e8f21dc4a..26377cd93 100644
--- a/mod-internal.list
+++ b/mod-internal.list
@@ -46,9 +46,6 @@ test_klp_state3
torture
refscale
rcuscale
-memcpy_kunit
-dev_addr_lists_test
-test_hash
test_bpf
stackinit_kunit
overflow_kunit
diff --git a/sources b/sources
index b5075fc5b..c4ecfd388 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.0-rc5.tar.xz) = 1893078550da0469dd4f643de9959a70d502ed485fa226131c1f2a275be6bbe62f391ad7b504113b07cd2c093a3ac221d14476c15c965e0be431f73dc11e539a
-SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = 9b0d2ea32163d364d5aec4b173ffb7f6fbeab713234797740ce88e38908b057847dbfe1f3c85a3aa42511fc83cb59f3e1e4fbdd80e1a88ca21d24978a8e1c73a
-SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 35b67572658a9be2218afe9a984ca2d1cfbc1c191e138eee482a7dd840b7bbb83f7839a6a040b0b875fc1167cb3682e0ae4c121e7587e8da2b9f65c105ac9f9d
+SHA512 (linux-6.0-rc5-15-ge839a756012b.tar.xz) = a51b6bbf27603de363a3e01935e6ae85b10c9e95352b868705fa7fa6cc93732e7310d57b7bebb5c003caf11a144890ab08381ab0ab7f6bbf6c274d3e23e450b5
+SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = 47534cee608635b5a6a7387e6d216deabedd4b9c8fd1d3560f1a066c5069d780f1013a4e9bc146937a9426100395fa2c8fca8e4f5b7221ff6565f38a22c0c792
+SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 911aa5d31f887b5cf425b784a062fc3fe8278707c7b90bb62ac1414dc8927d132b1ddc0a943484ff9912e43e6630ee9230ed8b425b8222a8e06aff19ec58b215