diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2022-04-20 08:35:44 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2022-04-20 08:35:44 -0500 |
| commit | b4aa7140f3d9ab3f0910055d3f8f805ae1326906 (patch) | |
| tree | 9793602bee9fc742d5e2c7577e1c106dca778c5f | |
| parent | ca99a52fe681aef8cd9faf562832213410fb38ec (diff) | |
| download | kernel-b4aa7140f3d9ab3f0910055d3f8f805ae1326906.tar.gz kernel-b4aa7140f3d9ab3f0910055d3f8f805ae1326906.tar.xz kernel-b4aa7140f3d9ab3f0910055d3f8f805ae1326906.zip | |
kernel-5.18.0-0.rc3.559089e0a93d442.28
* Wed Apr 20 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc3.559089e0a93d442.28]
- redhat/Makefile: Deprecate SINGLE_TARBALL (Prarit Bhargava)
- redhat/Makefile.rhpkg: Remove quotes for RHDISTGIT (Prarit Bhargava)
- redhat/self-test: Clean up data set (Prarit Bhargava)
- redhat/scripts/create-tarball.sh: Use Makefile variables (Prarit Bhargava)
- redhat/Makefile: Cleanup TARBALL target (Prarit Bhargava)
- redhat/Makefile: Use RPMVERSION (Prarit Bhargava)
- redhat/scripts/rh-dist-git.sh: Use Makefile variables (Prarit Bhargava)
- redhat/configs/build_configs.sh: Use Makefile variables (Prarit Bhargava)
- redhat/configs/process_configs.sh: Use Makefile variables (Prarit Bhargava)
- redhat/kernel.spec.template: Use RPM_BUILD_NCPUS (Prarit Bhargava)
- redhat/configs/generate_all_configs.sh: Use Makefile variables (Prarit Bhargava)
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
26 files changed, 128 insertions, 135 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 9840027a8..7c8ec09b0 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 = 27 +RHEL_RELEASE = 29 # # Early y+1 numbering diff --git a/generate_all_configs.sh b/generate_all_configs.sh index 9e3d5ecb7..31d141675 100755 --- a/generate_all_configs.sh +++ b/generate_all_configs.sh @@ -1,30 +1,24 @@ #!/bin/sh # Adjusts the configuration options to build the variants correctly -# -# arg1: configuration to go in the primary variant -# arg2: are we only generating debug configs - -PRIMARY=$1 -DEBUGBUILDSENABLED=$2 - -if [ -z "$2" ]; then +DEBUGBUILDSENABLED=$1 +if [ -z "$DEBUGBUILDSENABLED" ]; then exit 1 fi -if [ -z "$PRIMARY" ]; then - PRIMARY=rhel +if [ -z "$FLAVOR" ]; then + FLAVOR=rhel fi -if [ "$PRIMARY" = "fedora" ]; then +if [ "$FLAVOR" = "fedora" ]; then SECONDARY=rhel else SECONDARY=fedora fi -for i in kernel-*-"$PRIMARY".config; do - NEW=kernel-"$VERSION"-$(echo "$i" | cut -d - -f2- | sed s/-"$PRIMARY"//) +for i in kernel-*-"$FLAVOR".config; do + NEW=kernel-"$KVERSION"-$(echo "$i" | cut -d - -f2- | sed s/-"$FLAVOR"//) #echo $NEW mv "$i" "$NEW" done diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index bd9d2f5c8..15780a112 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6076,8 +6076,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_DWC is not set # CONFIG_SATA_HIGHBANK is not set # CONFIG_SATA_INIC162X is not set -CONFIG_SATA_LPM_POLICY=3 -CONFIG_SATA_MOBILE_LPM_POLICY=0 +CONFIG_SATA_MOBILE_LPM_POLICY=3 CONFIG_SATA_MV=m # CONFIG_SATA_NV is not set CONFIG_SATA_PMP=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index b57f6d8e6..a21950799 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3014,16 +3014,16 @@ CONFIG_MD_RAID1=m CONFIG_MD_RAID456=m CONFIG_MD=y CONFIG_MEDIA_ALTERA_CI=m -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CEC_RC=y CONFIG_MEDIA_CEC_SUPPORT=y # CONFIG_MEDIA_CONTROLLER is not set -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set CONFIG_MEDIA_PCI_SUPPORT=y # CONFIG_MEDIA_PLATFORM_SUPPORT is not set -CONFIG_MEDIA_RADIO_SUPPORT=y +# CONFIG_MEDIA_RADIO_SUPPORT is not set # CONFIG_MEDIA_SDR_SUPPORT is not set CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_MEDIA_SUPPORT_FILTER=y @@ -3215,7 +3215,7 @@ CONFIG_MLX5_TC_CT=y CONFIG_MLX5_TC_SAMPLE=y CONFIG_MLX5_TLS=y CONFIG_MLX5_VDPA_NET=m -# CONFIG_MLX5_VFIO_PCI is not set +CONFIG_MLX5_VFIO_PCI=m # CONFIG_MLX90614 is not set # CONFIG_MLX90632 is not set CONFIG_MLXBF_BOOTCTL=m @@ -4729,7 +4729,6 @@ CONFIG_SATA_AHCI_SEATTLE=m CONFIG_SATA_AHCI=y # CONFIG_SATA_DWC is not set # CONFIG_SATA_INIC162X is not set -CONFIG_SATA_LPM_POLICY=0 CONFIG_SATA_MOBILE_LPM_POLICY=0 # CONFIG_SATA_MV is not set # CONFIG_SATA_NV is not set @@ -6658,7 +6657,7 @@ CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_DW9807_VCM is not set CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX=m +# CONFIG_VIDEO_EM28XX is not set CONFIG_VIDEO_EM28XX_RC=m # CONFIG_VIDEO_EM28XX_V4L2 is not set # CONFIG_VIDEO_ET8EK8 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index aa1f3391b..fa90c850a 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6055,8 +6055,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_DWC is not set # CONFIG_SATA_HIGHBANK is not set # CONFIG_SATA_INIC162X is not set -CONFIG_SATA_LPM_POLICY=3 -CONFIG_SATA_MOBILE_LPM_POLICY=0 +CONFIG_SATA_MOBILE_LPM_POLICY=3 CONFIG_SATA_MV=m # CONFIG_SATA_NV is not set CONFIG_SATA_PMP=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 816518bd3..9216c581b 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2993,16 +2993,16 @@ CONFIG_MD_RAID1=m CONFIG_MD_RAID456=m CONFIG_MD=y CONFIG_MEDIA_ALTERA_CI=m -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CEC_RC=y CONFIG_MEDIA_CEC_SUPPORT=y # CONFIG_MEDIA_CONTROLLER is not set -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set CONFIG_MEDIA_PCI_SUPPORT=y # CONFIG_MEDIA_PLATFORM_SUPPORT is not set -CONFIG_MEDIA_RADIO_SUPPORT=y +# CONFIG_MEDIA_RADIO_SUPPORT is not set # CONFIG_MEDIA_SDR_SUPPORT is not set CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_MEDIA_SUPPORT_FILTER=y @@ -3194,7 +3194,7 @@ CONFIG_MLX5_TC_CT=y CONFIG_MLX5_TC_SAMPLE=y CONFIG_MLX5_TLS=y CONFIG_MLX5_VDPA_NET=m -# CONFIG_MLX5_VFIO_PCI is not set +CONFIG_MLX5_VFIO_PCI=m # CONFIG_MLX90614 is not set # CONFIG_MLX90632 is not set CONFIG_MLXBF_BOOTCTL=m @@ -4706,7 +4706,6 @@ CONFIG_SATA_AHCI_SEATTLE=m CONFIG_SATA_AHCI=y # CONFIG_SATA_DWC is not set # CONFIG_SATA_INIC162X is not set -CONFIG_SATA_LPM_POLICY=0 CONFIG_SATA_MOBILE_LPM_POLICY=0 # CONFIG_SATA_MV is not set # CONFIG_SATA_NV is not set @@ -6633,7 +6632,7 @@ CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_DW9807_VCM is not set CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX=m +# CONFIG_VIDEO_EM28XX is not set CONFIG_VIDEO_EM28XX_RC=m # CONFIG_VIDEO_EM28XX_V4L2 is not set # CONFIG_VIDEO_ET8EK8 is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 7bab9e1e1..7ca154a3f 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -6193,8 +6193,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_DWC is not set CONFIG_SATA_HIGHBANK=m # CONFIG_SATA_INIC162X is not set -CONFIG_SATA_LPM_POLICY=3 -CONFIG_SATA_MOBILE_LPM_POLICY=0 +CONFIG_SATA_MOBILE_LPM_POLICY=3 CONFIG_SATA_MV=m # CONFIG_SATA_NV is not set CONFIG_SATA_PMP=y diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 018e400c0..4e6b972ae 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -6174,8 +6174,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_DWC is not set CONFIG_SATA_HIGHBANK=m # CONFIG_SATA_INIC162X is not set -CONFIG_SATA_LPM_POLICY=3 -CONFIG_SATA_MOBILE_LPM_POLICY=0 +CONFIG_SATA_MOBILE_LPM_POLICY=3 CONFIG_SATA_MV=m # CONFIG_SATA_NV is not set CONFIG_SATA_PMP=y diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index d0d22622b..260bbd5fd 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -6015,8 +6015,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_DWC is not set CONFIG_SATA_HIGHBANK=m # CONFIG_SATA_INIC162X is not set -CONFIG_SATA_LPM_POLICY=3 -CONFIG_SATA_MOBILE_LPM_POLICY=0 +CONFIG_SATA_MOBILE_LPM_POLICY=3 CONFIG_SATA_MV=m # CONFIG_SATA_NV is not set CONFIG_SATA_PMP=y diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index dce906991..e63521cb5 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -5996,8 +5996,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_DWC is not set CONFIG_SATA_HIGHBANK=m # CONFIG_SATA_INIC162X is not set -CONFIG_SATA_LPM_POLICY=3 -CONFIG_SATA_MOBILE_LPM_POLICY=0 +CONFIG_SATA_MOBILE_LPM_POLICY=3 CONFIG_SATA_MV=m # CONFIG_SATA_NV is not set CONFIG_SATA_PMP=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 882cdac90..024281e3a 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5121,8 +5121,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_DWC is not set # CONFIG_SATA_HIGHBANK is not set CONFIG_SATA_INIC162X=m -CONFIG_SATA_LPM_POLICY=3 -CONFIG_SATA_MOBILE_LPM_POLICY=0 +CONFIG_SATA_MOBILE_LPM_POLICY=3 CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PMP=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 9d766531c..e27de0ae3 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2844,16 +2844,16 @@ CONFIG_MD_RAID1=m CONFIG_MD_RAID456=m CONFIG_MD=y CONFIG_MEDIA_ALTERA_CI=m -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_CAMERA_SUPPORT=y # CONFIG_MEDIA_CEC_RC is not set CONFIG_MEDIA_CEC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set CONFIG_MEDIA_PCI_SUPPORT=y # CONFIG_MEDIA_PLATFORM_SUPPORT is not set -CONFIG_MEDIA_RADIO_SUPPORT=y +# CONFIG_MEDIA_RADIO_SUPPORT is not set # CONFIG_MEDIA_SDR_SUPPORT is not set CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_MEDIA_SUPPORT_FILTER=y @@ -3042,7 +3042,7 @@ CONFIG_MLX5_TC_CT=y CONFIG_MLX5_TC_SAMPLE=y CONFIG_MLX5_TLS=y CONFIG_MLX5_VDPA_NET=m -# CONFIG_MLX5_VFIO_PCI is not set +CONFIG_MLX5_VFIO_PCI=m # CONFIG_MLX90614 is not set # CONFIG_MLX90632 is not set # CONFIG_MLXBF_BOOTCTL is not set @@ -4516,7 +4516,6 @@ CONFIG_SATA_AHCI=m CONFIG_SATA_AHCI_PLATFORM=m # CONFIG_SATA_DWC is not set # CONFIG_SATA_INIC162X is not set -CONFIG_SATA_LPM_POLICY=0 CONFIG_SATA_MOBILE_LPM_POLICY=0 # CONFIG_SATA_MV is not set # CONFIG_SATA_NV is not set @@ -6417,7 +6416,7 @@ CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_DW9807_VCM is not set CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX=m +# CONFIG_VIDEO_EM28XX is not set CONFIG_VIDEO_EM28XX_RC=m # CONFIG_VIDEO_EM28XX_V4L2 is not set # CONFIG_VIDEO_ET8EK8 is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 76e9d8dec..0adb4a943 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5100,8 +5100,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_DWC is not set # CONFIG_SATA_HIGHBANK is not set CONFIG_SATA_INIC162X=m -CONFIG_SATA_LPM_POLICY=3 -CONFIG_SATA_MOBILE_LPM_POLICY=0 +CONFIG_SATA_MOBILE_LPM_POLICY=3 CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PMP=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index e14ec9769..17f423a66 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2824,16 +2824,16 @@ CONFIG_MD_RAID1=m CONFIG_MD_RAID456=m CONFIG_MD=y CONFIG_MEDIA_ALTERA_CI=m -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_CAMERA_SUPPORT=y # CONFIG_MEDIA_CEC_RC is not set CONFIG_MEDIA_CEC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set CONFIG_MEDIA_PCI_SUPPORT=y # CONFIG_MEDIA_PLATFORM_SUPPORT is not set -CONFIG_MEDIA_RADIO_SUPPORT=y +# CONFIG_MEDIA_RADIO_SUPPORT is not set # CONFIG_MEDIA_SDR_SUPPORT is not set CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_MEDIA_SUPPORT_FILTER=y @@ -3022,7 +3022,7 @@ CONFIG_MLX5_TC_CT=y CONFIG_MLX5_TC_SAMPLE=y CONFIG_MLX5_TLS=y CONFIG_MLX5_VDPA_NET=m -# CONFIG_MLX5_VFIO_PCI is not set +CONFIG_MLX5_VFIO_PCI=m # CONFIG_MLX90614 is not set # CONFIG_MLX90632 is not set # CONFIG_MLXBF_BOOTCTL is not set @@ -4495,7 +4495,6 @@ CONFIG_SATA_AHCI=m CONFIG_SATA_AHCI_PLATFORM=m # CONFIG_SATA_DWC is not set # CONFIG_SATA_INIC162X is not set -CONFIG_SATA_LPM_POLICY=0 CONFIG_SATA_MOBILE_LPM_POLICY=0 # CONFIG_SATA_MV is not set # CONFIG_SATA_NV is not set @@ -6394,7 +6393,7 @@ CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_DW9807_VCM is not set CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX=m +# CONFIG_VIDEO_EM28XX is not set CONFIG_VIDEO_EM28XX_RC=m # CONFIG_VIDEO_EM28XX_V4L2 is not set # CONFIG_VIDEO_ET8EK8 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 8e92e7293..99f4383dc 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5067,8 +5067,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_DWC is not set # CONFIG_SATA_HIGHBANK is not set CONFIG_SATA_INIC162X=m -CONFIG_SATA_LPM_POLICY=3 -CONFIG_SATA_MOBILE_LPM_POLICY=0 +CONFIG_SATA_MOBILE_LPM_POLICY=3 CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PMP=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index ec7516ab9..34ec0372c 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2830,16 +2830,16 @@ CONFIG_MD_RAID1=m CONFIG_MD_RAID456=m CONFIG_MD=y CONFIG_MEDIA_ALTERA_CI=m -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CEC_RC=y CONFIG_MEDIA_CEC_SUPPORT=y # CONFIG_MEDIA_CONTROLLER is not set -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set CONFIG_MEDIA_PCI_SUPPORT=y # CONFIG_MEDIA_PLATFORM_SUPPORT is not set -CONFIG_MEDIA_RADIO_SUPPORT=y +# CONFIG_MEDIA_RADIO_SUPPORT is not set # CONFIG_MEDIA_SDR_SUPPORT is not set CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_MEDIA_SUPPORT_FILTER=y @@ -3028,7 +3028,7 @@ CONFIG_MLX5_TC_CT=y CONFIG_MLX5_TC_SAMPLE=y CONFIG_MLX5_TLS=y CONFIG_MLX5_VDPA_NET=m -# CONFIG_MLX5_VFIO_PCI is not set +CONFIG_MLX5_VFIO_PCI=m # CONFIG_MLX90614 is not set # CONFIG_MLX90632 is not set # CONFIG_MLXBF_BOOTCTL is not set @@ -4496,7 +4496,6 @@ CONFIG_SATA_AHCI=m CONFIG_SATA_AHCI_PLATFORM=m # CONFIG_SATA_DWC is not set # CONFIG_SATA_INIC162X is not set -CONFIG_SATA_LPM_POLICY=0 CONFIG_SATA_MOBILE_LPM_POLICY=0 # CONFIG_SATA_MV is not set # CONFIG_SATA_NV is not set @@ -6406,7 +6405,7 @@ CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_DW9807_VCM is not set CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX=m +# CONFIG_VIDEO_EM28XX is not set CONFIG_VIDEO_EM28XX_RC=m # CONFIG_VIDEO_EM28XX_V4L2 is not set # CONFIG_VIDEO_ET8EK8 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 2ce1c2511..939ba86a1 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5046,8 +5046,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_DWC is not set # CONFIG_SATA_HIGHBANK is not set CONFIG_SATA_INIC162X=m -CONFIG_SATA_LPM_POLICY=3 -CONFIG_SATA_MOBILE_LPM_POLICY=0 +CONFIG_SATA_MOBILE_LPM_POLICY=3 CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PMP=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 27329ac42..80274f3aa 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2810,16 +2810,16 @@ CONFIG_MD_RAID1=m CONFIG_MD_RAID456=m CONFIG_MD=y CONFIG_MEDIA_ALTERA_CI=m -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CEC_RC=y CONFIG_MEDIA_CEC_SUPPORT=y # CONFIG_MEDIA_CONTROLLER is not set -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set CONFIG_MEDIA_PCI_SUPPORT=y # CONFIG_MEDIA_PLATFORM_SUPPORT is not set -CONFIG_MEDIA_RADIO_SUPPORT=y +# CONFIG_MEDIA_RADIO_SUPPORT is not set # CONFIG_MEDIA_SDR_SUPPORT is not set CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_MEDIA_SUPPORT_FILTER=y @@ -3008,7 +3008,7 @@ CONFIG_MLX5_TC_CT=y CONFIG_MLX5_TC_SAMPLE=y CONFIG_MLX5_TLS=y CONFIG_MLX5_VDPA_NET=m -# CONFIG_MLX5_VFIO_PCI is not set +CONFIG_MLX5_VFIO_PCI=m # CONFIG_MLX90614 is not set # CONFIG_MLX90632 is not set # CONFIG_MLXBF_BOOTCTL is not set @@ -4475,7 +4475,6 @@ CONFIG_SATA_AHCI=m CONFIG_SATA_AHCI_PLATFORM=m # CONFIG_SATA_DWC is not set # CONFIG_SATA_INIC162X is not set -CONFIG_SATA_LPM_POLICY=0 CONFIG_SATA_MOBILE_LPM_POLICY=0 # CONFIG_SATA_MV is not set # CONFIG_SATA_NV is not set @@ -6383,7 +6382,7 @@ CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_DW9807_VCM is not set CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX=m +# CONFIG_VIDEO_EM28XX is not set CONFIG_VIDEO_EM28XX_RC=m # CONFIG_VIDEO_EM28XX_V4L2 is not set # CONFIG_VIDEO_ET8EK8 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 360d72035..04469bf57 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2822,16 +2822,16 @@ CONFIG_MD_RAID10=m CONFIG_MD_RAID1=m CONFIG_MD_RAID456=m CONFIG_MEDIA_ALTERA_CI=m -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CEC_RC=y CONFIG_MEDIA_CEC_SUPPORT=y # CONFIG_MEDIA_CONTROLLER is not set -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set CONFIG_MEDIA_PCI_SUPPORT=y # CONFIG_MEDIA_PLATFORM_SUPPORT is not set -CONFIG_MEDIA_RADIO_SUPPORT=y +# CONFIG_MEDIA_RADIO_SUPPORT is not set # CONFIG_MEDIA_SDR_SUPPORT is not set CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_MEDIA_SUPPORT_FILTER=y @@ -3020,7 +3020,7 @@ CONFIG_MLX5_TC_CT=y CONFIG_MLX5_TC_SAMPLE=y CONFIG_MLX5_TLS=y CONFIG_MLX5_VDPA_NET=m -# CONFIG_MLX5_VFIO_PCI is not set +CONFIG_MLX5_VFIO_PCI=m # CONFIG_MLX90614 is not set # CONFIG_MLX90632 is not set # CONFIG_MLXBF_BOOTCTL is not set @@ -4492,7 +4492,6 @@ CONFIG_SATA_AHCI=m CONFIG_SATA_AHCI_PLATFORM=m # CONFIG_SATA_DWC is not set # CONFIG_SATA_INIC162X is not set -CONFIG_SATA_LPM_POLICY=0 CONFIG_SATA_MOBILE_LPM_POLICY=0 # CONFIG_SATA_MV is not set # CONFIG_SATA_NV is not set @@ -6409,7 +6408,7 @@ CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_DW9807_VCM is not set CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX=m +# CONFIG_VIDEO_EM28XX is not set CONFIG_VIDEO_EM28XX_RC=m # CONFIG_VIDEO_EM28XX_V4L2 is not set # CONFIG_VIDEO_ET8EK8 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index c28695ac2..5ca8928c5 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -3559,8 +3559,9 @@ CONFIG_MFD_ENE_KB3930=m # CONFIG_MFD_GATEWORKS_GSC is not set # CONFIG_MFD_HI6421_PMIC is not set # CONFIG_MFD_HI6421_SPMI is not set -CONFIG_MFD_INTEL_LPSS_ACPI=y -CONFIG_MFD_INTEL_LPSS_PCI=y +CONFIG_MFD_INTEL_LPSS_ACPI=m +CONFIG_MFD_INTEL_LPSS=m +CONFIG_MFD_INTEL_LPSS_PCI=m CONFIG_MFD_INTEL_M10_BMC=m CONFIG_MFD_INTEL_PMC_BXT=m # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set @@ -5024,7 +5025,6 @@ CONFIG_PWM_DWC=m # CONFIG_PWM_FSL_FTM is not set CONFIG_PWM_HIBVT=m # CONFIG_PWM_INTEL_LGM is not set -CONFIG_PWM_LPSS=m CONFIG_PWM_LPSS_PCI=m CONFIG_PWM_LPSS_PLATFORM=m # CONFIG_PWM_PCA9685 is not set @@ -5457,8 +5457,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_DWC is not set # CONFIG_SATA_HIGHBANK is not set CONFIG_SATA_INIC162X=m -CONFIG_SATA_LPM_POLICY=3 -CONFIG_SATA_MOBILE_LPM_POLICY=0 +CONFIG_SATA_MOBILE_LPM_POLICY=3 CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PMP=y @@ -5887,7 +5886,7 @@ CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_EXAR=m CONFIG_SERIAL_8250_EXTENDED=y # CONFIG_SERIAL_8250_FINTEK is not set -CONFIG_SERIAL_8250_LPSS=y +CONFIG_SERIAL_8250_LPSS=m CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_MID=y CONFIG_SERIAL_8250_NR_UARTS=32 diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 0fd7c633b..d7259ab91 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3005,16 +3005,16 @@ CONFIG_MD_RAID1=m CONFIG_MD_RAID456=m CONFIG_MD=y CONFIG_MEDIA_ALTERA_CI=m -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_CAMERA_SUPPORT=y # CONFIG_MEDIA_CEC_RC is not set CONFIG_MEDIA_CEC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set CONFIG_MEDIA_PCI_SUPPORT=y # CONFIG_MEDIA_PLATFORM_SUPPORT is not set -CONFIG_MEDIA_RADIO_SUPPORT=y +# CONFIG_MEDIA_RADIO_SUPPORT is not set # CONFIG_MEDIA_SDR_SUPPORT is not set CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_MEDIA_SUPPORT_FILTER=y @@ -3077,9 +3077,9 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_GATEWORKS_GSC is not set # CONFIG_MFD_HI6421_PMIC is not set # CONFIG_MFD_HI655X_PMIC is not set -CONFIG_MFD_INTEL_LPSS_ACPI=y -CONFIG_MFD_INTEL_LPSS_PCI=y -CONFIG_MFD_INTEL_LPSS=y +CONFIG_MFD_INTEL_LPSS_ACPI=m +CONFIG_MFD_INTEL_LPSS=m +CONFIG_MFD_INTEL_LPSS_PCI=m # CONFIG_MFD_INTEL_M10_BMC is not set # CONFIG_MFD_INTEL_PMC_BXT is not set # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set @@ -3211,7 +3211,7 @@ CONFIG_MLX5_TC_CT=y CONFIG_MLX5_TC_SAMPLE=y CONFIG_MLX5_TLS=y CONFIG_MLX5_VDPA_NET=m -# CONFIG_MLX5_VFIO_PCI is not set +CONFIG_MLX5_VFIO_PCI=m # CONFIG_MLX90614 is not set # CONFIG_MLX90632 is not set # CONFIG_MLXBF_BOOTCTL is not set @@ -4714,7 +4714,6 @@ CONFIG_SATA_AHCI=m CONFIG_SATA_AHCI_PLATFORM=m # CONFIG_SATA_DWC is not set # CONFIG_SATA_INIC162X is not set -CONFIG_SATA_LPM_POLICY=0 CONFIG_SATA_MOBILE_LPM_POLICY=0 # CONFIG_SATA_MV is not set # CONFIG_SATA_NV is not set @@ -5110,7 +5109,7 @@ CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_EXTENDED=y # CONFIG_SERIAL_8250_FINTEK is not set -CONFIG_SERIAL_8250_LPSS=y +CONFIG_SERIAL_8250_LPSS=m CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_MID=y CONFIG_SERIAL_8250_NR_UARTS=64 @@ -6645,7 +6644,7 @@ CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_DW9807_VCM is not set CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX=m +# CONFIG_VIDEO_EM28XX is not set CONFIG_VIDEO_EM28XX_RC=m # CONFIG_VIDEO_EM28XX_V4L2 is not set # CONFIG_VIDEO_ET8EK8 is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 4efaa64b0..e17e4eb0c 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3540,8 +3540,9 @@ CONFIG_MFD_ENE_KB3930=m # CONFIG_MFD_GATEWORKS_GSC is not set # CONFIG_MFD_HI6421_PMIC is not set # CONFIG_MFD_HI6421_SPMI is not set -CONFIG_MFD_INTEL_LPSS_ACPI=y -CONFIG_MFD_INTEL_LPSS_PCI=y +CONFIG_MFD_INTEL_LPSS_ACPI=m +CONFIG_MFD_INTEL_LPSS=m +CONFIG_MFD_INTEL_LPSS_PCI=m CONFIG_MFD_INTEL_M10_BMC=m CONFIG_MFD_INTEL_PMC_BXT=m # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set @@ -5004,7 +5005,6 @@ CONFIG_PWM_DWC=m # CONFIG_PWM_FSL_FTM is not set CONFIG_PWM_HIBVT=m # CONFIG_PWM_INTEL_LGM is not set -CONFIG_PWM_LPSS=m CONFIG_PWM_LPSS_PCI=m CONFIG_PWM_LPSS_PLATFORM=m # CONFIG_PWM_PCA9685 is not set @@ -5437,8 +5437,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_DWC is not set # CONFIG_SATA_HIGHBANK is not set CONFIG_SATA_INIC162X=m -CONFIG_SATA_LPM_POLICY=3 -CONFIG_SATA_MOBILE_LPM_POLICY=0 +CONFIG_SATA_MOBILE_LPM_POLICY=3 CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PMP=y @@ -5867,7 +5866,7 @@ CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_EXAR=m CONFIG_SERIAL_8250_EXTENDED=y # CONFIG_SERIAL_8250_FINTEK is not set -CONFIG_SERIAL_8250_LPSS=y +CONFIG_SERIAL_8250_LPSS=m CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_MID=y CONFIG_SERIAL_8250_NR_UARTS=32 diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 3f970c44a..9dda60d0b 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2985,16 +2985,16 @@ CONFIG_MD_RAID1=m CONFIG_MD_RAID456=m CONFIG_MD=y CONFIG_MEDIA_ALTERA_CI=m -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_CAMERA_SUPPORT=y # CONFIG_MEDIA_CEC_RC is not set CONFIG_MEDIA_CEC_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set CONFIG_MEDIA_PCI_SUPPORT=y # CONFIG_MEDIA_PLATFORM_SUPPORT is not set -CONFIG_MEDIA_RADIO_SUPPORT=y +# CONFIG_MEDIA_RADIO_SUPPORT is not set # CONFIG_MEDIA_SDR_SUPPORT is not set CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_MEDIA_SUPPORT_FILTER=y @@ -3057,9 +3057,9 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_GATEWORKS_GSC is not set # CONFIG_MFD_HI6421_PMIC is not set # CONFIG_MFD_HI655X_PMIC is not set -CONFIG_MFD_INTEL_LPSS_ACPI=y -CONFIG_MFD_INTEL_LPSS_PCI=y -CONFIG_MFD_INTEL_LPSS=y +CONFIG_MFD_INTEL_LPSS_ACPI=m +CONFIG_MFD_INTEL_LPSS=m +CONFIG_MFD_INTEL_LPSS_PCI=m # CONFIG_MFD_INTEL_M10_BMC is not set # CONFIG_MFD_INTEL_PMC_BXT is not set # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set @@ -3191,7 +3191,7 @@ CONFIG_MLX5_TC_CT=y CONFIG_MLX5_TC_SAMPLE=y CONFIG_MLX5_TLS=y CONFIG_MLX5_VDPA_NET=m -# CONFIG_MLX5_VFIO_PCI is not set +CONFIG_MLX5_VFIO_PCI=m # CONFIG_MLX90614 is not set # CONFIG_MLX90632 is not set # CONFIG_MLXBF_BOOTCTL is not set @@ -4692,7 +4692,6 @@ CONFIG_SATA_AHCI=m CONFIG_SATA_AHCI_PLATFORM=m # CONFIG_SATA_DWC is not set # CONFIG_SATA_INIC162X is not set -CONFIG_SATA_LPM_POLICY=0 CONFIG_SATA_MOBILE_LPM_POLICY=0 # CONFIG_SATA_MV is not set # CONFIG_SATA_NV is not set @@ -5088,7 +5087,7 @@ CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_EXTENDED=y # CONFIG_SERIAL_8250_FINTEK is not set -CONFIG_SERIAL_8250_LPSS=y +CONFIG_SERIAL_8250_LPSS=m CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_MID=y CONFIG_SERIAL_8250_NR_UARTS=64 @@ -6621,7 +6620,7 @@ CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_DW9807_VCM is not set CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX=m +# CONFIG_VIDEO_EM28XX is not set CONFIG_VIDEO_EM28XX_RC=m # CONFIG_VIDEO_EM28XX_V4L2 is not set # CONFIG_VIDEO_ET8EK8 is not set diff --git a/kernel.spec b/kernel.spec index 70c9dbb0e..4f5c20e2f 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,9 +85,9 @@ 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 -%global distro_build 0.rc3.27 +%global distro_build 0.rc3.20220420git559089e0a93d442.29 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -115,7 +115,6 @@ 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 @@ -132,13 +131,13 @@ Summary: The Linux kernel %define rpmversion 5.18.0 %define patchversion 5.18 -%define pkgrelease 0.rc3.27 +%define pkgrelease 0.rc3.20220420git559089e0a93d442.29 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.27%{?buildid}%{?dist} +%define specrelease 0.rc3.20220420git559089e0a93d442.29%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -413,11 +412,6 @@ Summary: The Linux kernel %define with_zfcpdump 0 %endif -# skip BTF in kernel modules for s390x -%ifnarch s390x -%define with_kmod_btf --keep-section '.BTF' -%endif - %if 0%{?fedora} # This is not for Fedora %define with_zfcpdump 0 @@ -698,7 +692,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.18-rc3.tar.xz +Source0: linux-5.18-rc3-7-g559089e0a93d442.tar.xz Source1: Makefile.rhelver @@ -1121,7 +1115,7 @@ AutoReqProv: no\ %description %{?1:%{1}-}debuginfo\ This package provides debug information for package %{name}%{?1:-%{1}}.\ This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\ -%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} %{?with_kmod_btf} -p '.*\/usr\/src\/kernels/.*|XXX' -o ignored-debuginfo.list -p '/.*/%%{KVERREL_RE}%{?1:[+]%{1}}/.*|/.*%%{KVERREL_RE}%{?1:\+%{1}}(\.debug)?' -o debuginfo%{?1}.list}\ +%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} --keep-section '.BTF' -p '.*\/usr\/src\/kernels/.*|XXX' -o ignored-debuginfo.list -p '/.*/%%{KVERREL_RE}%{?1:[+]%{1}}/.*|/.*%%{KVERREL_RE}%{?1:\+%{1}}(\.debug)?' -o debuginfo%{?1}.list}\ %{nil} # @@ -1390,8 +1384,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.18-rc3 -c -mv linux-5.18-rc3 linux-%{KVERREL} +%setup -q -n kernel-5.18-rc3-7-g559089e0a93d442 -c +mv linux-5.18-rc3-7-g559089e0a93d442 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -1447,7 +1441,7 @@ cp %{SOURCE80} . cp %{SOURCE3000} . # kernel-local cp %{SOURCE3001} . -VERSION=%{version} ./generate_all_configs.sh %{primary_target} %{debugbuildsenabled} +FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled} # Merge in any user-provided local config option changes %ifnarch %nobuildarches @@ -1498,7 +1492,7 @@ for opt in %{clang_make_opts}; do OPTS="$OPTS -m $opt" done %endif -./process_configs.sh $OPTS kernel %{rpmversion} +RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${rpmversion} cp %{SOURCE82} . RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target} @@ -1857,6 +1851,14 @@ BuildKernel() { rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/tracing rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/spdxcheck.py +%ifarch s390x + # CONFIG_EXPOLINE_EXTERN=y produces arch/s390/lib/expoline.o + # which is needed during external module build. + if [ -f arch/s390/lib/expoline.o ]; then + cp -a --parents arch/s390/lib/expoline.o $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + fi +%endif + # Files for 'make scripts' to succeed with kernel-devel. mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/security/selinux/include cp -a --parents security/selinux/include/classmap.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build @@ -2348,7 +2350,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' | xargs -P%{zcpu} xz; \ + find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P${RPM_BUILD_NCPUS} xz; \ fi \ %{nil} @@ -3025,6 +3027,27 @@ fi # # %changelog +* Wed Apr 20 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc3.559089e0a93d442.28] +- redhat/Makefile: Deprecate SINGLE_TARBALL (Prarit Bhargava) +- redhat/Makefile.rhpkg: Remove quotes for RHDISTGIT (Prarit Bhargava) +- redhat/self-test: Clean up data set (Prarit Bhargava) +- redhat/scripts/create-tarball.sh: Use Makefile variables (Prarit Bhargava) +- redhat/Makefile: Cleanup TARBALL target (Prarit Bhargava) +- redhat/Makefile: Use RPMVERSION (Prarit Bhargava) +- redhat/scripts/rh-dist-git.sh: Use Makefile variables (Prarit Bhargava) +- redhat/configs/build_configs.sh: Use Makefile variables (Prarit Bhargava) +- redhat/configs/process_configs.sh: Use Makefile variables (Prarit Bhargava) +- redhat/kernel.spec.template: Use RPM_BUILD_NCPUS (Prarit Bhargava) +- redhat/configs/generate_all_configs.sh: Use Makefile variables (Prarit Bhargava) + +* Wed Apr 20 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc3.559089e0a93d442.27] +- spec: keep .BTF section in modules for s390 (Yauheni Kaliuta) [2071969] +- kernel.spec.template: Ship arch/s390/lib/expoline.o in kernel-devel (Ondrej Mosnacek) +- redhat: disable tv/radio media device infrastructure (Jarod Wilson) +- redhat/configs: clean up INTEL_LPSS configuration (David Arcari) +- Have to rename the actual contents too (Justin M. Forbes) +- The CONFIG_SATA_MOBILE_LPM_POLICY rebane was reverted (Justin M. Forbes) + * Fri Apr 15 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc2.028192fea1de083.23] - redhat: Enable KASAN on all ELN debug kernels (Nico Pache) - redhat: configs: Enable INTEL_IOMMU_DEBUGFS for debug builds (Jerry Snitselaar) diff --git a/process_configs.sh b/process_configs.sh index 91e6d1226..e6bce0fe6 100755 --- a/process_configs.sh +++ b/process_configs.sh @@ -191,7 +191,7 @@ function commit_new_configs() # assume we are in $source_tree/configs, need to get to top level pushd "$(switch_to_toplevel)" &>/dev/null - for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config + for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}"*.config do arch=$(head -1 "$cfg" | cut -b 3-) cfgtmp="${cfg}.tmp" @@ -303,7 +303,7 @@ function process_configs() [ -f .mismatches ] && rm -f .mismatches count=0 - for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config + for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}"*.config do if [ "$count" -eq 0 ]; then # do the first one by itself so that tools are built @@ -385,12 +385,9 @@ do shift done -PACKAGE_NAME="${1:-kernel}" # defines the package name used -KVERREL="$(test -n "$2" && echo "-$2" || echo "")" -SUBARCH="$(test -n "$3" && echo "-$3" || echo "")" -FLAVOR="$(test -n "$4" && echo "-$4" || echo "-ark")" +KVERREL="$(test -n "$1" && echo "-$1" || echo "")" +FLAVOR="$(test -n "$2" && echo "-$2" || echo "-ark")" # shellcheck disable=SC2015 -RHJOBS="$(test -n "$5" && echo "$5" || nproc --all)" SCRIPT=$(readlink -f "$0") SCRIPT_DIR=$(dirname "$SCRIPT") @@ -1,3 +1,3 @@ -SHA512 (linux-5.18-rc3.tar.xz) = a929f96ffccd944569d4bf7a82bac08f1a72022a6082b0d5a27fd09b075cee4c105dd21b165a313b68377a13ca107fa4195f7afc695bd361b360200e542f459c -SHA512 (kernel-abi-stablelists-5.18.0-0.rc3.27.tar.bz2) = e6dc288cd2066791c51ab6579ff05a0597330a57db2fe5a5999cb61559f237b7bd01026c541458fa0657be2279227774609aff47d17fa756d0e0e158207bd15f -SHA512 (kernel-kabi-dw-5.18.0-0.rc3.27.tar.bz2) = 81df75948363bc4f97ca74ff4ffa55673dbd0ac6a6525896d97272bc62419a4a1078b55d9a2e990b8ce7e5cd3e9060b4d962e74ac564ef7bb0c8af53a965cee0 +SHA512 (linux-5.18-rc3-7-g559089e0a93d442.tar.xz) = 147c99082b86efb70893ebfd1a9b99fa24ddd7bbebcc67b38e64b021c54a9a6321d7e45715477a07662b19121b502e09169683b84929c6d7b5f0154fd2182b4b +SHA512 (kernel-abi-stablelists-5.18.0-0.rc3.20220420git559089e0a93d442.29.tar.bz2) = c1c44caf00c826802d2dcb46ef48ff58224d1bf5866668bb63b13de6d26dd6b92215b485d7cb676a156e07a987a89ae1ee9e1b6bf125ba4f743dd3e50b1108c2 +SHA512 (kernel-kabi-dw-5.18.0-0.rc3.20220420git559089e0a93d442.29.tar.bz2) = 957985dafa522c4f1cf60624f6cde719db15ef5bdef3fe7e7884c48fc61c63391af7e88c30afa3480eac41612a7795377c497dc7e7f09335d1aefac63091120a |