Patch "selftests/bpf: Avoid generating untracked files when running bpf selftests" has been added to the 6.12-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

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

    selftests/bpf: Avoid generating untracked files when running bpf selftests

to the 6.12-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:
     selftests-bpf-avoid-generating-untracked-files-when-.patch
and it can be found in the queue-6.12 subdirectory.

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



commit 489f53f7944ca418c0bee32d577e89f6c5ba9fba
Author: Jiayuan Chen <mrpre@xxxxxxx>
Date:   Tue Dec 24 15:59:57 2024 +0800

    selftests/bpf: Avoid generating untracked files when running bpf selftests
    
    [ Upstream commit 73b9075f334f5debf28646884a320b796b27768d ]
    
    Currently, when we run the BPF selftests with the following command:
    
      make -C tools/testing/selftests TARGETS=bpf SKIP_TARGETS=""
    
    The command generates untracked files and directories with make version
    less than 4.4:
    
    '''
    Untracked files:
      (use "git add <file>..." to include in what will be committed)
            tools/testing/selftests/bpfFEATURE-DUMP.selftests
            tools/testing/selftests/bpffeature/
    '''
    
    We lost slash after word "bpf". The reason is slash appending code is as
    follow:
    
    '''
    OUTPUT := $(OUTPUT)/
    $(eval include ../../../build/Makefile.feature)
    OUTPUT := $(patsubst %/,%,$(OUTPUT))
    '''
    
    This way of assigning values to OUTPUT will never be effective for the
    variable OUTPUT provided via the command argument [1] and BPF makefile
    is called from parent Makfile(tools/testing/selftests/Makefile) like:
    
    '''
    all:
      ...
            $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET
    '''
    
    According to GNU make, we can use override Directive to fix this issue [2].
    
      [1] https://www.gnu.org/software/make/manual/make.html#Overriding
      [2] https://www.gnu.org/software/make/manual/make.html#Override-Directive
    
    Fixes: dc3a8804d790 ("selftests/bpf: Adapt OUTPUT appending logic to lower versions of Make")
    Signed-off-by: Jiayuan Chen <mrpre@xxxxxxx>
    Signed-off-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
    Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>
    Link: https://lore.kernel.org/bpf/20241224075957.288018-1-mrpre@xxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index 43a0293184785..6fc29996ae293 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -193,9 +193,9 @@ ifeq ($(shell expr $(MAKE_VERSION) \>= 4.4), 1)
 $(let OUTPUT,$(OUTPUT)/,\
 	$(eval include ../../../build/Makefile.feature))
 else
-OUTPUT := $(OUTPUT)/
+override OUTPUT := $(OUTPUT)/
 $(eval include ../../../build/Makefile.feature)
-OUTPUT := $(patsubst %/,%,$(OUTPUT))
+override OUTPUT := $(patsubst %/,%,$(OUTPUT))
 endif
 endif