diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-24 09:25:47 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-24 09:25:47 +0200 |
commit | f8b41dfa36d429d7bc87436133882c83af37fbff (patch) | |
tree | bfccf165aa371e75bfa39b7a5099f49327efb72b | |
parent | f8833ef86e1074f4dd167e42f04c2a82baf4a835 (diff) | |
parent | 04eef703932808421530062ca6f869bea56edd39 (diff) | |
download | kernel-f8b41dfa36d429d7bc87436133882c83af37fbff.tar.gz kernel-f8b41dfa36d429d7bc87436133882c83af37fbff.tar.xz kernel-f8b41dfa36d429d7bc87436133882c83af37fbff.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc2.20210723git8baef6386baa.26.vanilla.1.fc35kernel-5.14.0-0.rc2.20210723git8baef6386baa.26.vanilla.1.fc34kernel-5.14.0-0.rc2.20210723git8baef6386baa.26.vanilla.1.fc33
-rw-r--r-- | Makefile.rhelver | 2 | ||||
-rwxr-xr-x | kernel.spec | 56 | ||||
-rw-r--r-- | sources | 6 |
3 files changed, 37 insertions, 27 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index bee55fb24..b731697b0 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 = 24 +RHEL_RELEASE = 26 # # Early y+1 numbering diff --git a/kernel.spec b/kernel.spec index 09f2d9e78..b5858c41f 100755 --- a/kernel.spec +++ b/kernel.spec @@ -80,7 +80,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc2.20210721git8cae8cd89f05.24 +%global distro_build 0.rc2.20210723git8baef6386baa.26 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -126,13 +126,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 0.rc2.20210721git8cae8cd89f05.24 +%define pkgrelease 0.rc2.20210723git8baef6386baa.26 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20210721git8cae8cd89f05.24%{?buildid}%{?dist} +%define specrelease 0.rc2.20210723git8baef6386baa.26%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -673,7 +673,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14-rc2-1-g8cae8cd89f05.tar.xz +Source0: linux-5.14-rc2-169-g8baef6386baa.tar.xz Source1: Makefile.rhelver @@ -1358,8 +1358,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14-rc2-1-g8cae8cd89f05 -c -mv linux-5.14-rc2-1-g8cae8cd89f05 linux-%{KVERREL} +%setup -q -n kernel-5.14-rc2-169-g8baef6386baa -c +mv linux-5.14-rc2-169-g8baef6386baa linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -1979,10 +1979,16 @@ BuildKernel() { ( find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name '*.ko' | xargs /sbin/modinfo -l | \ grep -E -v 'GPL( v2)?$|Dual BSD/GPL$|Dual MPL/GPL$|GPL and additional rights$' ) && exit 1 - # remove files that will be auto generated by depmod at rpm -i time - pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/ - rm -f modules.{alias*,builtin.bin,dep*,*map,symbols*,devname,softdep} - popd + remove_depmod_files() + { + # remove files that will be auto generated by depmod at rpm -i time + pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/ + rm -f modules.{alias,alias.bin,builtin.alias.bin,builtin.bin} \ + modules.{dep,dep.bin,devname,softdep,symbols,symbols.bin} + popd + } + + remove_depmod_files # Identify modules in the kernel-modules-extras package %{SOURCE17} $RPM_BUILD_ROOT lib/modules/$KernelVer $RPM_SOURCE_DIR/mod-extra.list @@ -2034,10 +2040,7 @@ BuildKernel() { touch lib/modules/$KernelVer/modules.builtin fi - # remove files that will be auto generated by depmod at rpm -i time - pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/ - rm -f modules.{alias*,builtin.bin,dep*,*map,symbols*,devname,softdep} - popd + remove_depmod_files # Go back and find all of the various directories in the tree. We use this # for the dir lists in kernel-core @@ -2355,7 +2358,7 @@ find Documentation -type d | xargs chmod u+w cd linux-%{KVERREL} %if %{with_doc} -docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion} +docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease} # copy the source over mkdir -p $docdir @@ -2740,9 +2743,9 @@ fi %if %{with_doc} %files doc %defattr(-,root,root) -%{_datadir}/doc/kernel-doc-%{rpmversion}/Documentation/* -%dir %{_datadir}/doc/kernel-doc-%{rpmversion}/Documentation -%dir %{_datadir}/doc/kernel-doc-%{rpmversion} +%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/* +%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation +%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease} %endif %if %{with_perf} @@ -2886,13 +2889,13 @@ fi /lib/modules/%{KVERREL}%{?3:+%{3}}/dtb \ %ghost /%{image_install_path}/dtb-%{KVERREL}%{?3:+%{3}} \ %endif\ -%attr(600,root,root) /lib/modules/%{KVERREL}%{?3:+%{3}}/System.map\ -%ghost /boot/System.map-%{KVERREL}%{?3:+%{3}}\ +%attr(0600, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/System.map\ +%ghost %attr(0600, root, root) /boot/System.map-%{KVERREL}%{?3:+%{3}}\ /lib/modules/%{KVERREL}%{?3:+%{3}}/symvers.gz\ /lib/modules/%{KVERREL}%{?3:+%{3}}/config\ -%ghost /boot/symvers-%{KVERREL}%{?3:+%{3}}.gz\ -%ghost /boot/config-%{KVERREL}%{?3:+%{3}}\ -%ghost /boot/initramfs-%{KVERREL}%{?3:+%{3}}.img\ +%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}}\ %dir /lib/modules\ %dir /lib/modules/%{KVERREL}%{?3:+%{3}}\ %dir /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel\ @@ -2956,6 +2959,13 @@ fi # # %changelog +* Fri Jul 23 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc2.20210723git8baef6386baa.26] +- rpmspec: correct the ghost initramfs attributes (Herton R. Krzesinski) [1977056] +- rpmspec: amend removal of depmod created files to include modules.builtin.alias.bin (Herton R. Krzesinski) [1977056] +- configs: remove duplicate CONFIG_DRM_HYPERV file (Patrick Talbert) +- CI: use common code for merge and release (Don Zickus) +- rpmspec: add release string to kernel doc directory name (Jan Stancek) + * Wed Jul 21 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc2.20210721git8cae8cd89f05.24] - redhat/configs: Add CONFIG_INTEL_PMT_CRASHLOG (Michael Petlan) [1880486] - redhat/configs: Add CONFIG_INTEL_PMT_TELEMETRY (Michael Petlan) [1880486] @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.14.0-0.rc0.20210707git77d34a4683b0.12.tar.bz2) = 411f2a75d47633c61eb416d270a293d6965cf69b05fdada93480765da88185cea0378820f53b66fd405549374a5094868530f2451d1d2e6eda970afdc2d4bbb8 -SHA512 (linux-5.14-rc2-1-g8cae8cd89f05.tar.xz) = 974892a21f5ca8dfd64820dc7791ae15add8ba4dfa9c7974551ac694512435975975e26d5c85e5dc3ecbaf05a6b562639637ccd073163e4d99a0b6b8fac885da -SHA512 (kernel-abi-stablelists-5.14.0-0.rc2.20210721git8cae8cd89f05.24.tar.bz2) = e8128ee63b21e317b36a57f1c9f9a92efd3a6e5476b3fc0e3ba9b49023c32e24e4bf9581d71e203e955afc1fe16c7c411acfa377de9e1228ee502254d45a3b32 -SHA512 (kernel-kabi-dw-5.14.0-0.rc2.20210721git8cae8cd89f05.24.tar.bz2) = 91d65622db134adee50dde355cf91c2ee5bd62753a6f6c5d5ec853efa643580bf707dd0f5fa9fabbd26026ae970dbc9b8d3f34f9cfaf803700639107a34b5028 +SHA512 (linux-5.14-rc2-169-g8baef6386baa.tar.xz) = 7d8fef9d389ff73c9f9d2d69e9a36e212d8322c50bb5fac8cccc8a99090c4ff42530e60194640e53f876c35dca722edc27d70e47bb871ddf08c750db40d4da1c +SHA512 (kernel-abi-stablelists-5.14.0-0.rc2.20210723git8baef6386baa.26.tar.bz2) = 31fbe9f3f716a5c1624beb30afdb8cc514966677a05d2cdacdd935c525e610ce940fdd91723da94c6dc2292ca50793dba02405b33dea14ffd034c724181603ad +SHA512 (kernel-kabi-dw-5.14.0-0.rc2.20210723git8baef6386baa.26.tar.bz2) = 1e78931f07d48b1646b7eb244d449633b57a048946ccadc50134b1ffd2520f56f96ad15515623752e6b50ae3eae635d6ec2489e019ffd21d6bb98ab996e0060a |