diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-24 05:31:22 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-24 05:56:43 +0200 |
commit | 837cd03f031f1daaa2dda23d584cda25b0dfd51e (patch) | |
tree | 5a62f9127c7daa3d8f96e1394ef74421a7fb53e7 /0001-tags.sh-Ignore-redhat-rpm.patch | |
parent | 536dec0b3393550051e61fc345aede447477bf94 (diff) | |
parent | d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236 (diff) | |
download | kernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc31.tar.gz kernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc31.tar.xz kernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc31.zip |
merge masterkernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc33kernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc32kernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc31kernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc30
Diffstat (limited to '0001-tags.sh-Ignore-redhat-rpm.patch')
-rw-r--r-- | 0001-tags.sh-Ignore-redhat-rpm.patch | 54 |
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 + |