rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel-5.10.0-0.rc5.20201124gitd5beb3140f91.84

Browse Source 
* Tue Nov 24 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc5.20201124gitd5beb3140f91.84]
- Temporarily backout parallel xz script ("Justin M. Forbes")
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2020-11-24 12:07:28 -06:00
parent 07ebe84e7e
commit 7407c59065
12 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
# #
# Use this spot to avoid future merge conflicts. # Use this spot to avoid future merge conflicts.
# Do not trim this comment. # Do not trim this comment.
RHEL_RELEASE = 82 RHEL_RELEASE = 84
# #
# Early y+1 numbering # Early y+1 numbering

2
kernel-aarch64-debug-rhel.config
View File

@ -1068,7 +1068,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set # CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
CONFIG_DEBUG_FS=y CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
CONFIG_DEBUG_INFO_DWARF4=y CONFIG_DEBUG_INFO_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set

2
kernel-aarch64-rhel.config
View File

@ -1068,7 +1068,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set # CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
CONFIG_DEBUG_FS=y CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
CONFIG_DEBUG_INFO_DWARF4=y CONFIG_DEBUG_INFO_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set

2
kernel-ppc64le-debug-rhel.config
View File

@ -944,7 +944,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
CONFIG_DEBUG_FS=y CONFIG_DEBUG_FS=y
CONFIG_DEBUGGER=y CONFIG_DEBUGGER=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
CONFIG_DEBUG_INFO_DWARF4=y CONFIG_DEBUG_INFO_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set

2
kernel-ppc64le-rhel.config
View File

@ -944,7 +944,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
CONFIG_DEBUG_FS=y CONFIG_DEBUG_FS=y
CONFIG_DEBUGGER=y CONFIG_DEBUGGER=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
CONFIG_DEBUG_INFO_DWARF4=y CONFIG_DEBUG_INFO_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set

2
kernel-s390x-debug-rhel.config
View File

@ -951,7 +951,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set # CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
CONFIG_DEBUG_FS=y CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
CONFIG_DEBUG_INFO_DWARF4=y CONFIG_DEBUG_INFO_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set

2
kernel-s390x-rhel.config
View File

@ -951,7 +951,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set # CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
CONFIG_DEBUG_FS=y CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
CONFIG_DEBUG_INFO_DWARF4=y CONFIG_DEBUG_INFO_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set

2
kernel-s390x-zfcpdump-rhel.config
View File

@ -958,7 +958,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set # CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
CONFIG_DEBUG_FS=y CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
CONFIG_DEBUG_INFO_DWARF4=y CONFIG_DEBUG_INFO_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set

2
kernel-x86_64-debug-rhel.config
View File

@ -1004,7 +1004,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
CONFIG_DEBUG_FS=y CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
CONFIG_DEBUG_INFO_DWARF4=y CONFIG_DEBUG_INFO_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set

2
kernel-x86_64-rhel.config
View File

@ -1004,7 +1004,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
CONFIG_DEBUG_FS=y CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_DEBUG_INFO_BTF is not set CONFIG_DEBUG_INFO_BTF=y
# CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set
CONFIG_DEBUG_INFO_DWARF4=y CONFIG_DEBUG_INFO_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_REDUCED is not set

21
kernel.spec
View File

