kernel-6.2.0-0.rc5.20230124git7bf70dbb1882.39
* Tue Jan 24 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc5.7bf70dbb1882.39] - Turn off forced debug builds (Justin M. Forbes) - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus) Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
parent
e881aef837
commit
103b0e263c
@ -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 = 38
|
RHEL_RELEASE = 39
|
||||||
|
|
||||||
#
|
#
|
||||||
# ZSTREAM
|
# ZSTREAM
|
||||||
|
@ -348,7 +348,7 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
|
|||||||
# CONFIG_ARM_CCI_PMU is not set
|
# CONFIG_ARM_CCI_PMU is not set
|
||||||
CONFIG_ARM_CCN=y
|
CONFIG_ARM_CCN=y
|
||||||
CONFIG_ARM_CMN=m
|
CONFIG_ARM_CMN=m
|
||||||
CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=y
|
CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
|
||||||
CONFIG_ARM_CPUIDLE=y
|
CONFIG_ARM_CPUIDLE=y
|
||||||
CONFIG_ARM_DMC620_PMU=m
|
CONFIG_ARM_DMC620_PMU=m
|
||||||
CONFIG_ARM_DSU_PMU=m
|
CONFIG_ARM_DSU_PMU=m
|
||||||
@ -4967,7 +4967,7 @@ CONFIG_RV_REACT_PANIC=y
|
|||||||
CONFIG_RV_REACT_PRINTK=y
|
CONFIG_RV_REACT_PRINTK=y
|
||||||
CONFIG_RV=y
|
CONFIG_RV=y
|
||||||
CONFIG_RXKAD=y
|
CONFIG_RXKAD=y
|
||||||
# CONFIG_RXPERF is not set
|
CONFIG_RXPERF=m
|
||||||
# CONFIG_S390_KPROBES_SANITY_TEST is not set
|
# CONFIG_S390_KPROBES_SANITY_TEST is not set
|
||||||
# CONFIG_S390_MODULES_SANITY_TEST is not set
|
# CONFIG_S390_MODULES_SANITY_TEST is not set
|
||||||
# CONFIG_SAMPLES is not set
|
# CONFIG_SAMPLES is not set
|
||||||
@ -5117,7 +5117,7 @@ CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
|
|||||||
CONFIG_SECURITY_LOCKDOWN_LSM=y
|
CONFIG_SECURITY_LOCKDOWN_LSM=y
|
||||||
CONFIG_SECURITY_NETWORK_XFRM=y
|
CONFIG_SECURITY_NETWORK_XFRM=y
|
||||||
CONFIG_SECURITY_NETWORK=y
|
CONFIG_SECURITY_NETWORK=y
|
||||||
# CONFIG_SECURITY_PATH is not set
|
CONFIG_SECURITY_PATH=y
|
||||||
# CONFIG_SECURITY_SAFESETID is not set
|
# CONFIG_SECURITY_SAFESETID is not set
|
||||||
CONFIG_SECURITY_SELINUX_AVC_STATS=y
|
CONFIG_SECURITY_SELINUX_AVC_STATS=y
|
||||||
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
||||||
|
@ -348,7 +348,7 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
|
|||||||
# CONFIG_ARM_CCI_PMU is not set
|
# CONFIG_ARM_CCI_PMU is not set
|
||||||
CONFIG_ARM_CCN=y
|
CONFIG_ARM_CCN=y
|
||||||
CONFIG_ARM_CMN=m
|
CONFIG_ARM_CMN=m
|
||||||
CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=y
|
CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
|
||||||
CONFIG_ARM_CPUIDLE=y
|
CONFIG_ARM_CPUIDLE=y
|
||||||
CONFIG_ARM_DMC620_PMU=m
|
CONFIG_ARM_DMC620_PMU=m
|
||||||
CONFIG_ARM_DSU_PMU=m
|
CONFIG_ARM_DSU_PMU=m
|
||||||
@ -4944,7 +4944,7 @@ CONFIG_RV_REACT_PANIC=y
|
|||||||
CONFIG_RV_REACT_PRINTK=y
|
CONFIG_RV_REACT_PRINTK=y
|
||||||
CONFIG_RV=y
|
CONFIG_RV=y
|
||||||
CONFIG_RXKAD=y
|
CONFIG_RXKAD=y
|
||||||
# CONFIG_RXPERF is not set
|
CONFIG_RXPERF=m
|
||||||
# CONFIG_S390_KPROBES_SANITY_TEST is not set
|
# CONFIG_S390_KPROBES_SANITY_TEST is not set
|
||||||
# CONFIG_S390_MODULES_SANITY_TEST is not set
|
# CONFIG_S390_MODULES_SANITY_TEST is not set
|
||||||
# CONFIG_SAMPLES is not set
|
# CONFIG_SAMPLES is not set
|
||||||
@ -5094,7 +5094,7 @@ CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
|
|||||||
CONFIG_SECURITY_LOCKDOWN_LSM=y
|
CONFIG_SECURITY_LOCKDOWN_LSM=y
|
||||||
CONFIG_SECURITY_NETWORK_XFRM=y
|
CONFIG_SECURITY_NETWORK_XFRM=y
|
||||||
CONFIG_SECURITY_NETWORK=y
|
CONFIG_SECURITY_NETWORK=y
|
||||||
# CONFIG_SECURITY_PATH is not set
|
CONFIG_SECURITY_PATH=y
|
||||||
# CONFIG_SECURITY_SAFESETID is not set
|
# CONFIG_SECURITY_SAFESETID is not set
|
||||||
CONFIG_SECURITY_SELINUX_AVC_STATS=y
|
CONFIG_SECURITY_SELINUX_AVC_STATS=y
|
||||||
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
||||||
|
@ -4726,7 +4726,7 @@ CONFIG_RV_REACT_PANIC=y
|
|||||||
CONFIG_RV_REACT_PRINTK=y
|
CONFIG_RV_REACT_PRINTK=y
|
||||||
CONFIG_RV=y
|
CONFIG_RV=y
|
||||||
CONFIG_RXKAD=y
|
CONFIG_RXKAD=y
|
||||||
# CONFIG_RXPERF is not set
|
CONFIG_RXPERF=m
|
||||||
# CONFIG_S390_KPROBES_SANITY_TEST is not set
|
# CONFIG_S390_KPROBES_SANITY_TEST is not set
|
||||||
# CONFIG_S390_MODULES_SANITY_TEST is not set
|
# CONFIG_S390_MODULES_SANITY_TEST is not set
|
||||||
# CONFIG_SAMPLES is not set
|
# CONFIG_SAMPLES is not set
|
||||||
@ -4879,7 +4879,7 @@ CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
|
|||||||
CONFIG_SECURITY_LOCKDOWN_LSM=y
|
CONFIG_SECURITY_LOCKDOWN_LSM=y
|
||||||
CONFIG_SECURITY_NETWORK_XFRM=y
|
CONFIG_SECURITY_NETWORK_XFRM=y
|
||||||
CONFIG_SECURITY_NETWORK=y
|
CONFIG_SECURITY_NETWORK=y
|
||||||
# CONFIG_SECURITY_PATH is not set
|
CONFIG_SECURITY_PATH=y
|
||||||
# CONFIG_SECURITY_SAFESETID is not set
|
# CONFIG_SECURITY_SAFESETID is not set
|
||||||
CONFIG_SECURITY_SELINUX_AVC_STATS=y
|
CONFIG_SECURITY_SELINUX_AVC_STATS=y
|
||||||
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
||||||
|
@ -4705,7 +4705,7 @@ CONFIG_RV_REACT_PANIC=y
|
|||||||
CONFIG_RV_REACT_PRINTK=y
|
CONFIG_RV_REACT_PRINTK=y
|
||||||
CONFIG_RV=y
|
CONFIG_RV=y
|
||||||
CONFIG_RXKAD=y
|
CONFIG_RXKAD=y
|
||||||
# CONFIG_RXPERF is not set
|
CONFIG_RXPERF=m
|
||||||
# CONFIG_S390_KPROBES_SANITY_TEST is not set
|
# CONFIG_S390_KPROBES_SANITY_TEST is not set
|
||||||
# CONFIG_S390_MODULES_SANITY_TEST is not set
|
# CONFIG_S390_MODULES_SANITY_TEST is not set
|
||||||
# CONFIG_SAMPLES is not set
|
# CONFIG_SAMPLES is not set
|
||||||
@ -4858,7 +4858,7 @@ CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
|
|||||||
CONFIG_SECURITY_LOCKDOWN_LSM=y
|
CONFIG_SECURITY_LOCKDOWN_LSM=y
|
||||||
CONFIG_SECURITY_NETWORK_XFRM=y
|
CONFIG_SECURITY_NETWORK_XFRM=y
|
||||||
CONFIG_SECURITY_NETWORK=y
|
CONFIG_SECURITY_NETWORK=y
|
||||||
# CONFIG_SECURITY_PATH is not set
|
CONFIG_SECURITY_PATH=y
|
||||||
# CONFIG_SECURITY_SAFESETID is not set
|
# CONFIG_SECURITY_SAFESETID is not set
|
||||||
CONFIG_SECURITY_SELINUX_AVC_STATS=y
|
CONFIG_SECURITY_SELINUX_AVC_STATS=y
|
||||||
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
||||||
|
@ -4664,7 +4664,7 @@ CONFIG_RV_REACT_PANIC=y
|
|||||||
CONFIG_RV_REACT_PRINTK=y
|
CONFIG_RV_REACT_PRINTK=y
|
||||||
CONFIG_RV=y
|
CONFIG_RV=y
|
||||||
CONFIG_RXKAD=y
|
CONFIG_RXKAD=y
|
||||||
# CONFIG_RXPERF is not set
|
CONFIG_RXPERF=m
|
||||||
CONFIG_S390_AP_IOMMU=y
|
CONFIG_S390_AP_IOMMU=y
|
||||||
CONFIG_S390_CCW_IOMMU=y
|
CONFIG_S390_CCW_IOMMU=y
|
||||||
CONFIG_S390_GUEST=y
|
CONFIG_S390_GUEST=y
|
||||||
@ -4863,7 +4863,7 @@ CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
|
|||||||
CONFIG_SECURITY_LOCKDOWN_LSM=y
|
CONFIG_SECURITY_LOCKDOWN_LSM=y
|
||||||
CONFIG_SECURITY_NETWORK_XFRM=y
|
CONFIG_SECURITY_NETWORK_XFRM=y
|
||||||
CONFIG_SECURITY_NETWORK=y
|
CONFIG_SECURITY_NETWORK=y
|
||||||
# CONFIG_SECURITY_PATH is not set
|
CONFIG_SECURITY_PATH=y
|
||||||
# CONFIG_SECURITY_SAFESETID is not set
|
# CONFIG_SECURITY_SAFESETID is not set
|
||||||
CONFIG_SECURITY_SELINUX_AVC_STATS=y
|
CONFIG_SECURITY_SELINUX_AVC_STATS=y
|
||||||
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
||||||
|
@ -4643,7 +4643,7 @@ CONFIG_RV_REACT_PANIC=y
|
|||||||
CONFIG_RV_REACT_PRINTK=y
|
CONFIG_RV_REACT_PRINTK=y
|
||||||
CONFIG_RV=y
|
CONFIG_RV=y
|
||||||
CONFIG_RXKAD=y
|
CONFIG_RXKAD=y
|
||||||
# CONFIG_RXPERF is not set
|
CONFIG_RXPERF=m
|
||||||
CONFIG_S390_AP_IOMMU=y
|
CONFIG_S390_AP_IOMMU=y
|
||||||
CONFIG_S390_CCW_IOMMU=y
|
CONFIG_S390_CCW_IOMMU=y
|
||||||
CONFIG_S390_GUEST=y
|
CONFIG_S390_GUEST=y
|
||||||
@ -4842,7 +4842,7 @@ CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
|
|||||||
CONFIG_SECURITY_LOCKDOWN_LSM=y
|
CONFIG_SECURITY_LOCKDOWN_LSM=y
|
||||||
CONFIG_SECURITY_NETWORK_XFRM=y
|
CONFIG_SECURITY_NETWORK_XFRM=y
|
||||||
CONFIG_SECURITY_NETWORK=y
|
CONFIG_SECURITY_NETWORK=y
|
||||||
# CONFIG_SECURITY_PATH is not set
|
CONFIG_SECURITY_PATH=y
|
||||||
# CONFIG_SECURITY_SAFESETID is not set
|
# CONFIG_SECURITY_SAFESETID is not set
|
||||||
CONFIG_SECURITY_SELINUX_AVC_STATS=y
|
CONFIG_SECURITY_SELINUX_AVC_STATS=y
|
||||||
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
||||||
|
@ -4659,7 +4659,7 @@ CONFIG_RV_REACT_PANIC=y
|
|||||||
CONFIG_RV_REACT_PRINTK=y
|
CONFIG_RV_REACT_PRINTK=y
|
||||||
CONFIG_RV=y
|
CONFIG_RV=y
|
||||||
CONFIG_RXKAD=y
|
CONFIG_RXKAD=y
|
||||||
# CONFIG_RXPERF is not set
|
CONFIG_RXPERF=m
|
||||||
CONFIG_S390_AP_IOMMU=y
|
CONFIG_S390_AP_IOMMU=y
|
||||||
CONFIG_S390_CCW_IOMMU=y
|
CONFIG_S390_CCW_IOMMU=y
|
||||||
# CONFIG_S390_GUEST is not set
|
# CONFIG_S390_GUEST is not set
|
||||||
@ -4862,7 +4862,7 @@ CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
|
|||||||
CONFIG_SECURITY_LOCKDOWN_LSM=y
|
CONFIG_SECURITY_LOCKDOWN_LSM=y
|
||||||
CONFIG_SECURITY_NETWORK_XFRM=y
|
CONFIG_SECURITY_NETWORK_XFRM=y
|
||||||
CONFIG_SECURITY_NETWORK=y
|
CONFIG_SECURITY_NETWORK=y
|
||||||
# CONFIG_SECURITY_PATH is not set
|
CONFIG_SECURITY_PATH=y
|
||||||
# CONFIG_SECURITY_SAFESETID is not set
|
# CONFIG_SECURITY_SAFESETID is not set
|
||||||
CONFIG_SECURITY_SELINUX_AVC_STATS=y
|
CONFIG_SECURITY_SELINUX_AVC_STATS=y
|
||||||
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
||||||
|
@ -4896,7 +4896,7 @@ CONFIG_RV_REACT_PANIC=y
|
|||||||
CONFIG_RV_REACT_PRINTK=y
|
CONFIG_RV_REACT_PRINTK=y
|
||||||
CONFIG_RV=y
|
CONFIG_RV=y
|
||||||
CONFIG_RXKAD=y
|
CONFIG_RXKAD=y
|
||||||
# CONFIG_RXPERF is not set
|
CONFIG_RXPERF=m
|
||||||
# CONFIG_S390_KPROBES_SANITY_TEST is not set
|
# CONFIG_S390_KPROBES_SANITY_TEST is not set
|
||||||
# CONFIG_S390_MODULES_SANITY_TEST is not set
|
# CONFIG_S390_MODULES_SANITY_TEST is not set
|
||||||
# CONFIG_SAMPLE_ANDROID_BINDERFS is not set
|
# CONFIG_SAMPLE_ANDROID_BINDERFS is not set
|
||||||
@ -5078,7 +5078,7 @@ CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
|
|||||||
CONFIG_SECURITY_LOCKDOWN_LSM=y
|
CONFIG_SECURITY_LOCKDOWN_LSM=y
|
||||||
CONFIG_SECURITY_NETWORK_XFRM=y
|
CONFIG_SECURITY_NETWORK_XFRM=y
|
||||||
CONFIG_SECURITY_NETWORK=y
|
CONFIG_SECURITY_NETWORK=y
|
||||||
# CONFIG_SECURITY_PATH is not set
|
CONFIG_SECURITY_PATH=y
|
||||||
# CONFIG_SECURITY_SAFESETID is not set
|
# CONFIG_SECURITY_SAFESETID is not set
|
||||||
CONFIG_SECURITY_SELINUX_AVC_STATS=y
|
CONFIG_SECURITY_SELINUX_AVC_STATS=y
|
||||||
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
||||||
|
@ -4874,7 +4874,7 @@ CONFIG_RV_REACT_PANIC=y
|
|||||||
CONFIG_RV_REACT_PRINTK=y
|
CONFIG_RV_REACT_PRINTK=y
|
||||||
CONFIG_RV=y
|
CONFIG_RV=y
|
||||||
CONFIG_RXKAD=y
|
CONFIG_RXKAD=y
|
||||||
# CONFIG_RXPERF is not set
|
CONFIG_RXPERF=m
|
||||||
# CONFIG_S390_KPROBES_SANITY_TEST is not set
|
# CONFIG_S390_KPROBES_SANITY_TEST is not set
|
||||||
# CONFIG_S390_MODULES_SANITY_TEST is not set
|
# CONFIG_S390_MODULES_SANITY_TEST is not set
|
||||||
# CONFIG_SAMPLE_ANDROID_BINDERFS is not set
|
# CONFIG_SAMPLE_ANDROID_BINDERFS is not set
|
||||||
@ -5056,7 +5056,7 @@ CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
|
|||||||
CONFIG_SECURITY_LOCKDOWN_LSM=y
|
CONFIG_SECURITY_LOCKDOWN_LSM=y
|
||||||
CONFIG_SECURITY_NETWORK_XFRM=y
|
CONFIG_SECURITY_NETWORK_XFRM=y
|
||||||
CONFIG_SECURITY_NETWORK=y
|
CONFIG_SECURITY_NETWORK=y
|
||||||
# CONFIG_SECURITY_PATH is not set
|
CONFIG_SECURITY_PATH=y
|
||||||
# CONFIG_SECURITY_SAFESETID is not set
|
# CONFIG_SECURITY_SAFESETID is not set
|
||||||
CONFIG_SECURITY_SELINUX_AVC_STATS=y
|
CONFIG_SECURITY_SELINUX_AVC_STATS=y
|
||||||
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
||||||
|
50
kernel.spec
50
kernel.spec
@ -126,13 +126,13 @@ Summary: The Linux kernel
|
|||||||
# define buildid .local
|
# define buildid .local
|
||||||
%define specversion 6.2.0
|
%define specversion 6.2.0
|
||||||
%define patchversion 6.2
|
%define patchversion 6.2
|
||||||
%define pkgrelease 0.rc5.20230123git2475bf0250de.38
|
%define pkgrelease 0.rc5.20230124git7bf70dbb1882.39
|
||||||
%define kversion 6
|
%define kversion 6
|
||||||
%define tarfile_release 6.2-rc5-13-g2475bf0250de
|
%define tarfile_release 6.2-rc5-20-g7bf70dbb1882
|
||||||
# This is needed to do merge window version magic
|
# This is needed to do merge window version magic
|
||||||
%define patchlevel 2
|
%define patchlevel 2
|
||||||
# This allows pkg_release to have configurable %%{?dist} tag
|
# This allows pkg_release to have configurable %%{?dist} tag
|
||||||
%define specrelease 0.rc5.20230123git2475bf0250de.38%{?buildid}%{?dist}
|
%define specrelease 0.rc5.20230124git7bf70dbb1882.39%{?buildid}%{?dist}
|
||||||
# This defines the kabi tarball version
|
# This defines the kabi tarball version
|
||||||
%define kabiversion 6.2.0
|
%define kabiversion 6.2.0
|
||||||
|
|
||||||
@ -1490,6 +1490,7 @@ touch .scmversion
|
|||||||
# This fixes errors such as
|
# This fixes errors such as
|
||||||
# *** ERROR: ambiguous python shebang in /usr/bin/kvm_stat: #!/usr/bin/python. Change it to python3 (or python2) explicitly.
|
# *** ERROR: ambiguous python shebang in /usr/bin/kvm_stat: #!/usr/bin/python. Change it to python3 (or python2) explicitly.
|
||||||
# We patch all sources below for which we got a report/error.
|
# We patch all sources below for which we got a report/error.
|
||||||
|
echo "Fixing Python shebangs..."
|
||||||
pathfix.py -i "%{__python3} %{py3_shbang_opts}" -p -n \
|
pathfix.py -i "%{__python3} %{py3_shbang_opts}" -p -n \
|
||||||
tools/kvm/kvm_stat/kvm_stat \
|
tools/kvm/kvm_stat/kvm_stat \
|
||||||
scripts/show_delta \
|
scripts/show_delta \
|
||||||
@ -1498,7 +1499,7 @@ pathfix.py -i "%{__python3} %{py3_shbang_opts}" -p -n \
|
|||||||
scripts/jobserver-exec \
|
scripts/jobserver-exec \
|
||||||
tools \
|
tools \
|
||||||
Documentation \
|
Documentation \
|
||||||
scripts/clang-tools
|
scripts/clang-tools 2> /dev/null
|
||||||
|
|
||||||
# only deal with configs if we are going to build for the arch
|
# only deal with configs if we are going to build for the arch
|
||||||
%ifnarch %nobuildarches
|
%ifnarch %nobuildarches
|
||||||
@ -2067,7 +2068,7 @@ BuildKernel() {
|
|||||||
mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer
|
mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer
|
||||||
mv vmlinux $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer
|
mv vmlinux $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer
|
||||||
ln -s $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer/vmlinux vmlinux
|
ln -s $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer/vmlinux vmlinux
|
||||||
if [ -n "%{vmlinux_decompressor}" ]; then
|
if [ -n "%{?vmlinux_decompressor}" ]; then
|
||||||
eu-readelf -n %{vmlinux_decompressor} | grep "Build ID" | awk '{print $NF}' > vmlinux.decompressor.id
|
eu-readelf -n %{vmlinux_decompressor} | grep "Build ID" | awk '{print $NF}' > vmlinux.decompressor.id
|
||||||
# Without build-id the build will fail. But for s390 the build-id
|
# Without build-id the build will fail. But for s390 the build-id
|
||||||
# wasn't added before 5.11. In case it is missing prefer not
|
# wasn't added before 5.11. In case it is missing prefer not
|
||||||
@ -2205,10 +2206,6 @@ BuildKernel() {
|
|||||||
sed -e 's/^lib*/%dir \/lib/' %{?zipsed} $RPM_BUILD_ROOT/module-dirs.list > ../kernel${Variant:+-${Variant}}-modules-core.list
|
sed -e 's/^lib*/%dir \/lib/' %{?zipsed} $RPM_BUILD_ROOT/module-dirs.list > ../kernel${Variant:+-${Variant}}-modules-core.list
|
||||||
sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/modules.list >> ../kernel${Variant:+-${Variant}}-modules-core.list
|
sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/modules.list >> ../kernel${Variant:+-${Variant}}-modules-core.list
|
||||||
sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/mod-extra.list >> ../kernel${Variant:+-${Variant}}-modules-extra.list
|
sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/mod-extra.list >> ../kernel${Variant:+-${Variant}}-modules-extra.list
|
||||||
sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/mod-internal.list >> ../kernel${Variant:+-${Variant}}-modules-internal.list
|
|
||||||
%if 0%{!?fedora:1}
|
|
||||||
sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/mod-partner.list >> ../kernel${Variant:+-${Variant}}-modules-partner.list
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Cleanup
|
# Cleanup
|
||||||
rm -f $RPM_BUILD_ROOT/k-d.list
|
rm -f $RPM_BUILD_ROOT/k-d.list
|
||||||
@ -2446,16 +2443,10 @@ chmod -R a=rX Documentation
|
|||||||
find Documentation -type d | xargs chmod u+w
|
find Documentation -type d | xargs chmod u+w
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# In the modsign case, we do 3 things. 1) We check the "variant" and hard
|
# Module signing (modsign)
|
||||||
# code the value in the following invocations. This is somewhat sub-optimal
|
|
||||||
# but we're doing this inside of an RPM macro and it isn't as easy as it
|
|
||||||
# could be because of that. 2) We restore the .tmp_versions/ directory from
|
|
||||||
# the one we saved off in BuildKernel above. This is to make sure we're
|
|
||||||
# signing the modules we actually built/installed in that variant. 3) We
|
|
||||||
# grab the arch and invoke mod-sign.sh command to actually sign the modules.
|
|
||||||
#
|
#
|
||||||
# We have to do all of those things _after_ find-debuginfo runs, otherwise
|
# This must be run _after_ find-debuginfo.sh runs, otherwise that will strip
|
||||||
# that will strip the signature off of the modules.
|
# the signature off of the modules.
|
||||||
#
|
#
|
||||||
# Don't sign modules for the zfcpdump variant as it is monolithic.
|
# Don't sign modules for the zfcpdump variant as it is monolithic.
|
||||||
|
|
||||||
@ -2472,7 +2463,8 @@ 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' | xargs -P${RPM_BUILD_NCPUS} -r xz; \
|
echo "Compressing kernel modules ..." \
|
||||||
|
find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -n 16 -P${RPM_BUILD_NCPUS} -r xz; \
|
||||||
fi \
|
fi \
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
@ -3179,9 +3171,11 @@ fi
|
|||||||
%{expand:%%files %{?3:%{3}-}devel-matched}\
|
%{expand:%%files %{?3:%{3}-}devel-matched}\
|
||||||
%{expand:%%files -f kernel-%{?3:%{3}-}modules-extra.list %{?3:%{3}-}modules-extra}\
|
%{expand:%%files -f kernel-%{?3:%{3}-}modules-extra.list %{?3:%{3}-}modules-extra}\
|
||||||
%config(noreplace) /etc/modprobe.d/*-blacklist.conf\
|
%config(noreplace) /etc/modprobe.d/*-blacklist.conf\
|
||||||
%{expand:%%files -f kernel-%{?3:%{3}-}modules-internal.list %{?3:%{3}-}modules-internal}\
|
%{expand:%%files %{?3:%{3}-}modules-internal}\
|
||||||
|
/lib/modules/%{KVERREL}%{?3:+%{3}}/internal\
|
||||||
%if 0%{!?fedora:1}\
|
%if 0%{!?fedora:1}\
|
||||||
%{expand:%%files -f kernel-%{?3:%{3}-}modules-partner.list %{?3:%{3}-}modules-partner}\
|
%{expand:%%files %{?3:%{3}-}modules-partner}\
|
||||||
|
/lib/modules/%{KVERREL}%{?3:+%{3}}/partner\
|
||||||
%endif\
|
%endif\
|
||||||
%if %{with_debuginfo}\
|
%if %{with_debuginfo}\
|
||||||
%ifnarch noarch\
|
%ifnarch noarch\
|
||||||
@ -3226,9 +3220,21 @@ fi
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Jan 23 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc5.2475bf0250de.38]
|
* Tue Jan 24 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc5.7bf70dbb1882.39]
|
||||||
|
- Turn off forced debug builds (Justin M. Forbes)
|
||||||
- Revert "redhat: fix elf got hardening for vm tools" (Don Zickus)
|
- Revert "redhat: fix elf got hardening for vm tools" (Don Zickus)
|
||||||
|
|
||||||
|
* Tue Jan 24 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc5.7bf70dbb1882.38]
|
||||||
|
- redhat/kernel.spec.template: Fix internal "File listed twice" errors (Prarit Bhargava)
|
||||||
|
- redhat: Remove stale .tmp_versions code and comments (Prarit Bhargava)
|
||||||
|
- redhat/kernel.spec.template: Fix vmlinux_decompressor on !s390x (Prarit Bhargava)
|
||||||
|
- redhat/kernel.spec.template: Remove unnecessary output from pathfix.py (Prarit Bhargava)
|
||||||
|
- Modularize CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU (Mark Salter)
|
||||||
|
- redhat/kernel.spec.template: Parallelize compression (Prarit Bhargava)
|
||||||
|
- config: Enable Security Path (Ricardo Robaina)
|
||||||
|
- redhat/self-test/data: Regenerate self-test data for make change (Prarit Bhargava)
|
||||||
|
- Linux v6.2.0-0.rc5.7bf70dbb1882
|
||||||
|
|
||||||
* Mon Jan 23 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc5.2475bf0250de.37]
|
* Mon Jan 23 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc5.2475bf0250de.37]
|
||||||
- Linux v6.2.0-0.rc5.2475bf0250de
|
- Linux v6.2.0-0.rc5.2475bf0250de
|
||||||
|
|
||||||
|
@ -127,17 +127,6 @@ fi
|
|||||||
|
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# If we're signing modules, we can't leave the .mod files for the .ko files
|
|
||||||
# we've moved in .tmp_versions/. Remove them so the Kbuild 'modules_sign'
|
|
||||||
# target doesn't try to sign a non-existent file. This is kinda ugly, but
|
|
||||||
# so are the modules-* packages.
|
|
||||||
|
|
||||||
while IFS= read -r mod
|
|
||||||
do
|
|
||||||
modfile=$(basename "$mod" | sed -e 's/.ko/.mod/')
|
|
||||||
rm .tmp_versions/"$modfile"
|
|
||||||
done < "$Dir"/dep2.list
|
|
||||||
|
|
||||||
if [ -z "$Dest" ]; then
|
if [ -z "$Dest" ]; then
|
||||||
sed -e "s|^.|${ModDir}|g" "$Dir"/dep2.list > "$RpmDir/$ListName"
|
sed -e "s|^.|${ModDir}|g" "$Dir"/dep2.list > "$RpmDir/$ListName"
|
||||||
echo "./$RpmDir/$ListName created."
|
echo "./$RpmDir/$ListName created."
|
||||||
|
6
sources
6
sources
@ -1,3 +1,3 @@
|
|||||||
SHA512 (linux-6.2-rc5-13-g2475bf0250de.tar.xz) = b341cd8b622d9f59028f36d5bd4006da0c92e05f6b1445f3933fc2765b541cc7e91e2aa4f6216fe232eeee1e5f1f5cf3f28ff319a5520551d9ee29ea8e6d57ce
|
SHA512 (linux-6.2-rc5-20-g7bf70dbb1882.tar.xz) = aa8709bd4f3c7189facd1425fe97fe0959114fb6fb7953e2276838c0f273efba1e4b8ac06037955c7dc0a5a14b9f72813e76c550e6c5cff45f2304e04ddb9d9e
|
||||||
SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 7735239e315eff9cd5a4f8e5ea698f09a5b64297e6e4724545c17d98802a4e356eded4cc3caed8404578c7cbb58409ccb3c26d38bb1946a5ae29ccde82098ab4
|
SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 97ec87e6fd3b6199f6c3226b7363e91d03f2faacf7094a93469a0393ce40445d5075bd9ee0b4a1172e554d48cfbc96e5cebebe990405de21223465fc563b629e
|
||||||
SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = fc30cab52edcf3c309f213b58ab4c8f0bcb234249a24b2141f739ec2d63fc6cc8445819043e0f7ff180ee0a3f05cc0d6fc80f18536af529a1023c8a9c71bd301
|
SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 7c1b41210458207a8c9429eb0f6670b7552d45391f74dcb0f97cb72627c79f5878e37f118d230f7a8477b3d6093b23a51b65c2fbdb0c4cd58b724545f399029b
|
||||||
|
Loading…
Reference in New Issue
Block a user