diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-08-12 08:21:58 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-08-12 08:21:58 -0500 |
commit | 8341d1868d403a53608b5a5fb8e80c73620dea88 (patch) | |
tree | 294058e7692abe966ab4e674b76d783ce6b89979 /0001-put-RHEL-info-into-generated-headers.patch | |
parent | 47a895f435cccb2cb14eb5d0c52d2f6d4d904907 (diff) | |
download | kernel-8341d1868d403a53608b5a5fb8e80c73620dea88.tar.gz kernel-8341d1868d403a53608b5a5fb8e80c73620dea88.tar.xz kernel-8341d1868d403a53608b5a5fb8e80c73620dea88.zip |
Cleanups to prepare for stable Fedora
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-put-RHEL-info-into-generated-headers.patch')
-rw-r--r-- | 0001-put-RHEL-info-into-generated-headers.patch | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/0001-put-RHEL-info-into-generated-headers.patch b/0001-put-RHEL-info-into-generated-headers.patch deleted file mode 100644 index ee5fc2195..000000000 --- a/0001-put-RHEL-info-into-generated-headers.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Laura Abbott <labbott@redhat.com> -Date: Mon, 7 Jan 2019 20:55:21 +0000 -Subject: [PATCH] put RHEL info into generated headers - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1663728 - -Commit 43fee2b23895 ("kbuild: do not redirect the first prerequisite for -filechk") upstream introduced some context diff. This just fixes that up. - - Bugzilla: http://bugzilla.redhat.com/1544999 - - kernel-alt commit b3bbf3db12b8a48491eb4175eae25eb907f092ac - Author: Prarit Bhargava <prarit@redhat.com> - Date: Fri Feb 9 18:09:25 2018 -0500 - - [kernel] put RHEL info into generated headers - - Message-id: <20180209180926.5955-2-prarit@redhat.com> - Patchwork-id: 205585 - O-Subject: [RHEL-ALT-7.5 BZ 1542796 1/2] put RHEL info into generated headers - Bugzilla: 1542796 - RH-Acked-by: David Arcari <darcari@redhat.com> - RH-Acked-by: Tony Camuso <tcamuso@redhat.com> - RH-Acked-by: Steve Best <sbest@redhat.com> - - Bugzilla: http://bugzilla.redhat.com/1542796 - - rhel7 commit 6199c642a685fba61a298901190659dbedb7c3c3 - Author: Jarod Wilson <jarod@redhat.com> - Date: Thu Oct 10 20:14:33 2013 -0400 - - [redhat] put RHEL info into generated headers - - Message-id: <1381436073-8850-1-git-send-email-jarod@redhat.com> - Patchwork-id: 69475 - O-Subject: [RHEL7 PATCH] [redhat] put RHEL info into generated headers - Bugzilla: - RH-Acked-by: Neil Horman <nhorman@redhat.com> - RH-Acked-by: Rafael Aquini <aquini@redhat.com> - RH-Acked-by: Kyle McMartin <kmcmarti@redhat.com> - - While glancing at the differences between RHEL6 and RHEL7's modifications to the - top-level Makefile, some discrepancies popped up... This brings RHEL7 in line - with all of the customizations we make in RHEL6 to get distro info propagated. - - Signed-off-by: Jarod Wilson <jarod@redhat.com> - - Cc: Herton R. Krzesinski <herton@redhat.com> - Signed-off-by: Herton R. Krzesinski <herton@redhat.com> - - Signed-off-by: Herton R. Krzesinski <herton@redhat.com> - -Upstream Status: RHEL only -Acked-by: Don Zickus <dzickus@redhat.com> -Acked-by: Prarit Bhargava <prarit@redhat.com> ---- - Makefile | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 24a4c1b97bb0..37cfb39d77af 100644 ---- a/Makefile -+++ b/Makefile -@@ -1217,7 +1217,13 @@ 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 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)"' - endef - - $(version_h): FORCE --- -2.26.2 - |