summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-11-24 12:07:28 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-11-24 12:07:28 -0600
commit7407c59065c02c42da458b709229a66d105f90b8 (patch)
tree36a129bb1be0e12d468dc521c6d531a50c00d4b2
parent07ebe84e7e31faaf69c3ffbc7306dee6ff657b6c (diff)
downloadkernel-7407c59065c02c42da458b709229a66d105f90b8.tar.gz
kernel-7407c59065c02c42da458b709229a66d105f90b8.tar.xz
kernel-7407c59065c02c42da458b709229a66d105f90b8.zip
kernel-5.10.0-0.rc5.20201124gitd5beb3140f91.84
* 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>
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-aarch64-debug-rhel.config2
-rw-r--r--kernel-aarch64-rhel.config2
-rw-r--r--kernel-ppc64le-debug-rhel.config2
-rw-r--r--kernel-ppc64le-rhel.config2
-rw-r--r--kernel-s390x-debug-rhel.config2
-rw-r--r--kernel-s390x-rhel.config2
-rw-r--r--kernel-s390x-zfcpdump-rhel.config2
-rw-r--r--kernel-x86_64-debug-rhel.config2
-rw-r--r--kernel-x86_64-rhel.config2
-rw-r--r--kernel.spec21
-rw-r--r--sources6
12 files changed, 26 insertions, 21 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 5ce6cf364..1027d7289 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 = 82
+RHEL_RELEASE = 84
#
# Early y+1 numbering
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 7c4185b13..b5cb06211 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1068,7 +1068,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
CONFIG_DEBUG_FS=y
# 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_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 3b6b823d5..981bbc922 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1068,7 +1068,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
CONFIG_DEBUG_FS=y
# 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_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 86a16e1d4..2559d4a31 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -944,7 +944,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
CONFIG_DEBUG_FS=y
CONFIG_DEBUGGER=y
# 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_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 389050296..88fbd31d9 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -944,7 +944,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
CONFIG_DEBUG_FS=y
CONFIG_DEBUGGER=y
# 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_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index ec6309852..f23554800 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -951,7 +951,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
CONFIG_DEBUG_FS=y
# 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_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index ec84335c3..eb4142139 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -951,7 +951,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
CONFIG_DEBUG_FS=y
# 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_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index d45f576b8..e447c3568 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -958,7 +958,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
CONFIG_DEBUG_FS=y
# 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_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 7beec4bb7..23adce413 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -1004,7 +1004,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO 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_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index c974034a0..77aef7619 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -1004,7 +1004,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_GPIO 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_DWARF4=y
# CONFIG_DEBUG_INFO_REDUCED is not set
diff --git a/kernel.spec b/kernel.spec
index 7df6be682..dba8cd364 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -56,7 +56,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0
-%global distro_build 0.rc5.82
+%global distro_build 0.rc5.20201124gitd5beb3140f91.84
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -83,6 +83,8 @@ Summary: The Linux kernel
%if %{zipmodules}
%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
# define buildid .local
@@ -95,13 +97,13 @@ Summary: The Linux kernel
%endif
%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
%define patchlevel 10
# 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}
@@ -191,7 +193,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
# The kernel tarball/base version
%define kversion 5.10
@@ -592,7 +594,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.10-rc5.tar.xz
+Source0: linux-20201124gitd5beb3140f91.tar.xz
Source1: Makefile.rhelver
@@ -1236,8 +1238,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.10-rc5 -c
-mv linux-5.10-rc5 linux-%{KVERREL}
+%setup -q -n kernel-20201124gitd5beb3140f91 -c
+mv linux-20201124gitd5beb3140f91 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2063,7 +2065,7 @@ find Documentation -type d | xargs chmod u+w
fi \
fi \
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 \
%{nil}
@@ -2689,6 +2691,9 @@ fi
#
#
%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]
- Fedora config update ("Justin M. Forbes")
- redhat: generic enable CONFIG_INET_MPTCP_DIAG (Davide Caratti)
diff --git a/sources b/sources
index 2b9f71f7d..a62632bb2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.10-rc5.tar.xz) = 4c3eff9d401ae3d65be4244ffb8c33602029155fd63e586a7e6d027851c0b312ebaf00e40e251ab861a5d9ebb3595207f8631514e0c2dfbd436cca6628f87619
-SHA512 (kernel-abi-whitelists-5.10.0-0.rc5.82.tar.bz2) = 829163a114d9d4267c0d776c990fc81f84dc7f7ed2ca6181876f3e3c958d9bbd41a9f2d6a4b4bdaf2c9cd0b52a950e9a10a738b4e79eff3481fbfdd371b229fd
-SHA512 (kernel-kabi-dw-5.10.0-0.rc5.82.tar.bz2) = 3fb7b4324c718f6dc26d9bac376903fc71e7aa6bbd491ce9308fba8dc1ba1c96b848519324c66f26c68a75d174bb640f2d16132fb607f81c7960ece051ae5d14
+SHA512 (linux-20201124gitd5beb3140f91.tar.xz) = c9252bdbaabd177da1657f154857c4b832c4596c2a9e21cb54a2911877da3df56c3f800b7ea23f92185805ac495ba15a667ff67b795199f3c170974635f87045
+SHA512 (kernel-abi-whitelists-5.10.0-0.rc5.20201124gitd5beb3140f91.84.tar.bz2) = d0c437b362b29ffaf58bd7627564988b591a50f62884ff06d655139fb09b2302561ff9c172320dfd6e641dbc2f81b7f9ea840ab4b218cde994e2e5a55a2d80c5
+SHA512 (kernel-kabi-dw-5.10.0-0.rc5.20201124gitd5beb3140f91.84.tar.bz2) = b6a44113d97d3137809731d995e22fe3309377de3cea54cabbb8b65bfec969b0c3c69cb4355b3d16aad9c51129c74e1bd8cf4ccb8f0d9bba0208a84e598e4bab