diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-10-07 09:54:44 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-10-07 09:54:44 -0500 |
| commit | f7a55ba381de17d8e5511a97441944b797aa62a5 (patch) | |
| tree | df2cb85063e94e396b776ea25c0e4b5f9f286c39 /0001-Pull-the-RHEL-version-defines-out-of-the-Makefile.patch | |
| parent | 5f7d08ee5f8b230f5dfb20783ec265ef40387520 (diff) | |
| download | kernel-f7a55ba381de17d8e5511a97441944b797aa62a5.tar.gz kernel-f7a55ba381de17d8e5511a97441944b797aa62a5.tar.xz kernel-f7a55ba381de17d8e5511a97441944b797aa62a5.zip | |
kernel-5.9.0-0.rc8.20201007git7575fdda569b.29
* Wed Oct 07 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc8.20201007git7575fdda569b.29]
- Merge ark-patches
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-Pull-the-RHEL-version-defines-out-of-the-Makefile.patch')
| -rw-r--r-- | 0001-Pull-the-RHEL-version-defines-out-of-the-Makefile.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/0001-Pull-the-RHEL-version-defines-out-of-the-Makefile.patch b/0001-Pull-the-RHEL-version-defines-out-of-the-Makefile.patch deleted file mode 100644 index bd31c670c..000000000 --- a/0001-Pull-the-RHEL-version-defines-out-of-the-Makefile.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jeremy Cline <jcline@redhat.com> -Date: Tue, 17 Sep 2019 17:11:03 +0000 -Subject: [PATCH] Pull the RHEL version defines out of the Makefile - -This is done via the kernel-put-RHEL-info-into-generated-headers.patch -in the rhpatches branch. - -Signed-off-by: Jeremy Cline <jcline@redhat.com> ---- - Makefile | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) - -diff --git a/Makefile b/Makefile -index 48a7abae02d2..2d826a14824a 100644 ---- a/Makefile -+++ b/Makefile -@@ -16,6 +16,7 @@ PHONY := _all - _all: - - # Set RHEL variables -+# Use this spot to avoid future merge conflicts - include Makefile.rhelver - - # We are using a recursive build, so we need to do a little thinking -@@ -1172,13 +1173,7 @@ endef - define filechk_version.h - echo \#define LINUX_VERSION_CODE $(shell \ - expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \ -- echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))'; \ -- echo '#define RHEL_MAJOR $(RHEL_MAJOR)'; \ -- echo '#define RHEL_MINOR $(RHEL_MINOR)'; \ -- echo '#define RHEL_RELEASE_VERSION(a,b) (((a) << 8) + (b))'; \ -- echo '#define RHEL_RELEASE_CODE \ -- $(shell expr $(RHEL_MAJOR) \* 256 + $(RHEL_MINOR))'; \ -- echo '#define RHEL_RELEASE "$(RHEL_RELEASE)"' -+ echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))' - endef - - $(version_h): FORCE --- -2.28.0 - |