diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-04 16:17:53 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-04 16:17:53 +0300 |
| commit | bb6578bab876f7fb138f5099f833a265b11a60d7 (patch) | |
| tree | 475ff99d617cb2360b5ec3f5b12ba34997521c52 /tools | |
| parent | ec3041b30133f92cfbce783e02239aa0853f8ab3 (diff) | |
| parent | aead78125a987f48944bff2001f61df72b95afc4 (diff) | |
| download | linux-bb6578bab876f7fb138f5099f833a265b11a60d7.tar.xz | |
Merge tag 'counter-fixes-for-6.5b' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter into char-misc-linus
William writes:
Second set of Counter fixes for 6.5
The I8254 Kconfig entry is repositioned to resolve a misplacement
causing the "Counter support" submenu items to disappear in menuconfig.
The tools/counter/Makefile clean recipe is adjusted to replace rmdir
with an equivalent set of rm to prevent failure if someone tries to
clean the counter directory without building it first.
* tag 'counter-fixes-for-6.5b' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter:
tools/counter: Makefile: Replace rmdir by rm to avoid make,clean failure
counter: Fix menuconfig "Counter support" submenu entries disappearance
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/counter/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/counter/Makefile b/tools/counter/Makefile index a0f4cab71fe5..b2c2946f44c9 100644 --- a/tools/counter/Makefile +++ b/tools/counter/Makefile @@ -40,7 +40,8 @@ $(OUTPUT)counter_example: $(COUNTER_EXAMPLE) clean: rm -f $(ALL_PROGRAMS) rm -rf $(OUTPUT)include/linux/counter.h - rmdir -p $(OUTPUT)include/linux + rm -df $(OUTPUT)include/linux + rm -df $(OUTPUT)include find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.d' -delete install: $(ALL_PROGRAMS) |