summaryrefslogtreecommitdiffstats
path: root/patch-5.7.0-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-04-29 16:12:02 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-04-29 16:12:02 -0500
commit67f313c852f247a960a3b75eeff433ee42cd388c (patch)
tree0f43a3abb8b8c077392ce0d0dd9b11f014f69aab /patch-5.7.0-redhat.patch
parent68dd5fcadc5b702c7d1426dea990ff0b55e62f42 (diff)
downloadkernel-67f313c852f247a960a3b75eeff433ee42cd388c.tar.gz
kernel-67f313c852f247a960a3b75eeff433ee42cd388c.tar.xz
kernel-67f313c852f247a960a3b75eeff433ee42cd388c.zip
kernel-5.7.0-0.rc3.20200429git1d2cc5ac6f66.1
* Wed Apr 29 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc3.20200429git1d2cc5ac6f66.1] - 1d2cc5ac6f66 rebase - Add cec to the filter overrides ("Justin M. Forbes") - Add overrides to filter-modules.sh ("Justin M. Forbes") - Copy Makefile.rhelver as a source file rather than a patch (Jeremy Cline) - Move the sed to clear the patch templating outside of conditionals ("Justin M. Forbes") - Only include open merge requests with "Include in Releases" label (Jeremy Cline) - Exit non-zero if the tag already exists for a release (Jeremy Cline) - Adjust the changelog update script to not push anything (Jeremy Cline) - Drop --target noarch from the rh-rpms make target (Jeremy Cline) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.7.0-redhat.patch')
-rw-r--r--patch-5.7.0-redhat.patch64
1 files changed, 0 insertions, 64 deletions
diff --git a/patch-5.7.0-redhat.patch b/patch-5.7.0-redhat.patch
deleted file mode 100644
index 67f52c2b4..000000000
--- a/patch-5.7.0-redhat.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 8474ffe83a89d7b5d2c6515875a308ff682df6f9 Mon Sep 17 00:00:00 2001
-From: Kernel Team <kernel-team@fedoraproject.org>
-Date: Wed, 29 Apr 2020 08:56:58 -0500
-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
-