|
| 1 | +From d2498944ecd30f80ba5431e52360f590e19d4bc7 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Sayan Chowdhury <sayan.chowdhury2012@gmail.com> |
| 3 | +Date: Fri, 20 Mar 2026 17:17:11 +0530 |
| 4 | +Subject: [PATCH 1/1] Revert "kbuild: Add objtool to top-level clean target" |
| 5 | + |
| 6 | +This reverts commit d809ee17c0d15857c768d1abaea0ce4387776c7b. |
| 7 | + |
| 8 | +Signed-off-by: Sayan Chowdhury <sayan.chowdhury2012@gmail.com> |
| 9 | +--- |
| 10 | + Makefile | 11 +---------- |
| 11 | + tools/objtool/Makefile | 2 -- |
| 12 | + 2 files changed, 1 insertion(+), 12 deletions(-) |
| 13 | + |
| 14 | +diff --git a/Makefile b/Makefile |
| 15 | +index 022aed903173..141167bc280a 100644 |
| 16 | +--- a/Makefile |
| 17 | ++++ b/Makefile |
| 18 | +@@ -1356,15 +1356,6 @@ ifneq ($(wildcard $(resolve_btfids_O)),) |
| 19 | + $(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(resolve_btfids_O) clean |
| 20 | + endif |
| 21 | + |
| 22 | +-PHONY += objtool_clean |
| 23 | +- |
| 24 | +-objtool_O = $(abspath $(objtree))/tools/objtool |
| 25 | +- |
| 26 | +-objtool_clean: |
| 27 | +-ifneq ($(wildcard $(objtool_O)),) |
| 28 | +- $(Q)$(MAKE) -sC $(abs_srctree)/tools/objtool O=$(objtool_O) srctree=$(abs_srctree) clean |
| 29 | +-endif |
| 30 | +- |
| 31 | + tools/: FORCE |
| 32 | + $(Q)mkdir -p $(objtree)/tools |
| 33 | + $(Q)$(MAKE) O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ |
| 34 | +@@ -1518,7 +1509,7 @@ vmlinuxclean: |
| 35 | + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean |
| 36 | + $(Q)$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) clean) |
| 37 | + |
| 38 | +-clean: archclean vmlinuxclean resolve_btfids_clean objtool_clean |
| 39 | ++clean: archclean vmlinuxclean resolve_btfids_clean |
| 40 | + |
| 41 | + # mrproper - Delete all generated files, including .config |
| 42 | + # |
| 43 | +diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile |
| 44 | +index e9a0f89e9c39..83b100c1e7f6 100644 |
| 45 | +--- a/tools/objtool/Makefile |
| 46 | ++++ b/tools/objtool/Makefile |
| 47 | +@@ -7,8 +7,6 @@ srctree := $(patsubst %/,%,$(dir $(CURDIR))) |
| 48 | + srctree := $(patsubst %/,%,$(dir $(srctree))) |
| 49 | + endif |
| 50 | + |
| 51 | +-RM ?= rm -f |
| 52 | +- |
| 53 | + LIBSUBCMD_DIR = $(srctree)/tools/lib/subcmd/ |
| 54 | + ifneq ($(OUTPUT),) |
| 55 | + LIBSUBCMD_OUTPUT = $(abspath $(OUTPUT))/libsubcmd |
| 56 | +-- |
| 57 | +2.53.0 |
| 58 | + |
0 commit comments