From df524ff972e9e9f2bd5996e2b120ef737cd6e8a6 Mon Sep 17 00:00:00 2001
From: "Herton R. Krzesinski" <herton@redhat.com>
Date: Mon, 27 Feb 2023 20:29:47 +0000
Subject: [PATCH] kernel-5.14.0-284.el9

* Mon Feb 27 2023 Herton R. Krzesinski <herton@redhat.com> [5.14.0-284.el9]
- kernel.spec: move modules.builtin to kernel-core (Jan Stancek) [2172376]
Resolves: rhbz#2172376

Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
---
 Makefile.rhelver |  2 +-
 kernel.spec      | 18 +++++++++++++-----
 sources          |  6 +++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 136f12810..7e947ab73 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 2
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 283
+RHEL_RELEASE = 284
 
 #
 # ZSTREAM
diff --git a/kernel.spec b/kernel.spec
index 4f90f0e31..490f7d14f 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -161,15 +161,15 @@ Summary: The Linux kernel
 # define buildid .local
 %define specversion 5.14.0
 %define patchversion 5.14
-%define pkgrelease 283
+%define pkgrelease 284
 %define kversion 5
-%define tarfile_release 5.14.0-283.el9
+%define tarfile_release 5.14.0-284.el9
 # This is needed to do merge window version magic
 %define patchlevel 14
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 283%{?buildid}%{?dist}
+%define specrelease 284%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 5.14.0-283.el9
+%define kabiversion 5.14.0-284.el9
 
 #
 # End of genspec.sh variables
@@ -3346,6 +3346,7 @@ fi
 %ghost %attr(0600, root, root) /boot/System.map-%{KVERREL}%{?3:+%{3}}\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/symvers.gz\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/config\
+/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.builtin*\
 %ghost %attr(0600, root, root) /boot/symvers-%{KVERREL}%{?3:+%{3}}.gz\
 %ghost %attr(0600, root, root) /boot/initramfs-%{KVERREL}%{?3:+%{3}}.img\
 %ghost %attr(0644, root, root) /boot/config-%{KVERREL}%{?3:+%{3}}\
@@ -3362,7 +3363,11 @@ fi
 %if %{1}\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\
 %endif\
-/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.*\
+/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.block\
+/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.drm\
+/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.modesetting\
+/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.networking\
+/lib/modules/%{KVERREL}%{?3:+%{3}}/modules.order\
 %{expand:%%files -f kernel-%{?3:%{3}-}modules.list %{?3:%{3}-}modules}\
 %{expand:%%files %{?3:%{3}-}devel}\
 %defverify(not mtime)\
@@ -3434,6 +3439,9 @@ fi
 #
 #
 %changelog
+* Mon Feb 27 2023 Herton R. Krzesinski <herton@redhat.com> [5.14.0-284.el9]
+- kernel.spec: move modules.builtin to kernel-core (Jan Stancek) [2172376]
+
 * Thu Feb 23 2023 Herton R. Krzesinski <herton@redhat.com> [5.14.0-283.el9]
 - redhat: fix duplicate jira issues in the resolves line (Herton R. Krzesinski)
 - redhat/kernel.spec.template: Parallelize compression (Herton R. Krzesinski)
diff --git a/sources b/sources
index fc4836fa2..73cad9145 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.14.0-283.el9.tar.xz) = caa86ddde813eb05177890fefd7ccff09ea3efec79c32c9440153fa5f51964cea6050b2f0d9355890603f18077feb2567cf5ed8e29383d9e54c2850fcc485060
-SHA512 (kernel-abi-stablelists-5.14.0-283.el9.tar.bz2) = a3ff29bb28d794524a354fc3bbb531c325b4e4cc585ae385f2aa09fe290813a88e8e8c533727e2c7913549a3e5a629981422292f4a0a57c382348aa6f4066adf
-SHA512 (kernel-kabi-dw-5.14.0-283.el9.tar.bz2) = 18c0552ed8d17a91ba246387f474eadb8631738c363bd6f1f3bfd97a2d90a5dc1f28b753988202953ece9c88497b0df46826da1b6d42e7e613bd4e9f4b4961bd
+SHA512 (linux-5.14.0-284.el9.tar.xz) = 692ee6af3a0c318564b2c3409f1f4630764ea882e1c2b683e5889871978fdf7e72f354cd592ac48ca4d4fc3203e3744e54383f7da1ffb4e9f535f85fa009f691
+SHA512 (kernel-abi-stablelists-5.14.0-284.el9.tar.bz2) = a0431acdb9560954aa7c48b5fd925acdf49d792da8d9bcd6ae6e824616bc468528f82814f16c459d56d994b9cc82dfc70c7c70d357441944a2a018b158326e26
+SHA512 (kernel-kabi-dw-5.14.0-284.el9.tar.bz2) = 99d618171c90ebe87b4b56b9b14e241c7004633c746907f2707a7fce8e30ba5c26cbca68d9913f91f6d91e0f247a7ac27b446a7034ac27e46ba1d87655d26bb4