diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-17 08:57:24 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-17 09:00:20 +0200 |
commit | b491f8091eec92cd00723082a68b48e38c4f41fa (patch) | |
tree | 1b8b3647470b05ddb0522387c86d844b2579011b /0001-initial-commit-Add-Red-Hat-variables-in-the-top-leve.patch | |
parent | 0ebd93898b5f0a0fa9697e1c85ebe60e67ae81cc (diff) | |
parent | d70892345222ea163abe0fdc7cf500be5fd8dfb8 (diff) | |
download | kernel-b491f8091eec92cd00723082a68b48e38c4f41fa.tar.gz kernel-b491f8091eec92cd00723082a68b48e38c4f41fa.tar.xz kernel-b491f8091eec92cd00723082a68b48e38c4f41fa.zip |
merge 5.9 release
Diffstat (limited to '0001-initial-commit-Add-Red-Hat-variables-in-the-top-leve.patch')
-rw-r--r-- | 0001-initial-commit-Add-Red-Hat-variables-in-the-top-leve.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/0001-initial-commit-Add-Red-Hat-variables-in-the-top-leve.patch b/0001-initial-commit-Add-Red-Hat-variables-in-the-top-leve.patch deleted file mode 100644 index fffc10bcc..000000000 --- a/0001-initial-commit-Add-Red-Hat-variables-in-the-top-leve.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Laura Abbott <labbott@redhat.com> -Date: Tue, 23 Jul 2019 11:39:36 -0400 -Subject: [PATCH] [initial commit] Add Red Hat variables in the top level - makefile - -Signed-off-by: Laura Abbott <labbott@redhat.com> ---- - Makefile | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 3e4868a6498b..502f9a9a2806 100644 ---- a/Makefile -+++ b/Makefile -@@ -15,6 +15,9 @@ NAME = Bobtail Squid - PHONY := _all - _all: - -+# Set RHEL variables -+include Makefile.rhelver -+ - # We are using a recursive build, so we need to do a little thinking - # to get the ordering right. - # -@@ -1160,7 +1163,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 - |