3e5be7803c
* Thu Jun 26 2025 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [6.12.0-102.el10] - emulex/benet: correct command version selection in be_cmd_get_stats() (Dennis Chen) [RHEL-72657] - emulex/benet: Annotate flash_cookie as nonstring (Dennis Chen) [RHEL-72657] - be2net: fix sleeping while atomic bugs in be_ndo_bridge_getlink (Dennis Chen) [RHEL-72657] - i40e: fix MMIO write access to an invalid page in i40e_clear_hw (Dennis Chen) [RHEL-83569] - treewide: Switch/rename to timer_delete[_sync]() (Dennis Chen) [RHEL-83569] - i40e: use generic unrolled_count() macro (Dennis Chen) [RHEL-83569] - i40e: Remove unused i40e_dcb_hw_get_num_tc (Dennis Chen) [RHEL-83569] - i40e: Remove unused i40e_asq_send_command_v2 (Dennis Chen) [RHEL-83569] - i40e: Remove unused i40e_commit_partition_bw_setting (Dennis Chen) [RHEL-83569] - i40e: Remove unused i40e_del_filter (Dennis Chen) [RHEL-83569] - i40e: Remove unused i40e_get_cur_guaranteed_fd_count (Dennis Chen) [RHEL-83569] - i40e: Deadcode profile code (Dennis Chen) [RHEL-83569] - i40e: Remove unused i40e_(read|write)_phy_register (Dennis Chen) [RHEL-83569] - i40e: Remove unused i40e_blink_phy_link_led (Dennis Chen) [RHEL-83569] - i40e: Deadcode i40e_aq_* (Dennis Chen) [RHEL-83569] - ext4: only dirty folios when data journaling regular files (CKI Backport Bot) [RHEL-91256] - net: hsr: remove synchronize_rcu() from hsr_add_port() (Felix Maurer) [RHEL-84547] - net: hsr: must allocate more bytes for RedBox support (Felix Maurer) [RHEL-84547] - net: hsr: fix fill_frame_info() regression vs VLAN packets (Felix Maurer) [RHEL-84547] - net: hsr: avoid potential out-of-bound access in fill_frame_info() (Felix Maurer) [RHEL-84547] - net: hsr: fix hsr_init_sk() vs network/transport headers. (Felix Maurer) [RHEL-84547] - bonding: assign random address if device address is same as bond (Hangbin Liu) [RHEL-84037] Resolves: RHEL-72657, RHEL-83569, RHEL-84037, RHEL-84547, RHEL-91256 Signed-off-by: Jan Stancek <jstancek@redhat.com>
81 lines
2.6 KiB
Makefile
81 lines
2.6 KiB
Makefile
RHEL_MAJOR = 10
|
|
RHEL_MINOR = 1
|
|
|
|
#
|
|
# 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 = 102
|
|
|
|
#
|
|
# RHEL_REBASE_NUM
|
|
# ----------------
|
|
#
|
|
# Used in RPM version string for Gemini kernels, which dont use upstream
|
|
# VERSION/PATCHLEVEL/SUBLEVEL. The number represents rebase number for
|
|
# current MAJOR release.
|
|
#
|
|
# Use this spot to avoid future merge conflicts.
|
|
# Do not trim this comment.
|
|
RHEL_REBASE_NUM = 1
|
|
|
|
|
|
#
|
|
# ZSTREAM
|
|
# -------
|
|
#
|
|
# This variable controls whether we use zstream numbering or not for the
|
|
# package release. The zstream release keeps the build number of the last
|
|
# build done for ystream for the Beta milestone, and increments a second
|
|
# number for each build. The third number is used for branched builds
|
|
# (eg.: for builds with security fixes or hot fixes done outside of the
|
|
# batch release process).
|
|
#
|
|
# For example, with ZSTREAM unset or set to "no", all builds will contain
|
|
# a release with only the build number, eg.: kernel-<kernel version>-X.el*,
|
|
# where X is the build number. With ZSTREAM set to "yes", we will have
|
|
# builds with kernel-<kernel version>-X.Y.Z.el*, where X is the last
|
|
# RHEL_RELEASE number before ZSTREAM flag was set to yes, Y will now be the
|
|
# build number and Z will always be 1 except if you're doing a branched build
|
|
# (when you give RHDISTGIT_BRANCH on the command line, in which case the Z
|
|
# number will be incremented instead of the Y).
|
|
#
|
|
ZSTREAM ?= no
|
|
|
|
#
|
|
# 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
|