kernel-5.17-0.rc8.56e337f2cf13.123

* Wed Mar 16 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc8.56e337f2cf13.123] - redhat/Makefile: Reorganize variables (Prarit Bhargava) - redhat/Makefile: Add some descriptions (Prarit Bhargava) - redhat/Makefile: Move SNAPSHOT check (Prarit Bhargava) - redhat/Makefile: Deprecate BREW_FLAGS, KOJI_FLAGS, and TEST_FLAGS (Prarit Bhargava) - redhat/genspec.sh: Rework RPMVERSION variable (Prarit Bhargava) - redhat/Makefile: Remove dead comment (Prarit Bhargava) - redhat/Makefile: Cleanup KABI* variables. (Prarit Bhargava) - redhat/Makefile.variables: Default RHGITCOMMIT to HEAD (Prarit Bhargava) - redhat/scripts/create-tarball.sh: Use Makefile TARBALL variable (Prarit Bhargava) - redhat/Makefile: Remove extra DIST_BRANCH (Prarit Bhargava) - redhat/Makefile: Remove STAMP_VERSION (Prarit Bhargava) - redhat/Makefile: Move NO_CONFIGCHECKS to Makefile.variables (Prarit Bhargava) - redhat/Makefile: Move RHJOBS to Makefile.variables (Prarit Bhargava) - redhat/Makefile: Move RHGIT* variables to Makefile.variables (Prarit Bhargava) - redhat/Makefile: Move PREBUILD_GIT_ONLY to Makefile.variables (Prarit Bhargava) - redhat/Makefile: Move BUILD to Makefile.variables (Prarit Bhargava) - redhat/Makefile: Move BUILD_FLAGS to Makefile.variables. (Prarit Bhargava) - redhat/Makefile: Move BUILD_PROFILE to Makefile.variables (Prarit Bhargava) - redhat/Makefile: Move BUILD_TARGET and BUILD_SCRATCH_TARGET to Makefile.variables (Prarit Bhargava) - redhat/Makefile: Remove RHPRODUCT variable (Prarit Bhargava) - redhat/Makefile: Cleanup DISTRO variable (Prarit Bhargava) - redhat/Makefile: Move HEAD to Makefile.variables. (Prarit Bhargava) - redhat: Combine Makefile and Makefile.common (Prarit Bhargava) - redhat/koji/Makefile: Decouple koji Makefile from Makefile.common (Prarit Bhargava) - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2022-03-16 09:23:47 -05:00 · 2022-03-16 09:23:47 -05:00 · dab93b00b0
parent 0265290bb3
commit dab93b00b0
19 changed files with 73 additions and 32 deletions
--- 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 = 123
+RHEL_RELEASE = 124

 #
 # Early y+1 numbering
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@ -1,5 +1,5 @@
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/7b66f762ded9086774c6393b7a77ff2566757bae
- 7b66f762ded9086774c6393b7a77ff2566757bae mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/764959c3db54fee825430eb2764be7f127419dd9
+ 764959c3db54fee825430eb2764be7f127419dd9 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning

 "https://gitlab.com/cki-project/kernel-ark/-/commit"/4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b
 4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b objtool: check: give big enough buffer for pv_ops
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@ -8209,7 +8209,7 @@ CONFIG_VCNL3020=m
 CONFIG_VCNL4000=m
 CONFIG_VCNL4035=m
 CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
 CONFIG_VDPA_SIM=m
 CONFIG_VDPA_SIM_NET=m
 CONFIG_VDPA_USER=m
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@ -8182,7 +8182,7 @@ CONFIG_VCNL3020=m
 CONFIG_VCNL4000=m
 CONFIG_VCNL4035=m
 CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
 CONFIG_VDPA_SIM=m
 CONFIG_VDPA_SIM_NET=m
 CONFIG_VDPA_USER=m
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@ -8431,7 +8431,7 @@ CONFIG_VCNL3020=m
 # CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
 CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
 CONFIG_VDPA_SIM=m
 CONFIG_VDPA_SIM_NET=m
 CONFIG_VDPA_USER=m
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@ -8405,7 +8405,7 @@ CONFIG_VCNL3020=m
 # CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
 CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
 CONFIG_VDPA_SIM=m
 CONFIG_VDPA_SIM_NET=m
 CONFIG_VDPA_USER=m
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@ -8186,7 +8186,7 @@ CONFIG_VCNL3020=m
 # CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
 CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
 CONFIG_VDPA_SIM=m
 CONFIG_VDPA_SIM_NET=m
 CONFIG_VDPA_USER=m
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@ -8160,7 +8160,7 @@ CONFIG_VCNL3020=m
 # CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
 CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
 CONFIG_VDPA_SIM=m
 CONFIG_VDPA_SIM_NET=m
 CONFIG_VDPA_USER=m
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@ -7348,7 +7348,7 @@ CONFIG_VCNL3020=m
 # CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
 CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
 CONFIG_VDPA_SIM=m
 CONFIG_VDPA_SIM_NET=m
 CONFIG_VDPA_USER=m
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@ -7322,7 +7322,7 @@ CONFIG_VCNL3020=m
 # CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
 CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
 CONFIG_VDPA_SIM=m
 CONFIG_VDPA_SIM_NET=m
 CONFIG_VDPA_USER=m
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@ -7017,7 +7017,7 @@ CONFIG_VCNL3020=m
 # CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
 CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
 CONFIG_VDPA_SIM=m
 CONFIG_VDPA_SIM_NET=m
 CONFIG_VDPA_USER=m
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@ -6990,7 +6990,7 @@ CONFIG_VCNL3020=m
 # CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
 CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
 CONFIG_VDPA_SIM=m
 CONFIG_VDPA_SIM_NET=m
 CONFIG_VDPA_USER=m
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@ -6970,7 +6970,7 @@ CONFIG_VCNL3020=m
 # CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
 CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
 CONFIG_VDPA_SIM=m
 CONFIG_VDPA_SIM_NET=m
 CONFIG_VDPA_USER=m
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@ -6943,7 +6943,7 @@ CONFIG_VCNL3020=m
 # CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
 CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
 CONFIG_VDPA_SIM=m
 CONFIG_VDPA_SIM_NET=m
 CONFIG_VDPA_USER=m
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@ -7407,7 +7407,7 @@ CONFIG_VCNL3020=m
 # CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
 CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
 CONFIG_VDPA_SIM=m
 CONFIG_VDPA_SIM_NET=m
 CONFIG_VDPA_USER=m
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@ -7381,7 +7381,7 @@ CONFIG_VCNL3020=m
 # CONFIG_VCNL4000 is not set
 CONFIG_VCNL4035=m
 CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
 CONFIG_VDPA_SIM=m
 CONFIG_VDPA_SIM_NET=m
 CONFIG_VDPA_USER=m
