summaryrefslogtreecommitdiffstats
path: root/0001-tags.sh-Ignore-redhat-rpm.patch
diff options
context:
space:
mode:
authorJeremy Cline <jcline@redhat.com>2020-04-23 16:47:21 -0400
committerJeremy Cline <jcline@redhat.com>2020-04-23 16:47:21 -0400
commitd1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236 (patch)
tree842b7a6410c2572bc8c1643196f83d2e19d80e1e /0001-tags.sh-Ignore-redhat-rpm.patch
parent4f478aae8055f932b9a8fdd88d93db6b9da5709e (diff)
downloadkernel-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-tags.sh-Ignore-redhat-rpm.patch')
-rw-r--r--0001-tags.sh-Ignore-redhat-rpm.patch54
1 files changed, 54 insertions, 0 deletions
diff --git a/0001-tags.sh-Ignore-redhat-rpm.patch b/0001-tags.sh-Ignore-redhat-rpm.patch
new file mode 100644
index 000000000..93c6fdeef
--- /dev/null
+++ b/0001-tags.sh-Ignore-redhat-rpm.patch
@@ -0,0 +1,54 @@
+From 7828abcee3951b11c0a1357a3ac6be7da7895078 Mon Sep 17 00:00:00 2001
+From: Jeremy Cline <jcline@redhat.com>
+Date: Tue, 23 Jul 2019 15:26:09 +0000
+Subject: [PATCH] tags.sh: Ignore redhat/rpm
+
+Rebased for v5.3-rc1. Commit 95fd3f87bfbe ("kbuild: add a flag to force
+absolute path for srctree") changed the context.
+
+ Message-id: <20180529180112.28376-1-prarit@redhat.com>
+ Patchwork-id: 8101
+ O-Subject: [kernel team] [RHEL8.0 BZ 1582586] scripts/tags.sh: Ignore redhat/rpm
+ Bugzilla: 1582586
+ RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
+ RH-Acked-by: Jarod Wilson <jarod@redhat.com>
+ RH-Acked-by: Neil Horman <nhorman@redhat.com>
+
+ Bugzilla: http://bugzilla.redhat.com/1582586
+ Brew: https://brewweb.devel.redhat.com/taskinfo?taskID=16502319
+
+ RHEL_only.
+
+ If 'make cscope' is run on a tree which has had 'make rh-rpm',
+ 'make rh-cross-*', etc., on it, the tags information contains entries
+ from the redhat/rpm/ directories.
+
+ Ignore the tags search in redhat/rpm.
+
+ Backport of RHEL7 464ad7779507 ("[scripts] tags.sh: ignore redhat/rpm").
+
+ Signed-off-by: Prarit Bhargava <prarit@redhat.com>
+ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
+
+Upstream Status: RHEL only
+Signed-off-by: Jeremy Cline <jcline@redhat.com>
+---
+ scripts/tags.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scripts/tags.sh b/scripts/tags.sh
+index 4e18ae5282a6..805341c0aaf3 100755
+--- a/scripts/tags.sh
++++ b/scripts/tags.sh
+@@ -16,6 +16,8 @@ fi
+ ignore="$(echo "$RCS_FIND_IGNORE" | sed 's|\\||g' )"
+ # tags and cscope files should also ignore MODVERSION *.mod.c files
+ ignore="$ignore ( -name *.mod.c ) -prune -o"
++# RHEL tags and cscope should also ignore redhat/rpm
++ignore="$ignore ( -path redhat/rpm ) -prune -o"
+
+ # Use make KBUILD_ABS_SRCTREE=1 {tags|cscope}
+ # to force full paths for a non-O= build
+--
+2.26.0
+