From dc90062fcc26c60cf7ccd73529503e73fb9c408b Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 14 Jun 2022 12:39:46 -0500 Subject: kernel-5.18.4-100 * Tue Jun 14 2022 Justin M. Forbes [5.18.4-0] - Linux v5.18.4 rebase - Enable CKI on os-build MRs only (Don Zickus) - drm/amd/display: Cap OLED brightness per max frame-average luminance (Roman Li) [2095858] - redhat/configs/fedora: Enable a set of modules used on some x86 tablets (Hans de Goede) - redhat/configs/fedora: enable missing modules modules for Intel IPU3 camera support (Hans de Goede) - redhat/configs: Make INTEL_SOC_PMIC_CHTDC_TI builtin (Hans de Goede) - redhat/configs: restore/fix core INTEL_LPSS configs to be builtin again (Hans de Goede) Resolves: rhbz#2095858 Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'Makefile.rhelver') diff --git a/Makefile.rhelver b/Makefile.rhelver index 8e6ba0821..bedf1e208 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -14,6 +14,28 @@ RHEL_MINOR = 99 # Do not trim this comment. RHEL_RELEASE = 0 +# +# 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--X.el*, +# where X is the build number. With ZSTREAM set to "yes", we will have +# builds with kernel--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 # -------------------- -- cgit