From b485f7cb130918b406be9854a09294e4c67836cc Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 17 Aug 2022 09:56:40 -0500 Subject: kernel-6.0.0-0.rc1.20220817git3cc40a443a04.14 * Wed Aug 17 2022 Fedora Kernel Team [6.0.0-0.rc1.3cc40a443a04.13] - redhat/Makefile: Clean linux tarballs (Prarit Bhargava) - redhat/configs: Cleanup CONFIG_ACPI_AGDI (Prarit Bhargava) - spec: add cpupower daemon reload on install/upgrade (Jarod Wilson) - redhat: properly handle binary files in patches (Ondrej Mosnacek) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-rhel.config | 2 +- kernel-aarch64-rhel.config | 2 +- kernel-ppc64le-debug-fedora.config | 5 +++-- kernel-ppc64le-debug-rhel.config | 7 +++---- kernel-ppc64le-fedora.config | 5 +++-- kernel-ppc64le-rhel.config | 7 +++---- kernel-s390x-debug-fedora.config | 5 +++-- kernel-s390x-debug-rhel.config | 7 +++---- kernel-s390x-fedora.config | 5 +++-- kernel-s390x-rhel.config | 7 +++---- kernel-s390x-zfcpdump-rhel.config | 7 +++---- kernel-x86_64-debug-fedora.config | 5 +++-- kernel-x86_64-debug-rhel.config | 7 +++---- kernel-x86_64-fedora.config | 5 +++-- kernel-x86_64-rhel.config | 7 +++---- kernel.spec | 27 +++++++++++++++++++++------ sources | 6 +++--- 18 files changed, 66 insertions(+), 52 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 81beab618..5e65c2fc9 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 = 13 +RHEL_RELEASE = 14 # # ZSTREAM diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 26bdbc8c2..fc9cef8f2 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -6119,7 +6119,7 @@ CONFIG_SYNTH_EVENT_GEN_TEST=m # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -# CONFIG_SYSFB_SIMPLEFB is not set +CONFIG_SYSFB_SIMPLEFB=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_SYSTEM76_ACPI is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index c28296efd..b7952f313 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -6094,7 +6094,7 @@ CONFIG_SYN_COOKIES=y # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -# CONFIG_SYSFB_SIMPLEFB is not set +CONFIG_SYSFB_SIMPLEFB=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_SYSTEM76_ACPI is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index b48d0bb35..58341dec4 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -287,8 +287,9 @@ CONFIG_ARM_CMN=m CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y CONFIG_ARM_PTDUMP_DEBUGFS=y # CONFIG_ARM_SCMI_POWER_CONTROL is not set -CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y -CONFIG_ARM_SCMI_TRANSPORT_SMC=y +# CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set +# CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set +# CONFIG_ARM_SCMI_TRANSPORT_SMC is not set # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 089312aca..4c7783931 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -17,7 +17,6 @@ CONFIG_842_DECOMPRESS=y CONFIG_ACCESSIBILITY=y # CONFIG_ACORN_PARTITION is not set CONFIG_ACPI_AC=y -CONFIG_ACPI_AGDI=y # CONFIG_ACPI_ALS is not set CONFIG_ACPI_APEI_EINJ=m CONFIG_ACPI_APEI_ERST_DEBUG=m @@ -253,9 +252,9 @@ CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set # CONFIG_ARM_SCMI_POWER_CONTROL is not set -CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y +# CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set -CONFIG_ARM_SCMI_TRANSPORT_SMC=y +# CONFIG_ARM_SCMI_TRANSPORT_SMC is not set # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set @@ -5883,7 +5882,7 @@ CONFIG_SYNTH_EVENT_GEN_TEST=m # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -# CONFIG_SYSFB_SIMPLEFB is not set +CONFIG_SYSFB_SIMPLEFB=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index eb9ec16b5..5f7637682 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -286,8 +286,9 @@ CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y # CONFIG_ARM_SCMI_POWER_CONTROL is not set -CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y -CONFIG_ARM_SCMI_TRANSPORT_SMC=y +# CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set +# CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set +# CONFIG_ARM_SCMI_TRANSPORT_SMC is not set # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index db0640f61..ca5aad388 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -17,7 +17,6 @@ CONFIG_842_DECOMPRESS=y CONFIG_ACCESSIBILITY=y # CONFIG_ACORN_PARTITION is not set CONFIG_ACPI_AC=y -CONFIG_ACPI_AGDI=y # CONFIG_ACPI_ALS is not set CONFIG_ACPI_APEI_EINJ=m # CONFIG_ACPI_APEI_ERST_DEBUG is not set @@ -253,9 +252,9 @@ CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set # CONFIG_ARM_SCMI_POWER_CONTROL is not set -CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y +# CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set -CONFIG_ARM_SCMI_TRANSPORT_SMC=y +# CONFIG_ARM_SCMI_TRANSPORT_SMC is not set # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set @@ -5860,7 +5859,7 @@ CONFIG_SYN_COOKIES=y # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -# CONFIG_SYSFB_SIMPLEFB is not set +CONFIG_SYSFB_SIMPLEFB=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 5e2999590..949e9af60 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -291,8 +291,9 @@ CONFIG_ARM_CMN=m CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y CONFIG_ARM_PTDUMP_DEBUGFS=y # CONFIG_ARM_SCMI_POWER_CONTROL is not set -CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y -CONFIG_ARM_SCMI_TRANSPORT_SMC=y +# CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set +# CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set +# CONFIG_ARM_SCMI_TRANSPORT_SMC is not set # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index a8f1931d5..642a00c5a 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -16,7 +16,6 @@ CONFIG_8139TOO=m # CONFIG_ACCESSIBILITY is not set # CONFIG_ACORN_PARTITION is not set CONFIG_ACPI_AC=y -CONFIG_ACPI_AGDI=y # CONFIG_ACPI_ALS is not set CONFIG_ACPI_APEI_EINJ=m CONFIG_ACPI_APEI_ERST_DEBUG=m @@ -253,9 +252,9 @@ CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set # CONFIG_ARM_SCMI_POWER_CONTROL is not set -CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y +# CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set -CONFIG_ARM_SCMI_TRANSPORT_SMC=y +# CONFIG_ARM_SCMI_TRANSPORT_SMC is not set # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set @@ -5858,7 +5857,7 @@ CONFIG_SYNTH_EVENT_GEN_TEST=m # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -# CONFIG_SYSFB_SIMPLEFB is not set +CONFIG_SYSFB_SIMPLEFB=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index fe9802270..f23e7fdfb 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -290,8 +290,9 @@ CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y # CONFIG_ARM_SCMI_POWER_CONTROL is not set -CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y -CONFIG_ARM_SCMI_TRANSPORT_SMC=y +# CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set +# CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set +# CONFIG_ARM_SCMI_TRANSPORT_SMC is not set # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index af2e078a5..13797b8d9 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -16,7 +16,6 @@ CONFIG_8139TOO=m # CONFIG_ACCESSIBILITY is not set # CONFIG_ACORN_PARTITION is not set CONFIG_ACPI_AC=y -CONFIG_ACPI_AGDI=y # CONFIG_ACPI_ALS is not set CONFIG_ACPI_APEI_EINJ=m # CONFIG_ACPI_APEI_ERST_DEBUG is not set @@ -253,9 +252,9 @@ CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set # CONFIG_ARM_SCMI_POWER_CONTROL is not set -CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y +# CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set -CONFIG_ARM_SCMI_TRANSPORT_SMC=y +# CONFIG_ARM_SCMI_TRANSPORT_SMC is not set # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set @@ -5835,7 +5834,7 @@ CONFIG_SYN_COOKIES=y # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -# CONFIG_SYSFB_SIMPLEFB is not set +CONFIG_SYSFB_SIMPLEFB=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 873f43b82..8af69ec54 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -16,7 +16,6 @@ CONFIG_8139TOO=m # CONFIG_ACCESSIBILITY is not set # CONFIG_ACORN_PARTITION is not set CONFIG_ACPI_AC=y -CONFIG_ACPI_AGDI=y # CONFIG_ACPI_ALS is not set CONFIG_ACPI_APEI_EINJ=m # CONFIG_ACPI_APEI_ERST_DEBUG is not set @@ -253,9 +252,9 @@ CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set # CONFIG_ARM_SCMI_POWER_CONTROL is not set -CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y +# CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set -CONFIG_ARM_SCMI_TRANSPORT_SMC=y +# CONFIG_ARM_SCMI_TRANSPORT_SMC is not set # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set @@ -5858,7 +5857,7 @@ CONFIG_SYN_COOKIES=y # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -# CONFIG_SYSFB_SIMPLEFB is not set +CONFIG_SYSFB_SIMPLEFB=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_SYSFS=y # CONFIG_SYS_HYPERVISOR is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index cb45066d3..e72f4311f 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -325,8 +325,9 @@ CONFIG_ARM_CMN=m CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y CONFIG_ARM_PTDUMP_DEBUGFS=y # CONFIG_ARM_SCMI_POWER_CONTROL is not set -CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y -CONFIG_ARM_SCMI_TRANSPORT_SMC=y +# CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set +# CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set +# CONFIG_ARM_SCMI_TRANSPORT_SMC is not set # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 7c2dd6354..95ba365a3 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -19,7 +19,6 @@ CONFIG_ACER_WIRELESS=m CONFIG_ACER_WMI=m # CONFIG_ACORN_PARTITION is not set CONFIG_ACPI_AC=y -CONFIG_ACPI_AGDI=y # CONFIG_ACPI_ALS is not set CONFIG_ACPI_APEI_EINJ=m CONFIG_ACPI_APEI_ERST_DEBUG=m @@ -276,9 +275,9 @@ CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set # CONFIG_ARM_SCMI_POWER_CONTROL is not set -CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y +# CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set -CONFIG_ARM_SCMI_TRANSPORT_SMC=y +# CONFIG_ARM_SCMI_TRANSPORT_SMC is not set # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set @@ -6103,7 +6102,7 @@ CONFIG_SYNTH_EVENT_GEN_TEST=m # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -# CONFIG_SYSFB_SIMPLEFB is not set +CONFIG_SYSFB_SIMPLEFB=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 8c8b514bb..b27f8c59f 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -324,8 +324,9 @@ CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y # CONFIG_ARM_SCMI_POWER_CONTROL is not set -CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y -CONFIG_ARM_SCMI_TRANSPORT_SMC=y +# CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set +# CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set +# CONFIG_ARM_SCMI_TRANSPORT_SMC is not set # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 2bddf54d3..8cc72e576 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -19,7 +19,6 @@ CONFIG_ACER_WIRELESS=m CONFIG_ACER_WMI=m # CONFIG_ACORN_PARTITION is not set CONFIG_ACPI_AC=y -CONFIG_ACPI_AGDI=y # CONFIG_ACPI_ALS is not set CONFIG_ACPI_APEI_EINJ=m # CONFIG_ACPI_APEI_ERST_DEBUG is not set @@ -276,9 +275,9 @@ CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set # CONFIG_ARM_SCMI_POWER_CONTROL is not set -CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y +# CONFIG_ARM_SCMI_TRANSPORT_MAILBOX is not set # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set -CONFIG_ARM_SCMI_TRANSPORT_SMC=y +# CONFIG_ARM_SCMI_TRANSPORT_SMC is not set # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set @@ -6079,7 +6078,7 @@ CONFIG_SYN_COOKIES=y # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL_KUNIT_TEST=m CONFIG_SYSCTL=y -# CONFIG_SYSFB_SIMPLEFB is not set +CONFIG_SYSFB_SIMPLEFB=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE=y diff --git a/kernel.spec b/kernel.spec index 255962537..2fffe936d 100755 --- a/kernel.spec +++ b/kernel.spec @@ -120,17 +120,17 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # define buildid .local %define specversion 6.0.0 %define patchversion 6.0 -%define pkgrelease 0.rc1.13 +%define pkgrelease 0.rc1.20220817git3cc40a443a04.14 %define kversion 6 -%define tarfile_release 6.0-rc1 +%define tarfile_release 6.0-rc1-17-g3cc40a443a04 # This is needed to do merge window version magic %define patchlevel 0 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.13%{?buildid}%{?dist} +%define specrelease 0.rc1.20220817git3cc40a443a04.14%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.0.0 @@ -571,7 +571,7 @@ Requires: kernel-modules-uname-r = %{KVERREL} # # List the packages used during the kernel build # -BuildRequires: kmod, patch, bash, coreutils, tar, git-core, which +BuildRequires: kmod, bash, coreutils, tar, git-core, which BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex, gcc-c++ BuildRequires: net-tools, hostname, bc, elfutils-devel @@ -1387,7 +1387,7 @@ if [ "%{patches}" != "%%{patches}" ] ; then done fi 2>/dev/null -patch_command='patch -p1 -F1 -s' +patch_command='git apply' ApplyPatch() { local patch=$1 @@ -2700,6 +2700,15 @@ popd ### %if %{with_tools} +%post -n kernel-tools +%systemd_post cpupower.service + +%preun -n kernel-tools +%systemd_preun cpupower.service + +%postun -n kernel-tools +%systemd_postun cpupower.service + %post -n kernel-tools-libs /sbin/ldconfig @@ -3138,6 +3147,12 @@ fi # # %changelog +* Wed Aug 17 2022 Fedora Kernel Team [6.0.0-0.rc1.3cc40a443a04.13] +- redhat/Makefile: Clean linux tarballs (Prarit Bhargava) +- redhat/configs: Cleanup CONFIG_ACPI_AGDI (Prarit Bhargava) +- spec: add cpupower daemon reload on install/upgrade (Jarod Wilson) +- redhat: properly handle binary files in patches (Ondrej Mosnacek) + * Mon Aug 15 2022 Fedora Kernel Team [6.0.0-0.rc1.12] - Add python3-setuptools buildreq for perf (Justin M. Forbes) - Add cros_kunit to mod-internal.list (Justin M. Forbes) diff --git a/sources b/sources index c26d30029..1159ab22c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.0-rc1.tar.xz) = 226cfe26ad8d526b22cc0720f0e9e7e84ce05bd37e6edfddbeaaec3aed72b1cddb201c4be7ff853e37a16d3b35d378f3b8f2f072dbe08911af02a3154462fa13 -SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = b30aeafaa11decf4252cb55f450ab7983e90bd3b29311a205333df3130b7c4fc37b4b86fd7f279f88cdfdedf123849d2d5ff2f34829c9cae92eb549734796349 -SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 12bec4cd692e609f38de37a288372f3f1e00c228040a05ad92a64abb66fce67d69e957a72f1cfa8fae2bc3b2e71fb828615d95bd0e1e9c3a3b8beff82d4202fb +SHA512 (linux-6.0-rc1-17-g3cc40a443a04.tar.xz) = 4f29972032adb1f4dfee0598c4e2ec39e12aa63a36f44b61fb20ddeb3a9f598ca56a712f4aab1485f2c299f389ba7bdbc9d635b434aea29148fca8c2f2980573 +SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = fd9fec0c25aa97da4089e8b48ae156e6a204b0bafaa97897520ef87a3ffcbad043ebebda992b2e20e1eeb5fcea637889fc28735d23617cbf48cdb2c5c39ed1e2 +SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 37c387fbdcf9068b3a82596d1fe29ae7ca4c89b6e4b600159eed118379f5ff66e52aceab77292efc57f31d79f1f825afc46b896ae8835af41f895d3fda3af531 -- cgit