diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
| commit | f7ba01a9677fffa21535bc6cdcad930a858d6106 (patch) | |
| tree | 6eb6df39221f8926b813d63b41ffed9da18e6a5d /0001-Pull-the-RHEL-version-defines-out-of-the-Makefile.patch | |
| parent | 837cd03f031f1daaa2dda23d584cda25b0dfd51e (diff) | |
| parent | 6c2cc50051831fa502a8b082a312ca90e7039f3f (diff) | |
| download | kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.gz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.xz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.zip | |
merge masterkernel-5.7.0-0.rc3.1.vanilla.1.fc33kernel-5.7.0-0.rc3.1.vanilla.1.fc32kernel-5.7.0-0.rc3.1.vanilla.1.fc31kernel-5.7.0-0.rc3.1.vanilla.1.fc30
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 5e56690f2..18d3a4dbe 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.0 +2.26.2 |