f33d09bf0e
* Fri Jan 24 2025 Jan Stancek <jstancek@redhat.com> [6.12.0-45.el10] - netfilter: conntrack: clamp maximum hashtable size to INT_MAX (CKI Backport Bot) [RHEL-73620] - netfilter: nf_tables: imbalance in flowtable binding (CKI Backport Bot) [RHEL-73620] - netfilter: nft_set_hash: unaligned atomic read on struct nft_set_ext (CKI Backport Bot) [RHEL-73620] - netfilter: nft_set_hash: skip duplicated elements pending gc run (CKI Backport Bot) [RHEL-73620] - netfilter: nft_inner: incorrect percpu area handling under softirq (CKI Backport Bot) [RHEL-73620] - netfilter: nft_socket: remove WARN_ON_ONCE on maximum cgroup level (CKI Backport Bot) [RHEL-73620] - netfilter: x_tables: fix LED ID check in led_tg_check() (CKI Backport Bot) [RHEL-73620] - ipvs: fix UB due to uninitialized stack access in ip_vs_protocol_init() (CKI Backport Bot) [RHEL-73620] - netfilter: ipset: add missing range check in bitmap_ip_uadt (CKI Backport Bot) [RHEL-73620] - netfilter: bpf: Pass string literal as format argument of request_module() (CKI Backport Bot) [RHEL-73620] - netfilter: nf_tables: must hold rcu read lock while iterating object type list (CKI Backport Bot) [RHEL-73620] - netfilter: nf_tables: must hold rcu read lock while iterating expression type list (CKI Backport Bot) [RHEL-73620] - mptcp: fix TCP options overflow. (CKI Backport Bot) [RHEL-73495] - mptcp: sysctl: sched: avoid using current->nsproxy (CKI Backport Bot) [RHEL-73495] - mptcp: sysctl: blackhole timeout: avoid using current->nsproxy (CKI Backport Bot) [RHEL-73495] - KVM: s390: add gen17 facilities to CPU model (Mete Durlu) [RHEL-24195] - KVM: s390: add msa11 to cpu model (Mete Durlu) [RHEL-24195] - KVM: s390: add concurrent-function facility to cpu model (Mete Durlu) [RHEL-24195] - redhat/configs: Re-enable full ZRAM configuration and all backends (Neal Gompa) [RHEL-72036] - wireguard: device: support big tcp GSO (CKI Backport Bot) [RHEL-74019] - wireguard: selftests: load nf_conntrack if not present (CKI Backport Bot) [RHEL-74019] - wireguard: allowedips: remove redundant selftest call (CKI Backport Bot) [RHEL-74019] - wireguard: device: omit unnecessary memset of netdev private data (CKI Backport Bot) [RHEL-74019] - bpf: Do not alloc arena on unsupported arches (Viktor Malik) [RHEL-68958] - powerpc/pseries/eeh: Fix get PE state translation (Mamatha Inamdar) [RHEL-74254] - MAINTAINERS: Make Kristen Accardi the IAA crypto driver maintainer (Vladis Dronov) [RHEL-58597] - crypto: iaa - Remove potential infinite loop in check_completion() (Vladis Dronov) [RHEL-58597] - s390/entry: Mark IRQ entries to fix stack depot warnings (Mete Durlu) [RHEL-74467] Resolves: RHEL-24195, RHEL-58597, RHEL-65818, RHEL-68958, RHEL-70212, RHEL-72036, RHEL-73201, RHEL-73495, RHEL-73620, RHEL-74019, RHEL-74254, RHEL-74467 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 = 0
|
|
|
|
#
|
|
# 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 = 45
|
|
|
|
#
|
|
# 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
|