iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'counter-fixes-for-6.5b' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter into char-misc-linus

Browse Source 
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
This commit is contained in:
Greg Kroah-Hartman
2023-08-04 15:17:53 +02:00
parent ec3041b301 aead78125a
commit bb6578bab8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/counter/Makefile
View File

@@ -40,7 +40,8 @@ $(OUTPUT)counter_example: $(COUNTER_EXAMPLE)
clean: clean:
rm -f $(ALL_PROGRAMS) rm -f $(ALL_PROGRAMS)
rm -rf $(OUTPUT)include/linux/counter.h 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 find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.d' -delete
install: $(ALL_PROGRAMS) install: $(ALL_PROGRAMS)