diff options
| author | Jeremy Cline <jcline@redhat.com> | 2020-04-23 16:47:21 -0400 |
|---|---|---|
| committer | Jeremy Cline <jcline@redhat.com> | 2020-04-23 16:47:21 -0400 |
| commit | d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236 (patch) | |
| tree | 842b7a6410c2572bc8c1643196f83d2e19d80e1e /0001-initial-commit-Add-Red-Hat-variables-in-the-top-leve.patch | |
| parent | 4f478aae8055f932b9a8fdd88d93db6b9da5709e (diff) | |
| download | kernel-d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236.tar.gz kernel-d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236.tar.xz kernel-d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236.zip | |
kernel-5.7.0-0.rc2.20200423git7adc4b399952.1
* Thu Apr 23 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc2.20200423git7adc4b399952.1]
- 7adc4b399952 rebase
- Match template format in kernel.spec.template ("Justin M. Forbes")
- Break out the Patches into individual files for dist-git ("Justin M. Forbes")
- Break the Red Hat patch into individual commits (Jeremy Cline)
- Adjust module filtering so CONFIG_DRM_DP_CEC can be set (Jeremy Cline)
- Add a script to generate release tags and branches (Jeremy Cline)
- Set CONFIG_VDPA for fedora ("Justin M. Forbes")
- Provide defaults in ark-rebase-patches.sh (Jeremy Cline)
- Default ark-rebase-patches.sh to not report issues (Jeremy Cline)
Resolves: rhbz#
Signed-off-by: Jeremy Cline <jcline@redhat.com>
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, 43 insertions, 0 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 new file mode 100644 index 000000000..88100cb70 --- /dev/null +++ b/0001-initial-commit-Add-Red-Hat-variables-in-the-top-leve.patch @@ -0,0 +1,43 @@ +From cd3a5d30570279538623ea8a1255db0ee4b728f7 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.0 + |