--- a/kernel.spec
+++ b/kernel.spec
@ -85,9 +85,9 @@ 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

-%global distro_build 0.rc8.123
+%global distro_build 0.rc8.20220316git56e337f2cf13.124

 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@ -132,13 +132,13 @@ Summary: The Linux kernel

 %define rpmversion 5.17.0
 %define patchversion 5.17
-%define pkgrelease 0.rc8.123
+%define pkgrelease 0.rc8.20220316git56e337f2cf13.124

 # This is needed to do merge window version magic
 %define patchlevel 17

 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc8.123%{?buildid}%{?dist}
+%define specrelease 0.rc8.20220316git56e337f2cf13.124%{?buildid}%{?dist}

 %define pkg_release %{specrelease}

@ -695,7 +695,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17-rc8.tar.xz
+Source0: linux-5.17-rc8-3-g56e337f2cf13.tar.xz

 Source1: Makefile.rhelver

@ -1391,8 +1391,8 @@ ApplyOptionalPatch()
  fi
 }

-%setup -q -n kernel-5.17-rc8 -c
-mv linux-5.17-rc8 linux-%{KVERREL}
+%setup -q -n kernel-5.17-rc8-3-g56e337f2cf13 -c
+mv linux-5.17-rc8-3-g56e337f2cf13 linux-%{KVERREL}

 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@ -2684,9 +2684,20 @@ fi\
 %define kernel_modules_post() \
 %{expand:%%post %{?1:%{1}-}modules}\
 /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
