Patch "tools/resolve_btfids: Set srctree variable unconditionally" has been added to the 5.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    tools/resolve_btfids: Set srctree variable unconditionally

to the 5.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     tools-resolve_btfids-set-srctree-variable-unconditio.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 8c592733db90592648c086592d2c3f2e74b1729a
Author: Jiri Olsa <jolsa@xxxxxxxxxx>
Date:   Fri Feb 5 13:40:19 2021 +0100

    tools/resolve_btfids: Set srctree variable unconditionally
    
    [ Upstream commit 7962cb9b640af98ccb577f46c8b894319e6c5c20 ]
    
    We want this clean to be called from tree's root Makefile,
    which defines same srctree variable and that will screw
    the make setup.
    
    We actually do not use srctree being passed from outside,
    so we can solve this by setting current srctree value
    directly.
    
    Also changing the way how srctree is initialized as suggested
    by Andrri.
    
    Also root Makefile does not define the implicit RM variable,
    so adding RM initialization.
    
    Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
    Signed-off-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
    Acked-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
    Link: https://lore.kernel.org/bpf/20210205124020.683286-4-jolsa@xxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/bpf/resolve_btfids/Makefile b/tools/bpf/resolve_btfids/Makefile
index be09ec4f03ff..bb9fa8de7e62 100644
--- a/tools/bpf/resolve_btfids/Makefile
+++ b/tools/bpf/resolve_btfids/Makefile
@@ -2,11 +2,7 @@
 include ../../scripts/Makefile.include
 include ../../scripts/Makefile.arch
 
-ifeq ($(srctree),)
-srctree := $(patsubst %/,%,$(dir $(CURDIR)))
-srctree := $(patsubst %/,%,$(dir $(srctree)))
-srctree := $(patsubst %/,%,$(dir $(srctree)))
-endif
+srctree := $(abspath $(CURDIR)/../../../)
 
 ifeq ($(V),1)
   Q =
@@ -22,6 +18,7 @@ AR       = $(HOSTAR)
 CC       = $(HOSTCC)
 LD       = $(HOSTLD)
 ARCH     = $(HOSTARCH)
+RM      ?= rm
 
 OUTPUT ?= $(srctree)/tools/bpf/resolve_btfids/