summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-05-06 12:06:33 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-05-06 12:06:33 -0500
commit57c65572919c81cfd703c25229a1ffae6f210ef3 (patch)
treea118a2051e9894eae709cccdd484dbd40caf443d
parent5b397b1aad0c82f98010e7163b56c0c41ed3e032 (diff)
downloadkernel-57c65572919c81cfd703c25229a1ffae6f210ef3.tar.gz
kernel-57c65572919c81cfd703c25229a1ffae6f210ef3.tar.xz
kernel-57c65572919c81cfd703c25229a1ffae6f210ef3.zip
kernel-5.18.0-0.rc5.20220506gitfe27d189e3f42e3.44
* Fri May 06 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc5.fe27d189e3f42e3.43] - redhat: shellcheck cleanup (Prarit Bhargava) - redhat/self-test/data: Cleanup data (Prarit Bhargava) - redhat/self-test: Add test to verify SPEC variables (Prarit Bhargava) - redhat/Makefile: Add 'duplicate' SPEC entries for user set variables (Prarit Bhargava) - redhat/Makefile: Rename TARFILE_RELEASE to SPECTARFILE_RELEASE (Prarit Bhargava) - redhat/genspec: Rename PATCHLIST_CHANGELOG to SPECPATCHLIST_CHANGELOG (Prarit Bhargava) - redhat/genspec: Rename DEBUG_BUILDS_ENABLED to SPECDEBUG_BUILDS_ENABLED (Prarit Bhargava) - redhat/Makefile: Rename PKGRELEASE to SPECBUILD (Prarit Bhargava) - redhat/genspec: Rename BUILDID_DEFINE to SPECBUILDID (Prarit Bhargava) - redhat/Makefile: Rename CHANGELOG to SPECCHANGELOG (Prarit Bhargava) - redhat/Makefile: Rename RPMKEXTRAVERSION to SPECKEXTRAVERSION (Prarit Bhargava) - redhat/Makefile: Rename RPMKSUBLEVEL to SPECKSUBLEVEL (Prarit Bhargava) - redhat/Makefile: Rename RPMKPATCHLEVEL to SPECKPATCHLEVEL (Prarit Bhargava) - redhat/Makefile: Rename RPMKVERSION to SPECKVERSION (Prarit Bhargava) - redhat/Makefile: Rename KVERSION to SPECVERSION (Prarit Bhargava) - redhat/Makefile: Deprecate some simple targets (Prarit Bhargava) - redhat/Makefile: Use KVERSION (Prarit Bhargava) Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Makefile.rhelver2
-rwxr-xr-xgenerate_all_configs.sh2
-rw-r--r--kernel-aarch64-debug-fedora.config4
-rw-r--r--kernel-aarch64-debug-rhel.config4
-rw-r--r--kernel-aarch64-fedora.config4
-rw-r--r--kernel-aarch64-rhel.config4
-rw-r--r--kernel-armv7hl-debug-fedora.config3
-rw-r--r--kernel-armv7hl-fedora.config3
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config3
-rw-r--r--kernel-armv7hl-lpae-fedora.config3
-rw-r--r--kernel-ppc64le-debug-fedora.config3
-rw-r--r--kernel-ppc64le-debug-rhel.config3
-rw-r--r--kernel-ppc64le-fedora.config3
-rw-r--r--kernel-ppc64le-rhel.config3
-rw-r--r--kernel-s390x-debug-fedora.config3
-rw-r--r--kernel-s390x-debug-rhel.config3
-rw-r--r--kernel-s390x-fedora.config3
-rw-r--r--kernel-s390x-rhel.config3
-rw-r--r--kernel-s390x-zfcpdump-rhel.config3
-rw-r--r--kernel-x86_64-debug-fedora.config3
-rw-r--r--kernel-x86_64-debug-rhel.config3
-rw-r--r--kernel-x86_64-fedora.config3
-rw-r--r--kernel-x86_64-rhel.config3
-rwxr-xr-xkernel.spec53
-rw-r--r--sources6
-rwxr-xr-xupdate_scripts.sh2
26 files changed, 109 insertions, 23 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 3b8bbb40f..4a0e64b52 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 = 43
+RHEL_RELEASE = 44
#
# ZSTREAM
diff --git a/generate_all_configs.sh b/generate_all_configs.sh
index 31d141675..5b96fa2fd 100755
--- a/generate_all_configs.sh
+++ b/generate_all_configs.sh
@@ -18,7 +18,7 @@ else
fi
for i in kernel-*-"$FLAVOR".config; do
- NEW=kernel-"$KVERSION"-$(echo "$i" | cut -d - -f2- | sed s/-"$FLAVOR"//)
+ NEW=kernel-"$SPECVERSION"-$(echo "$i" | cut -d - -f2- | sed s/-"$FLAVOR"//)
#echo $NEW
mv "$i" "$NEW"
done
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 78bec160d..a7d479b6c 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -1000,6 +1000,7 @@ CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -1195,6 +1196,7 @@ CONFIG_COMMON_RESET_HI6220=m
CONFIG_COMPACTION=y
CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
+# CONFIG_COMPAT_VDSO is not set
CONFIG_COMPAT=y
# CONFIG_COMPILE_TEST is not set
CONFIG_CONFIGFS_FS=y
@@ -3680,6 +3682,8 @@ CONFIG_LTC1660=m
# CONFIG_LTC2688 is not set
CONFIG_LTC2983=m
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
CONFIG_LTR501=m
CONFIG_LV0104CS=m
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index fe9d57211..8c746009c 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -747,6 +747,7 @@ CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
# CONFIG_CFG80211_WEXT is not set
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -887,6 +888,7 @@ CONFIG_COMPACTION=y
CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_COMPAT is not set
+# CONFIG_COMPAT_VDSO is not set
# CONFIG_COMPILE_TEST is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
@@ -2915,6 +2917,8 @@ CONFIG_LSM_MMAP_MIN_ADDR=65535
# CONFIG_LTC2688 is not set
# CONFIG_LTC2983 is not set
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
# CONFIG_LTR501 is not set
# CONFIG_LV0104CS is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 7ea284a31..fc84387b3 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -1000,6 +1000,7 @@ CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -1195,6 +1196,7 @@ CONFIG_COMMON_RESET_HI6220=m
CONFIG_COMPACTION=y
CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
+# CONFIG_COMPAT_VDSO is not set
CONFIG_COMPAT=y
# CONFIG_COMPILE_TEST is not set
CONFIG_CONFIGFS_FS=y
@@ -3661,6 +3663,8 @@ CONFIG_LTC1660=m
# CONFIG_LTC2688 is not set
CONFIG_LTC2983=m
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
CONFIG_LTR501=m
CONFIG_LV0104CS=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index a70faeee9..e04b4c949 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -747,6 +747,7 @@ CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
# CONFIG_CFG80211_WEXT is not set
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -887,6 +888,7 @@ CONFIG_COMPACTION=y
CONFIG_COMPAT_32BIT_TIME=y
# CONFIG_COMPAT_BRK is not set
# CONFIG_COMPAT is not set
+# CONFIG_COMPAT_VDSO is not set
# CONFIG_COMPILE_TEST is not set
CONFIG_CONFIGFS_FS=y
CONFIG_CONNECTOR=y
@@ -2894,6 +2896,8 @@ CONFIG_LSM_MMAP_MIN_ADDR=65535
# CONFIG_LTC2688 is not set
# CONFIG_LTC2983 is not set
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
# CONFIG_LTR501 is not set
# CONFIG_LV0104CS is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 14e0b70bf..ca0c1288e 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -1019,6 +1019,7 @@ CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -3712,6 +3713,8 @@ CONFIG_LTC1660=m
# CONFIG_LTC2688 is not set
CONFIG_LTC2983=m
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
CONFIG_LTR501=m
CONFIG_LV0104CS=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index ef990fba9..0c05b7dd8 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -1019,6 +1019,7 @@ CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -3695,6 +3696,8 @@ CONFIG_LTC1660=m
# CONFIG_LTC2688 is not set
CONFIG_LTC2983=m
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
CONFIG_LTR501=m
CONFIG_LV0104CS=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 658cbf3c8..681e46b10 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -997,6 +997,7 @@ CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -3641,6 +3642,8 @@ CONFIG_LTC1660=m
# CONFIG_LTC2688 is not set
CONFIG_LTC2983=m
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
CONFIG_LTR501=m
CONFIG_LV0104CS=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index f3d29eb85..10f03c3fe 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -997,6 +997,7 @@ CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -3624,6 +3625,8 @@ CONFIG_LTC1660=m
# CONFIG_LTC2688 is not set
CONFIG_LTC2983=m
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
CONFIG_LTR501=m
CONFIG_LV0104CS=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 1b1603763..a2be67657 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -780,6 +780,7 @@ CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -3099,6 +3100,8 @@ CONFIG_LTC1660=m
# CONFIG_LTC2688 is not set
CONFIG_LTC2983=m
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
CONFIG_LTR501=m
CONFIG_LV0104CS=m
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 53cd83bc8..767763000 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -629,6 +629,7 @@ CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
# CONFIG_CFG80211_WEXT is not set
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -2747,6 +2748,8 @@ CONFIG_LSM_MMAP_MIN_ADDR=65535
# CONFIG_LTC2688 is not set
# CONFIG_LTC2983 is not set
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
# CONFIG_LTR501 is not set
# CONFIG_LV0104CS is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 3a95282c6..11df7a358 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -779,6 +779,7 @@ CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -3080,6 +3081,8 @@ CONFIG_LTC1660=m
# CONFIG_LTC2688 is not set
CONFIG_LTC2983=m
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
CONFIG_LTR501=m
CONFIG_LV0104CS=m
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 6cca52f7a..01e66a849 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -629,6 +629,7 @@ CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
# CONFIG_CFG80211_WEXT is not set
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -2727,6 +2728,8 @@ CONFIG_LSM_MMAP_MIN_ADDR=65535
# CONFIG_LTC2688 is not set
# CONFIG_LTC2983 is not set
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
# CONFIG_LTR501 is not set
# CONFIG_LV0104CS is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 7a824ff7a..1be93dc3c 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -785,6 +785,7 @@ CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -3071,6 +3072,8 @@ CONFIG_LTC1660=m
# CONFIG_LTC2688 is not set
CONFIG_LTC2983=m
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
CONFIG_LTR501=m
CONFIG_LV0104CS=m
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 7c17936f9..d01360e9c 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -630,6 +630,7 @@ CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
# CONFIG_CFG80211_WEXT is not set
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -2725,6 +2726,8 @@ CONFIG_LSM_MMAP_MIN_ADDR=65535
# CONFIG_LTC2688 is not set
# CONFIG_LTC2983 is not set
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
# CONFIG_LTR501 is not set
# CONFIG_LV0104CS is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 0a685b71e..77eb696e0 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -784,6 +784,7 @@ CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -3052,6 +3053,8 @@ CONFIG_LTC1660=m
# CONFIG_LTC2688 is not set
CONFIG_LTC2983=m
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
CONFIG_LTR501=m
CONFIG_LV0104CS=m
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 82c8c89c0..8733c54d3 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -630,6 +630,7 @@ CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
# CONFIG_CFG80211_WEXT is not set
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -2705,6 +2706,8 @@ CONFIG_LSM_MMAP_MIN_ADDR=65535
# CONFIG_LTC2688 is not set
# CONFIG_LTC2983 is not set
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
# CONFIG_LTR501 is not set
# CONFIG_LV0104CS is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index ccd697336..97d739702 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -635,6 +635,7 @@ CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
# CONFIG_CFG80211_WEXT is not set
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -2717,6 +2718,8 @@ CONFIG_LSM_MMAP_MIN_ADDR=65535
# CONFIG_LTC2688 is not set
# CONFIG_LTC2983 is not set
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
# CONFIG_LTR501 is not set
# CONFIG_LV0104CS is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 9c1447feb..8e47d5eb8 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -830,6 +830,7 @@ CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -3369,6 +3370,8 @@ CONFIG_LTC1660=m
# CONFIG_LTC2688 is not set
CONFIG_LTC2983=m
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
CONFIG_LTR501=m
CONFIG_LV0104CS=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 8b0e3feef..d3d97cf87 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -655,6 +655,7 @@ CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
# CONFIG_CFG80211_WEXT is not set
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -2909,6 +2910,8 @@ CONFIG_LSM_MMAP_MIN_ADDR=65535
# CONFIG_LTC2688 is not set
# CONFIG_LTC2983 is not set
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
# CONFIG_LTR501 is not set
# CONFIG_LV0104CS is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 3feff6898..ad4861108 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -829,6 +829,7 @@ CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -3350,6 +3351,8 @@ CONFIG_LTC1660=m
# CONFIG_LTC2688 is not set
CONFIG_LTC2983=m
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
CONFIG_LTR501=m
CONFIG_LV0104CS=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 5512deeb9..42488336e 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -655,6 +655,7 @@ CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
CONFIG_CFG80211=m
# CONFIG_CFG80211_WEXT is not set
+# CONFIG_CFI_CLANG is not set
CONFIG_CFS_BANDWIDTH=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_CPUACCT=y
@@ -2889,6 +2890,8 @@ CONFIG_LSM_MMAP_MIN_ADDR=65535
# CONFIG_LTC2688 is not set
# CONFIG_LTC2983 is not set
# CONFIG_LTE_GDM724X is not set
+# CONFIG_LTO_CLANG_FULL is not set
+# CONFIG_LTO_CLANG_THIN is not set
CONFIG_LTO_NONE=y
# CONFIG_LTR501 is not set
# CONFIG_LV0104CS is not set
diff --git a/kernel.spec b/kernel.spec
index aa566d08d..fd25cb7d8 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -127,15 +127,15 @@ Summary: The Linux kernel
# The kernel tarball/base version
%define kversion 5.18
-%define rpmversion 5.18.0
+%define specversion 5.18.0
%define patchversion 5.18
-%define pkgrelease 0.rc5.20220505gita7391ad3572431a.43
+%define pkgrelease 0.rc5.20220506gitfe27d189e3f42e3.44
# This is needed to do merge window version magic
%define patchlevel 18
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.20220505gita7391ad3572431a.43%{?buildid}%{?dist}
+%define specrelease 0.rc5.20220506gitfe27d189e3f42e3.44%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -551,7 +551,7 @@ Summary: The Linux kernel
Name: kernel
License: GPLv2 and Redistributable, no modification permitted
URL: https://www.kernel.org/
-Version: %{rpmversion}
+Version: %{specversion}
Release: %{pkg_release}
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
# SET %%nobuildarches (ABOVE) INSTEAD
@@ -690,7 +690,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.18-rc5-28-ga7391ad3572431a.tar.xz
+Source0: linux-5.18-rc5-115-gfe27d189e3f42e3.tar.xz
Source1: Makefile.rhelver
@@ -826,8 +826,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{rpmversion}-%{pkgrelease}.tar.bz2
-Source301: kernel-kabi-dw-%{rpmversion}-%{pkgrelease}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{pkgrelease}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{pkgrelease}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
@@ -869,8 +869,8 @@ The kernel meta package
# macros defined above.
#
%define kernel_reqprovconf \
-Provides: kernel = %{rpmversion}-%{pkg_release}\
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\
+Provides: kernel = %{specversion}-%{pkg_release}\
+Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\
Provides: kernel-drm-nouveau = 16\
Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires(pre): %{kernel_prereq}\
@@ -1382,8 +1382,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.18-rc5-28-ga7391ad3572431a -c
-mv linux-5.18-rc5-28-ga7391ad3572431a linux-%{KVERREL}
+%setup -q -n kernel-5.18-rc5-115-gfe27d189e3f42e3 -c
+mv linux-5.18-rc5-115-gfe27d189e3f42e3 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -1439,7 +1439,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled}
+FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
@@ -1490,7 +1490,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${specversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
@@ -2401,7 +2401,7 @@ find Documentation -type d | xargs chmod u+w
cd linux-%{KVERREL}
%if %{with_doc}
-docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
+docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
# copy the source over
mkdir -p $docdir
@@ -2809,9 +2809,9 @@ fi
%if %{with_doc}
%files doc
%defattr(-,root,root)
-%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/*
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
+%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation/*
+%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation
+%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
%endif
%if %{with_perf}
@@ -3025,6 +3025,25 @@ fi
#
#
%changelog
+* Fri May 06 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc5.fe27d189e3f42e3.43]
+- redhat: shellcheck cleanup (Prarit Bhargava)
+- redhat/self-test/data: Cleanup data (Prarit Bhargava)
+- redhat/self-test: Add test to verify SPEC variables (Prarit Bhargava)
+- redhat/Makefile: Add 'duplicate' SPEC entries for user set variables (Prarit Bhargava)
+- redhat/Makefile: Rename TARFILE_RELEASE to SPECTARFILE_RELEASE (Prarit Bhargava)
+- redhat/genspec: Rename PATCHLIST_CHANGELOG to SPECPATCHLIST_CHANGELOG (Prarit Bhargava)
+- redhat/genspec: Rename DEBUG_BUILDS_ENABLED to SPECDEBUG_BUILDS_ENABLED (Prarit Bhargava)
+- redhat/Makefile: Rename PKGRELEASE to SPECBUILD (Prarit Bhargava)
+- redhat/genspec: Rename BUILDID_DEFINE to SPECBUILDID (Prarit Bhargava)
+- redhat/Makefile: Rename CHANGELOG to SPECCHANGELOG (Prarit Bhargava)
+- redhat/Makefile: Rename RPMKEXTRAVERSION to SPECKEXTRAVERSION (Prarit Bhargava)
+- redhat/Makefile: Rename RPMKSUBLEVEL to SPECKSUBLEVEL (Prarit Bhargava)
+- redhat/Makefile: Rename RPMKPATCHLEVEL to SPECKPATCHLEVEL (Prarit Bhargava)
+- redhat/Makefile: Rename RPMKVERSION to SPECKVERSION (Prarit Bhargava)
+- redhat/Makefile: Rename KVERSION to SPECVERSION (Prarit Bhargava)
+- redhat/Makefile: Deprecate some simple targets (Prarit Bhargava)
+- redhat/Makefile: Use KVERSION (Prarit Bhargava)
+
* Mon May 02 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc5.39]
- redhat/configs: Set GUP_TEST in debug kernel (Joel Savitz)
diff --git a/sources b/sources
index 9f75872e3..80cb1582d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.18-rc5-28-ga7391ad3572431a.tar.xz) = 941a570be6e7e26710dfc9008f72c7c1f18ccc0ce284c6f3e35287056c249c3071e50773d2b114c11476a2ff1407a5858b3ca077bbf4d96efe0b6da1b3893865
-SHA512 (kernel-abi-stablelists-5.18.0-0.rc5.20220505gita7391ad3572431a.43.tar.bz2) = 5b278bcb68c34c7a6b5206133b4b459073d8cd8d85623f398d81214e0b6e87f6917b8d21d81be674a6b638d03c4886a8c9561a91aee5a73e7d73c1399bad7c0f
-SHA512 (kernel-kabi-dw-5.18.0-0.rc5.20220505gita7391ad3572431a.43.tar.bz2) = 27c7c184b59ca42825565eb0d01536150886ce4888b12c66db32237dde68edc16418eb9980251ef503a15913c50c9d96647065a0276682a845396db290972daf
+SHA512 (linux-5.18-rc5-115-gfe27d189e3f42e3.tar.xz) = 4bbaaa8573f37489186f4282b1bdf3278c6a07d50fc37b26a06a1dd51787815f96fa76ea2ad6861b5a0a8af2185c15f2eb042bb198e66ec1afe21c24425bf3df
+SHA512 (kernel-abi-stablelists-5.18.0-0.rc5.20220506gitfe27d189e3f42e3.44.tar.bz2) = caf1146458a06d7218d1224bf9470845d5f02f5d89b033ccc37f36d067a1bfac5debb8a29737003bc051f308f7a2464ec26cb78f2e0d3f25321cec2d10517764
+SHA512 (kernel-kabi-dw-5.18.0-0.rc5.20220506gitfe27d189e3f42e3.44.tar.bz2) = 20b7fe864ccb9d8551e198ba64da02dbeeb82e321ee86d8f64bb973fe5d3d35be6c5aa36dbce18b3235b84897b4913b5641d9e9e3be416af26761b22bf2d0853
diff --git a/update_scripts.sh b/update_scripts.sh
index a36dc475c..38e66347f 100755
--- a/update_scripts.sh
+++ b/update_scripts.sh
@@ -8,5 +8,5 @@ TARGET="$1"
for i in "$RPM_SOURCE_DIR"/*."$TARGET"; do
NEW=${i%.$TARGET}
- cp "$i" $(basename "$NEW")
+ cp "$i" "$(basename "$NEW")"
done