+if [ ! -f %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{1}} ]; then\
+	mkdir -p %{_localstatedir}/lib/rpm-state/%{name}\
+	touch %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{KVERREL}%{?1:+%{1}}\
+fi\
 %{nil}\
 %{expand:%%postun %{?1:%{1}-}modules}\
 /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
+%{nil}\
+%{expand:%%posttrans %{?1:%{1}-}modules}\
+if [ -f %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{KVERREL}%{?1:+%{1}} ]; then\
+	rm -f %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{KVERREL}%{?1:+%{1}}\
+	echo "Running: dracut -f --kver %{KVERREL}%{?1:+%{1}}"\
+	dracut -f --kver "%{KVERREL}%{?1:+%{1}}" || exit $?\
+fi\
 %{nil}

 # This macro defines a %%posttrans script for a kernel package.
@ -2701,6 +2712,7 @@ then\
    %{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\
 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 $?\
 %{nil}

@ -2721,6 +2733,8 @@ if [ `uname -i` == "x86_64" -o `uname -i` == "i386" ] &&\
   [ -f /etc/sysconfig/kernel ]; then\
  /bin/sed -r -i -e 's/^DEFAULTKERNEL=%{-r*}$/DEFAULTKERNEL=kernel%{?-v:-%{-v*}}/' /etc/sysconfig/kernel || exit $?\
 fi}\
+mkdir -p %{_localstatedir}/lib/rpm-state/%{name}\
+touch %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{1}}\
 %{nil}

 #
@ -3005,9 +3019,37 @@ fi
 #
 #
 %changelog
-* Mon Mar 14 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc8.123]
+* Wed Mar 16 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc8.56e337f2cf13.123]
+- redhat/Makefile: Reorganize variables (Prarit Bhargava)
+- redhat/Makefile: Add some descriptions (Prarit Bhargava)
+- redhat/Makefile: Move SNAPSHOT check (Prarit Bhargava)
+- redhat/Makefile: Deprecate BREW_FLAGS, KOJI_FLAGS, and TEST_FLAGS (Prarit Bhargava)
+- redhat/genspec.sh: Rework RPMVERSION variable (Prarit Bhargava)
+- redhat/Makefile: Remove dead comment (Prarit Bhargava)
+- redhat/Makefile: Cleanup KABI* variables. (Prarit Bhargava)
+- redhat/Makefile.variables: Default RHGITCOMMIT to HEAD (Prarit Bhargava)
+- redhat/scripts/create-tarball.sh: Use Makefile TARBALL variable (Prarit Bhargava)
+- redhat/Makefile: Remove extra DIST_BRANCH (Prarit Bhargava)
+- redhat/Makefile: Remove STAMP_VERSION (Prarit Bhargava)
+- redhat/Makefile: Move NO_CONFIGCHECKS to Makefile.variables (Prarit Bhargava)
+- redhat/Makefile: Move RHJOBS to Makefile.variables (Prarit Bhargava)
+- redhat/Makefile: Move RHGIT* variables to Makefile.variables (Prarit Bhargava)
+- redhat/Makefile: Move PREBUILD_GIT_ONLY to Makefile.variables (Prarit Bhargava)
+- redhat/Makefile: Move BUILD to Makefile.variables (Prarit Bhargava)
+- redhat/Makefile: Move BUILD_FLAGS to Makefile.variables. (Prarit Bhargava)
+- redhat/Makefile: Move BUILD_PROFILE to Makefile.variables (Prarit Bhargava)
+- redhat/Makefile: Move BUILD_TARGET and BUILD_SCRATCH_TARGET to Makefile.variables (Prarit Bhargava)
+- redhat/Makefile: Remove RHPRODUCT variable (Prarit Bhargava)
+- redhat/Makefile: Cleanup DISTRO variable (Prarit Bhargava)
+- redhat/Makefile: Move HEAD to Makefile.variables. (Prarit Bhargava)
+- redhat: Combine Makefile and Makefile.common (Prarit Bhargava)
+- redhat/koji/Makefile: Decouple koji Makefile from Makefile.common (Prarit Bhargava)
 - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long)

