d1b6f8c7af
* Thu Apr 23 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc2.20200423git7adc4b399952.1]
- 7adc4b399952 rebase
- Match template format in kernel.spec.template ("Justin M. Forbes")
- Break out the Patches into individual files for dist-git ("Justin M. Forbes")
- Break the Red Hat patch into individual commits (Jeremy Cline)
- Adjust module filtering so CONFIG_DRM_DP_CEC can be set (Jeremy Cline)
- Add a script to generate release tags and branches (Jeremy Cline)
- Set CONFIG_VDPA for fedora ("Justin M. Forbes")
- Provide defaults in ark-rebase-patches.sh (Jeremy Cline)
- Default ark-rebase-patches.sh to not report issues (Jeremy Cline)
Resolves: rhbz#
Signed-off-by: Jeremy Cline <jcline@redhat.com>
65 lines
1.8 KiB
Diff
65 lines
1.8 KiB
Diff
From 8474ffe83a89d7b5d2c6515875a308ff682df6f9 Mon Sep 17 00:00:00 2001
|
|
From: Kernel Team <kernel-team@fedoraproject.org>
|
|
Date: Thu, 23 Apr 2020 16:41:20 -0400
|
|
Subject: [PATCH] Include Makefile.rhelver
|
|
|
|
Used to set the RHEL version.
|
|
---
|
|
Makefile.rhelver | 45 +++++++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 45 insertions(+)
|
|
|
|
diff --git a/Makefile.rhelver b/Makefile.rhelver
|
|
new file mode 100644
|
|
index 000000000000..7fb2464bc6de
|
|
--- /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 = 1
|
|
+
|
|
+#
|
|
+# 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
|
|
--
|
|
2.26.0
|
|
|