kernel-5.15-0.rc7.20211028git1fc596a56b33.56
* Thu Oct 28 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc7.20211028git1fc596a56b33.56] - redhat/kernel.spec.template: don't hardcode gcov arches (Jan Stancek) - redhat/configs: create a separate config for gcov options (Jan Stancek) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
parent
241366c6f4
commit
cfd6823b83
@ -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 = 55
|
RHEL_RELEASE = 56
|
||||||
|
|
||||||
#
|
#
|
||||||
# Early y+1 numbering
|
# Early y+1 numbering
|
||||||
|
@ -452,7 +452,7 @@ CONFIG_BCMA_HOST_PCI=y
|
|||||||
CONFIG_BCMA=m
|
CONFIG_BCMA=m
|
||||||
CONFIG_BCMA_POSSIBLE=y
|
CONFIG_BCMA_POSSIBLE=y
|
||||||
# CONFIG_BCM_FLEXRM_MBOX is not set
|
# CONFIG_BCM_FLEXRM_MBOX is not set
|
||||||
# CONFIG_BCMGENET is not set
|
CONFIG_BCMGENET=m
|
||||||
# CONFIG_BCM_KONA_USB2_PHY is not set
|
# CONFIG_BCM_KONA_USB2_PHY is not set
|
||||||
# CONFIG_BCM_NS_THERMAL is not set
|
# CONFIG_BCM_NS_THERMAL is not set
|
||||||
# CONFIG_BCM_PDC_MBOX is not set
|
# CONFIG_BCM_PDC_MBOX is not set
|
||||||
|
@ -452,7 +452,7 @@ CONFIG_BCMA_HOST_PCI=y
|
|||||||
CONFIG_BCMA=m
|
CONFIG_BCMA=m
|
||||||
CONFIG_BCMA_POSSIBLE=y
|
CONFIG_BCMA_POSSIBLE=y
|
||||||
# CONFIG_BCM_FLEXRM_MBOX is not set
|
# CONFIG_BCM_FLEXRM_MBOX is not set
|
||||||
# CONFIG_BCMGENET is not set
|
CONFIG_BCMGENET=m
|
||||||
# CONFIG_BCM_KONA_USB2_PHY is not set
|
# CONFIG_BCM_KONA_USB2_PHY is not set
|
||||||
# CONFIG_BCM_NS_THERMAL is not set
|
# CONFIG_BCM_NS_THERMAL is not set
|
||||||
# CONFIG_BCM_PDC_MBOX is not set
|
# CONFIG_BCM_PDC_MBOX is not set
|
||||||
|
@ -339,7 +339,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y
|
|||||||
CONFIG_BCMA_HOST_PCI=y
|
CONFIG_BCMA_HOST_PCI=y
|
||||||
# CONFIG_BCMA_HOST_SOC is not set
|
# CONFIG_BCMA_HOST_SOC is not set
|
||||||
CONFIG_BCMA=m
|
CONFIG_BCMA=m
|
||||||
# CONFIG_BCMGENET is not set
|
CONFIG_BCMGENET=m
|
||||||
# CONFIG_BCM_KONA_USB2_PHY is not set
|
# CONFIG_BCM_KONA_USB2_PHY is not set
|
||||||
# CONFIG_BCM_SBA_RAID is not set
|
# CONFIG_BCM_SBA_RAID is not set
|
||||||
# CONFIG_BCM_VK is not set
|
# CONFIG_BCM_VK is not set
|
||||||
|
@ -339,7 +339,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y
|
|||||||
CONFIG_BCMA_HOST_PCI=y
|
CONFIG_BCMA_HOST_PCI=y
|
||||||
# CONFIG_BCMA_HOST_SOC is not set
|
# CONFIG_BCMA_HOST_SOC is not set
|
||||||
CONFIG_BCMA=m
|
CONFIG_BCMA=m
|
||||||
# CONFIG_BCMGENET is not set
|
CONFIG_BCMGENET=m
|
||||||
# CONFIG_BCM_KONA_USB2_PHY is not set
|
# CONFIG_BCM_KONA_USB2_PHY is not set
|
||||||
# CONFIG_BCM_SBA_RAID is not set
|
# CONFIG_BCM_SBA_RAID is not set
|
||||||
# CONFIG_BCM_VK is not set
|
# CONFIG_BCM_VK is not set
|
||||||
|
@ -339,7 +339,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y
|
|||||||
CONFIG_BCMA_HOST_PCI=y
|
CONFIG_BCMA_HOST_PCI=y
|
||||||
# CONFIG_BCMA_HOST_SOC is not set
|
# CONFIG_BCMA_HOST_SOC is not set
|
||||||
# CONFIG_BCMA is not set
|
# CONFIG_BCMA is not set
|
||||||
# CONFIG_BCMGENET is not set
|
CONFIG_BCMGENET=m
|
||||||
# CONFIG_BCM_KONA_USB2_PHY is not set
|
# CONFIG_BCM_KONA_USB2_PHY is not set
|
||||||
# CONFIG_BCM_SBA_RAID is not set
|
# CONFIG_BCM_SBA_RAID is not set
|
||||||
# CONFIG_BCM_VK is not set
|
# CONFIG_BCM_VK is not set
|
||||||
|
@ -339,7 +339,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y
|
|||||||
CONFIG_BCMA_HOST_PCI=y
|
CONFIG_BCMA_HOST_PCI=y
|
||||||
# CONFIG_BCMA_HOST_SOC is not set
|
# CONFIG_BCMA_HOST_SOC is not set
|
||||||
# CONFIG_BCMA is not set
|
# CONFIG_BCMA is not set
|
||||||
# CONFIG_BCMGENET is not set
|
CONFIG_BCMGENET=m
|
||||||
# CONFIG_BCM_KONA_USB2_PHY is not set
|
# CONFIG_BCM_KONA_USB2_PHY is not set
|
||||||
# CONFIG_BCM_SBA_RAID is not set
|
# CONFIG_BCM_SBA_RAID is not set
|
||||||
# CONFIG_BCM_VK is not set
|
# CONFIG_BCM_VK is not set
|
||||||
|
@ -343,7 +343,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y
|
|||||||
CONFIG_BCMA_HOST_PCI=y
|
CONFIG_BCMA_HOST_PCI=y
|
||||||
# CONFIG_BCMA_HOST_SOC is not set
|
# CONFIG_BCMA_HOST_SOC is not set
|
||||||
# CONFIG_BCMA is not set
|
# CONFIG_BCMA is not set
|
||||||
# CONFIG_BCMGENET is not set
|
CONFIG_BCMGENET=m
|
||||||
# CONFIG_BCM_KONA_USB2_PHY is not set
|
# CONFIG_BCM_KONA_USB2_PHY is not set
|
||||||
# CONFIG_BCM_SBA_RAID is not set
|
# CONFIG_BCM_SBA_RAID is not set
|
||||||
# CONFIG_BCM_VK is not set
|
# CONFIG_BCM_VK is not set
|
||||||
|
@ -367,7 +367,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y
|
|||||||
CONFIG_BCMA_HOST_PCI=y
|
CONFIG_BCMA_HOST_PCI=y
|
||||||
# CONFIG_BCMA_HOST_SOC is not set
|
# CONFIG_BCMA_HOST_SOC is not set
|
||||||
CONFIG_BCMA=m
|
CONFIG_BCMA=m
|
||||||
# CONFIG_BCMGENET is not set
|
CONFIG_BCMGENET=m
|
||||||
# CONFIG_BCM_KONA_USB2_PHY is not set
|
# CONFIG_BCM_KONA_USB2_PHY is not set
|
||||||
# CONFIG_BCM_SBA_RAID is not set
|
# CONFIG_BCM_SBA_RAID is not set
|
||||||
# CONFIG_BCM_VK is not set
|
# CONFIG_BCM_VK is not set
|
||||||
|
@ -367,7 +367,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y
|
|||||||
CONFIG_BCMA_HOST_PCI=y
|
CONFIG_BCMA_HOST_PCI=y
|
||||||
# CONFIG_BCMA_HOST_SOC is not set
|
# CONFIG_BCMA_HOST_SOC is not set
|
||||||
CONFIG_BCMA=m
|
CONFIG_BCMA=m
|
||||||
# CONFIG_BCMGENET is not set
|
CONFIG_BCMGENET=m
|
||||||
# CONFIG_BCM_KONA_USB2_PHY is not set
|
# CONFIG_BCM_KONA_USB2_PHY is not set
|
||||||
# CONFIG_BCM_SBA_RAID is not set
|
# CONFIG_BCM_SBA_RAID is not set
|
||||||
# CONFIG_BCM_VK is not set
|
# CONFIG_BCM_VK is not set
|
||||||
|
18
kernel.spec
18
kernel.spec
@ -85,7 +85,7 @@ Summary: The Linux kernel
|
|||||||
# the --with-release option overrides this setting.)
|
# the --with-release option overrides this setting.)
|
||||||
%define debugbuildsenabled 0
|
%define debugbuildsenabled 0
|
||||||
|
|
||||||
%global distro_build 0.rc7.20211027gitd25f27432f80.55
|
%global distro_build 0.rc7.20211028git1fc596a56b33.56
|
||||||
|
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
%define secure_boot_arch x86_64
|
%define secure_boot_arch x86_64
|
||||||
@ -130,13 +130,13 @@ Summary: The Linux kernel
|
|||||||
|
|
||||||
%define rpmversion 5.15.0
|
%define rpmversion 5.15.0
|
||||||
%define patchversion 5.15
|
%define patchversion 5.15
|
||||||
%define pkgrelease 0.rc7.20211027gitd25f27432f80.55
|
%define pkgrelease 0.rc7.20211028git1fc596a56b33.56
|
||||||
|
|
||||||
# This is needed to do merge window version magic
|
# This is needed to do merge window version magic
|
||||||
%define patchlevel 15
|
%define patchlevel 15
|
||||||
|
|
||||||
# allow pkg_release to have configurable %%{?dist} tag
|
# allow pkg_release to have configurable %%{?dist} tag
|
||||||
%define specrelease 0.rc7.20211027gitd25f27432f80.55%{?buildid}%{?dist}
|
%define specrelease 0.rc7.20211028git1fc596a56b33.56%{?buildid}%{?dist}
|
||||||
|
|
||||||
%define pkg_release %{specrelease}
|
%define pkg_release %{specrelease}
|
||||||
|
|
||||||
@ -682,7 +682,7 @@ BuildRequires: lld
|
|||||||
# 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.15-rc7-18-gd25f27432f80.tar.xz
|
Source0: linux-5.15-rc7-33-g1fc596a56b33.tar.xz
|
||||||
|
|
||||||
Source1: Makefile.rhelver
|
Source1: Makefile.rhelver
|
||||||
|
|
||||||
@ -1374,8 +1374,8 @@ ApplyOptionalPatch()
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
%setup -q -n kernel-5.15-rc7-18-gd25f27432f80 -c
|
%setup -q -n kernel-5.15-rc7-33-g1fc596a56b33 -c
|
||||||
mv linux-5.15-rc7-18-gd25f27432f80 linux-%{KVERREL}
|
mv linux-5.15-rc7-33-g1fc596a56b33 linux-%{KVERREL}
|
||||||
|
|
||||||
cd linux-%{KVERREL}
|
cd linux-%{KVERREL}
|
||||||
cp -a %{SOURCE1} .
|
cp -a %{SOURCE1} .
|
||||||
@ -2972,10 +2972,14 @@ fi
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Oct 27 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc7.20211027gitd25f27432f80.55]
|
* Thu Oct 28 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc7.20211028git1fc596a56b33.56]
|
||||||
- redhat/kernel.spec.template: don't hardcode gcov arches (Jan Stancek)
|
- redhat/kernel.spec.template: don't hardcode gcov arches (Jan Stancek)
|
||||||
- redhat/configs: create a separate config for gcov options (Jan Stancek)
|
- redhat/configs: create a separate config for gcov options (Jan Stancek)
|
||||||
|
|
||||||
|
* Thu Oct 28 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc7.20211028git1fc596a56b33.55]
|
||||||
|
- Build CONFIG_SPI_PXA2XX as a module on x86 (Justin M. Forbes)
|
||||||
|
- redhat/configs: enable CONFIG_BCMGENET as module (Joel Savitz)
|
||||||
|
|
||||||
* Wed Oct 27 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc7.20211027gitd25f27432f80.54]
|
* Wed Oct 27 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc7.20211027gitd25f27432f80.54]
|
||||||
- Fedora config updates (Justin M. Forbes)
|
- Fedora config updates (Justin M. Forbes)
|
||||||
|
|
||||||
|
6
sources
6
sources
@ -1,3 +1,3 @@
|
|||||||
SHA512 (linux-5.15-rc7-18-gd25f27432f80.tar.xz) = 71ad5986f1a88f7ab3c269a02757b3bc6603ddf4d2c2215449bb4b431011ab378240d10032731734ade2df07578f521bd82dfeb527be2be4edc769597bdaa23b
|
SHA512 (linux-5.15-rc7-33-g1fc596a56b33.tar.xz) = 3d01247f38b2b00be77fcf5fb30598f3090c3155b6aafff4998ceaea0da6e6d121cbfba3bc40d5b1a2afeaea83df636cd9e0c0257c26adc498a5cff0ca9d6952
|
||||||
SHA512 (kernel-abi-stablelists-5.15.0-0.rc7.20211027gitd25f27432f80.55.tar.bz2) = 2f9cd3571d8537fadb57065b5dab268c0e42555c3b3647a68224364f8ec76c2d3dea69656a36d6cc57e1cc60f0a336529e702b0dfea7b24114872d48af8af8ba
|
SHA512 (kernel-abi-stablelists-5.15.0-0.rc7.20211028git1fc596a56b33.56.tar.bz2) = 752bb4ef2a0ba5019897c2a423d58cd6a7d2ff391af65282b3e2df546c552fb53d666212beaa362b379ed7f9ae9573ec2744a76ed440118e7017fafb73d7cb1f
|
||||||
SHA512 (kernel-kabi-dw-5.15.0-0.rc7.20211027gitd25f27432f80.55.tar.bz2) = c68855132b072ab6d738e3b53255c2745650f80c07f80c0e5101b0d8965db3789865eb038c91434894c25d595e4e38a56d8f6b57708600e0a043d7619ea9ad7d
|
SHA512 (kernel-kabi-dw-5.15.0-0.rc7.20211028git1fc596a56b33.56.tar.bz2) = c8161ddff89f740519feec746e31ef82144a650dbc2dbfd4487b370d95b28034f535ca172378e4793aea76a12dba333ce6b22e36496095192e8940aa172e78eb
|
||||||
|
Loading…
Reference in New Issue
Block a user