@ -56,7 +56,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1. # For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0 %global released_kernel 0
%global distro_build 0.rc5.82 %global distro_build 0.rc5.20201124gitd5beb3140f91.84
%if 0%{?fedora} %if 0%{?fedora}
%define secure_boot_arch x86_64 %define secure_boot_arch x86_64
@ -83,6 +83,8 @@ Summary: The Linux kernel
%if %{zipmodules} %if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/' %global zipsed -e 's/\.ko$/\.ko.xz/'
# for parallel xz processes, replace with 1 to go back to single process
%global zcpu `nproc --all`
%endif %endif
# define buildid .local # define buildid .local
@ -95,13 +97,13 @@ Summary: The Linux kernel
%endif %endif
%define rpmversion 5.10.0 %define rpmversion 5.10.0
%define pkgrelease 0.rc5.82 %define pkgrelease 0.rc5.20201124gitd5beb3140f91.84
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 10 %define patchlevel 10
# allow pkg_release to have configurable %%{?dist} tag # allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc5.82%{?buildid}%{?dist} %define specrelease 0.rc5.20201124gitd5beb3140f91.84%{?buildid}%{?dist}
%define pkg_release %{specrelease} %define pkg_release %{specrelease}
@ -191,7 +193,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels) # Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels). # and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'. # See also 'make debug' and 'make release'.
%define debugbuildsenabled 1 %define debugbuildsenabled 0
# The kernel tarball/base version # The kernel tarball/base version
%define kversion 5.10 %define kversion 5.10
@ -592,7 +594,7 @@ BuildRequires: asciidoc
# exact git commit you can run # exact git commit you can run
# #
# xzcat -qq ${TARBALL} | git get-tar-commit-id # xzcat -qq ${TARBALL} | git get-tar-commit-id
Source0: linux-5.10-rc5.tar.xz Source0: linux-20201124gitd5beb3140f91.tar.xz
Source1: Makefile.rhelver Source1: Makefile.rhelver
@ -1236,8 +1238,8 @@ ApplyOptionalPatch()
fi fi
} }
%setup -q -n kernel-5.10-rc5 -c %setup -q -n kernel-20201124gitd5beb3140f91 -c
mv linux-5.10-rc5 linux-%{KVERREL} mv linux-20201124gitd5beb3140f91 linux-%{KVERREL}
cd linux-%{KVERREL} cd linux-%{KVERREL}
cp -a %{SOURCE1} . cp -a %{SOURCE1} .
@ -2063,7 +2065,7 @@ find Documentation -type d | xargs chmod u+w
fi \ fi \
fi \ fi \
if [ "%{zipmodules}" -eq "1" ]; then \ if [ "%{zipmodules}" -eq "1" ]; then \
find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | %{SOURCE79} %{?_smp_mflags}; \ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz; \
fi \ fi \
%{nil} %{nil}
@ -2689,6 +2691,9 @@ fi
# #
# #
%changelog %changelog
* Tue Nov 24 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc5.20201124gitd5beb3140f91.84]
- Temporarily backout parallel xz script ("Justin M. Forbes")
* Fri Nov 20 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201120git4d02da974ea8.81] * Fri Nov 20 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201120git4d02da974ea8.81]
- Fedora config update ("Justin M. Forbes") - Fedora config update ("Justin M. Forbes")
- redhat: generic enable CONFIG_INET_MPTCP_DIAG (Davide Caratti) - redhat: generic enable CONFIG_INET_MPTCP_DIAG (Davide Caratti)

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-5.10-rc5.tar.xz) = 4c3eff9d401ae3d65be4244ffb8c33602029155fd63e586a7e6d027851c0b312ebaf00e40e251ab861a5d9ebb3595207f8631514e0c2dfbd436cca6628f87619 SHA512 (linux-20201124gitd5beb3140f91.tar.xz) = c9252bdbaabd177da1657f154857c4b832c4596c2a9e21cb54a2911877da3df56c3f800b7ea23f92185805ac495ba15a667ff67b795199f3c170974635f87045
SHA512 (kernel-abi-whitelists-5.10.0-0.rc5.82.tar.bz2) = 829163a114d9d4267c0d776c990fc81f84dc7f7ed2ca6181876f3e3c958d9bbd41a9f2d6a4b4bdaf2c9cd0b52a950e9a10a738b4e79eff3481fbfdd371b229fd SHA512 (kernel-abi-whitelists-5.10.0-0.rc5.20201124gitd5beb3140f91.84.tar.bz2) = d0c437b362b29ffaf58bd7627564988b591a50f62884ff06d655139fb09b2302561ff9c172320dfd6e641dbc2f81b7f9ea840ab4b218cde994e2e5a55a2d80c5
SHA512 (kernel-kabi-dw-5.10.0-0.rc5.82.tar.bz2) = 3fb7b4324c718f6dc26d9bac376903fc71e7aa6bbd491ce9308fba8dc1ba1c96b848519324c66f26c68a75d174bb640f2d16132fb607f81c7960ece051ae5d14 SHA512 (kernel-kabi-dw-5.10.0-0.rc5.20201124gitd5beb3140f91.84.tar.bz2) = b6a44113d97d3137809731d995e22fe3309377de3cea54cabbb8b65bfec969b0c3c69cb4355b3d16aad9c51129c74e1bd8cf4ccb8f0d9bba0208a84e598e4bab