diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-29 20:59:56 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-29 20:59:56 +0200 |
commit | 7b32641801900ee7e32065b436d7318c5d7a972e (patch) | |
tree | 7e1f1ffca46787c5ba55af0a2fc9767f9c6e5594 /0001-Pull-the-RHEL-version-defines-out-of-the-Makefile.patch | |
parent | 506260a3258dfcbd81c9c8b2f051b9c515ad6071 (diff) | |
parent | 61b5e2fd06a4be7134afb1cd363002e015123f7f (diff) | |
download | kernel-7b32641801900ee7e32065b436d7318c5d7a972e.tar.gz kernel-7b32641801900ee7e32065b436d7318c5d7a972e.tar.xz kernel-7b32641801900ee7e32065b436d7318c5d7a972e.zip |
merge originkernel-5.8.0-0.rc3.1.vanilla.1.fc33kernel-5.8.0-0.rc3.1.vanilla.1.fc32kernel-5.8.0-0.rc3.1.vanilla.1.fc31
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 | 8 |
1 files changed, 4 insertions, 4 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 index da4d48df7..9151a2858 100644 --- a/0001-Pull-the-RHEL-version-defines-out-of-the-Makefile.patch +++ b/0001-Pull-the-RHEL-version-defines-out-of-the-Makefile.patch @@ -17,11 +17,11 @@ index 48a7abae02d2..2d826a14824a 100644 +++ 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 @@ -36,8 +36,8 @@ index 48a7abae02d2..2d826a14824a 100644 - echo '#define RHEL_RELEASE "$(RHEL_RELEASE)"' + echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))' endef - + $(version_h): FORCE -- -2.26.2 +2.25.4 |