+* Wed Mar 16 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc8.56e337f2cf13.123]
+- Add asus_wmi_sensors modules to filters for Fedora (Justin M. Forbes)
+- redhat: spec: trigger dracut when modules are installed separately (Jan Stancek)
+
 * Sat Mar 12 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc7.68453767131a.120]
 - Last of the Fedora 5.17 configs initial pass (Justin M. Forbes)
 - redhat/Makefile: Silence dist-clean-configs output (Prarit Bhargava)
--- a/process_configs.sh
+++ b/process_configs.sh
@ -388,16 +388,15 @@ done
 PACKAGE_NAME="${1:-kernel}" # defines the package name used
 KVERREL="$(test -n "$2" && echo "-$2" || echo "")"
 SUBARCH="$(test -n "$3" && echo "-$3" || echo "")"
-FLAVOR="$(test -n "$4" && echo "-$4" || echo "-common")"
+FLAVOR="$(test -n "$4" && echo "-$4" || echo "-ark")"
 RHJOBS="$(test -n "$5" && echo "$5" || nproc --all)"
 SCRIPT=$(readlink -f "$0")
 SCRIPT_DIR=$(dirname "$SCRIPT")

-# Most RHEL options are options we want in Fedora so RHEL pending settings head
-# to common/
+# Config options for RHEL should target the pending-ark directory, not pending-common.
 if [ "$FLAVOR" = "-rhel" ]
 then
-	FLAVOR="-common"
+	FLAVOR="-ark"
 fi

 # to handle this script being a symlink
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-5.17-rc8.tar.xz) = 41568d2b3acd6dc06e183416a7d822ebd90d34b1a212f92ca605681bd4385251140fa9c3cabcf7cd355812d3df10842dbd28fc4f60c2d73394ed251f3c93a831
-SHA512 (kernel-abi-stablelists-5.17.0-0.rc8.123.tar.bz2) = cf5c762a3289272fce64537995634c0d0e0059c17c5f9bc7242e4929f75baf2cad5bbccbff747a1d59221e6ac48d70ed17dc75d85127faa9522160be35b3e1b3
-SHA512 (kernel-kabi-dw-5.17.0-0.rc8.123.tar.bz2) = 92963bb7533e17f518ee5ce95ead2db01b37195572b3da8589f6b5c750d45d086787becc98621e5c3c52d1037eea5f47ba5591be4c75d2d2d390f5de400a8d6a
+SHA512 (linux-5.17-rc8-3-g56e337f2cf13.tar.xz) = 35241db1e9705bc09f329376e9004371c6f9c3e0ec532a2f96fd541cbd020c6d8cbfbe896a9c455388e17478ba1d5a4ef40a189d7cb8d2f2a33e302daeddf1cf
+SHA512 (kernel-abi-stablelists-5.17.0-0.rc8.20220316git56e337f2cf13.124.tar.bz2) = 1edfff7bbe764c1eaa67c0349861354b27b94ccf3583ba8d53177ad31edf0aa335200ed762d963c060ea98031f7038e072d399d1bab1bbdacd88643b48c69481
+SHA512 (kernel-kabi-dw-5.17.0-0.rc8.20220316git56e337f2cf13.124.tar.bz2) = ea0e9474021efe7b734ad2d2ba7c2e87f6e8abf52397d27d2957574a0d06ad7fbc9245b01a9892f694936365e15482b1be089a73f0e2cacaea3605873ea571c8