summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-07-23 09:33:54 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-07-23 09:33:54 -0500
commit04eef703932808421530062ca6f869bea56edd39 (patch)
treec2fb7fa0fcd34d3478bf2a6ccdf78bfde172782a
parent93915e89855138923a859e6e792c3ff8a656a482 (diff)
downloadkernel-04eef703932808421530062ca6f869bea56edd39.zip
kernel-04eef703932808421530062ca6f869bea56edd39.tar.gz
kernel-04eef703932808421530062ca6f869bea56edd39.tar.xz
kernel-5.14.0-0.rc2.20210723git8baef6386baa.26
* 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) Resolves: rhbz#1977056 Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Makefile.rhelver2
-rwxr-xr-xkernel.spec56
-rw-r--r--sources6
3 files changed, 37 insertions, 27 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index a8e2c98..b731697 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 = 25
+RHEL_RELEASE = 26
#
# Early y+1 numbering
diff --git a/kernel.spec b/kernel.spec
index 5b30960..6c9c4f9 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -80,7 +80,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%global distro_build 0.rc2.20210722git3d5895cd3517.25
+%global distro_build 0.rc2.20210723git8baef6386baa.26
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -124,13 +124,13 @@ Summary: The Linux kernel
%define kversion 5.14
%define rpmversion 5.14.0
-%define pkgrelease 0.rc2.20210722git3d5895cd3517.25
+%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.20210722git3d5895cd3517.25%{?buildid}%{?dist}
+%define specrelease 0.rc2.20210723git8baef6386baa.26%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -671,7 +671,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.14-rc2-34-g3d5895cd3517.tar.xz
+Source0: linux-5.14-rc2-169-g8baef6386baa.tar.xz
Source1: Makefile.rhelver
@@ -1356,8 +1356,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.14-rc2-34-g3d5895cd3517 -c
-mv linux-5.14-rc2-34-g3d5895cd3517 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} .
@@ -1977,10 +1977,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
@@ -2032,10 +2038,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
@@ -2349,7 +2352,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
@@ -2734,9 +2737,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}
@@ -2880,13 +2883,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\
@@ -2950,6 +2953,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]
diff --git a/sources b/sources
index 2ec878d..9f34bd8 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (kernel-abi-whitelists-5.14.0-0.rc0.20210707git77d34a4683b0.12.tar.bz2) = 411f2a75d47633c61eb416d270a293d6965cf69b05fdada93480765da88185cea0378820f53b66fd405549374a5094868530f2451d1d2e6eda970afdc2d4bbb8
-SHA512 (linux-5.14-rc2-34-g3d5895cd3517.tar.xz) = 6c5c6da88605d0075dd330d6675c1c13a253733ae6824c79112b0c3e1ea1390b0e71fa69145aa03a1b8c5db6c2f5a7653b0428470e903d162c3cbdad53e09294
-SHA512 (kernel-abi-stablelists-5.14.0-0.rc2.20210722git3d5895cd3517.25.tar.bz2) = 81222edbbad8d5d827146fe632310429abe873e02de59ec38577b72a8c5e72bf58071fffa8cf78dec5cb37cbad6afd24e29c4afb1a59a244746c7f7bf2604cc0
-SHA512 (kernel-kabi-dw-5.14.0-0.rc2.20210722git3d5895cd3517.25.tar.bz2) = 1f1c62696c1af44f1bd4cce44f16f6dc6a27831a4e3fc89e276c4eac0fcb059ce8bbe532b5c7d38975d2d85e62f5f4418b8a32690506b55bcebd4f333b8cdc80
+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