diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-03-17 12:44:57 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-03-17 12:44:57 -0500 |
| commit | c7a5157d4de03982fcd2e3cd1f035858153ab349 (patch) | |
| tree | 668203ddf31d69847944bd024141f0df51734f08 /Makefile.rhelver | |
| parent | f1ef1f7f32c9a1eaf82dff51b2cc209b712a6b01 (diff) | |
| download | kernel-c7a5157d4de03982fcd2e3cd1f035858153ab349.tar.gz kernel-c7a5157d4de03982fcd2e3cd1f035858153ab349.tar.xz kernel-c7a5157d4de03982fcd2e3cd1f035858153ab349.zip | |
kernel-5.11.7-9
* Wed Mar 17 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.7-9]
- Disable weak-modules again rhbz 1828455 (Justin M. Forbes)
- More config updates for gcc-plugin turn off (Justin M. Forbes)
- fedora: the PCH_CAN driver is x86-32 only (Peter Robinson)
- common: disable legacy CAN device support (Peter Robinson)
- common: Enable Microchip MCP251x/MCP251xFD CAN controllers (Peter Robinson)
- common: Bosch MCAN support for Intel Elkhart Lake (Peter Robinson)
- common: enable CAN_PEAK_PCIEFD PCI-E driver (Peter Robinson)
- common: disable CAN_PEAK_PCIEC PCAN-ExpressCard (Peter Robinson)
- common: enable common CAN layer 2 protocols (Peter Robinson)
- ark: disable CAN_LEDS option (Peter Robinson)
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'Makefile.rhelver')
| -rw-r--r-- | Makefile.rhelver | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver new file mode 100644 index 000000000..f74bfc4ea --- /dev/null +++ b/Makefile.rhelver @@ -0,0 +1,45 @@ +RHEL_MAJOR = 8 +RHEL_MINOR = 99 + +# +# RHEL_RELEASE +# ------------- +# +# Represents build number in 'release' part of RPM's name-version-release. +# name is <package_name>, e.g. kernel +# version is upstream kernel version this kernel is based on, e.g. 4.18.0 +# release is <RHEL_RELEASE>.<dist_tag>[<buildid>], e.g. 100.el8 +# +# Use this spot to avoid future merge conflicts. +# Do not trim this comment. +RHEL_RELEASE = 9 + +# +# Early y+1 numbering +# -------------------- +# +# In early y+1 process, RHEL_RELEASE consists of 2 numbers: x.y +# First is RHEL_RELEASE inherited/merged from y as-is, second number +# is incremented with each build starting from 1. After merge from y, +# it resets back to 1. This way y+1 nvr reflects status of last merge. +# +# Example: +# +# rhel8.0 rhel-8.1 +# kernel-4.18.0-58.el8 --> kernel-4.18.0-58.1.el8 +# kernel-4.18.0-58.2.el8 +# kernel-4.18.0-59.el8 kernel-4.18.0-59.1.el8 +# kernel-4.18.0-60.el8 +# kernel-4.18.0-61.el8 --> kernel-4.18.0-61.1.el8 +# +# +# Use this spot to avoid future merge conflicts. +# Do not trim this comment. +EARLY_YSTREAM ?= no +EARLY_YBUILD:= +EARLY_YRELEASE:= +ifneq ("$(ZSTREAM)", "yes") + ifeq ("$(EARLY_YSTREAM)","yes") + RHEL_RELEASE:=$(RHEL_RELEASE).$(EARLY_YRELEASE) + endif +endif |