tools/Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
Commit e19bde2269ca ("selftests: Move PCI Endpoint tests from tools/pci to
Kselftests") moves tools/pci directory to
tools/testing/selftests/pci_endpoint, which will cause build failure
when running "make pci" under tools:
linux/tools$ make pci
DESCEND pci
make[1]: *** No targets specified and no makefile found. Stop.
make: *** [Makefile:73: pci] Error 2
This patch updates the top level tools/Makefile to remove reference to
building, installing and cleaning pci components.
Signed-off-by: Jianfeng Liu <liujianfeng1994@gmail.com>
Fixes: e19bde2269ca ("selftests: Move PCI Endpoint tests from tools/pci to Kselftests")
---
tools/Makefile | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/tools/Makefile b/tools/Makefile
index 278d24723b74..5e1254eb66de 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -25,7 +25,6 @@ help:
@echo ' leds - LEDs tools'
@echo ' nolibc - nolibc headers testing and installation'
@echo ' objtool - an ELF object analysis tool'
- @echo ' pci - PCI tools'
@echo ' perf - Linux performance measurement and analysis tool'
@echo ' selftests - various kernel selftests'
@echo ' sched_ext - sched_ext example schedulers'
@@ -69,7 +68,7 @@ acpi: FORCE
cpupower: FORCE
$(call descend,power/$@)
-counter firewire hv guest bootconfig spi usb virtio mm bpf iio gpio objtool leds wmi pci firmware debugging tracing: FORCE
+counter firewire hv guest bootconfig spi usb virtio mm bpf iio gpio objtool leds wmi firmware debugging tracing: FORCE
$(call descend,$@)
bpf/%: FORCE
@@ -123,7 +122,7 @@ all: acpi counter cpupower gpio hv firewire \
perf selftests bootconfig spi turbostat usb \
virtio mm bpf x86_energy_perf_policy \
tmon freefall iio objtool kvm_stat wmi \
- pci debugging tracing thermal thermometer thermal-engine
+ debugging tracing thermal thermometer thermal-engine
acpi_install:
$(call descend,power/$(@:_install=),install)
@@ -131,7 +130,7 @@ acpi_install:
cpupower_install:
$(call descend,power/$(@:_install=),install)
-counter_install firewire_install gpio_install hv_install iio_install perf_install bootconfig_install spi_install usb_install virtio_install mm_install bpf_install objtool_install wmi_install pci_install debugging_install tracing_install:
+counter_install firewire_install gpio_install hv_install iio_install perf_install bootconfig_install spi_install usb_install virtio_install mm_install bpf_install objtool_install wmi_install debugging_install tracing_install:
$(call descend,$(@:_install=),install)
selftests_install:
@@ -163,7 +162,7 @@ install: acpi_install counter_install cpupower_install gpio_install \
perf_install selftests_install turbostat_install usb_install \
virtio_install mm_install bpf_install x86_energy_perf_policy_install \
tmon_install freefall_install objtool_install kvm_stat_install \
- wmi_install pci_install debugging_install intel-speed-select_install \
+ wmi_install debugging_install intel-speed-select_install \
tracing_install thermometer_install thermal-engine_install
acpi_clean:
@@ -172,7 +171,7 @@ acpi_clean:
cpupower_clean:
$(call descend,power/cpupower,clean)
-counter_clean hv_clean firewire_clean bootconfig_clean spi_clean usb_clean virtio_clean mm_clean wmi_clean bpf_clean iio_clean gpio_clean objtool_clean leds_clean pci_clean firmware_clean debugging_clean tracing_clean:
+counter_clean hv_clean firewire_clean bootconfig_clean spi_clean usb_clean virtio_clean mm_clean wmi_clean bpf_clean iio_clean gpio_clean objtool_clean leds_clean firmware_clean debugging_clean tracing_clean:
$(call descend,$(@:_clean=),clean)
libapi_clean:
@@ -219,7 +218,7 @@ clean: acpi_clean counter_clean cpupower_clean hv_clean firewire_clean \
perf_clean selftests_clean turbostat_clean bootconfig_clean spi_clean usb_clean virtio_clean \
mm_clean bpf_clean iio_clean x86_energy_perf_policy_clean tmon_clean \
freefall_clean build_clean libbpf_clean libsubcmd_clean \
- gpio_clean objtool_clean leds_clean wmi_clean pci_clean firmware_clean debugging_clean \
+ gpio_clean objtool_clean leds_clean wmi_clean firmware_clean debugging_clean \
intel-speed-select_clean tracing_clean thermal_clean thermometer_clean thermal-engine_clean \
sched_ext_clean
--
2.43.0On Mon, Feb 17, 2025 at 07:51:52PM +0800, Jianfeng Liu wrote:
> Commit e19bde2269ca ("selftests: Move PCI Endpoint tests from tools/pci to
> Kselftests") moves tools/pci directory to
> tools/testing/selftests/pci_endpoint, which will cause build failure
> when running "make pci" under tools:
>
> linux/tools$ make pci
> DESCEND pci
> make[1]: *** No targets specified and no makefile found. Stop.
> make: *** [Makefile:73: pci] Error 2
>
> This patch updates the top level tools/Makefile to remove reference to
> building, installing and cleaning pci components.
>
> Signed-off-by: Jianfeng Liu <liujianfeng1994@gmail.com>
Thanks for spotting!
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
- Mani
> Fixes: e19bde2269ca ("selftests: Move PCI Endpoint tests from tools/pci to Kselftests")
> ---
>
> tools/Makefile | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/tools/Makefile b/tools/Makefile
> index 278d24723b74..5e1254eb66de 100644
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@ -25,7 +25,6 @@ help:
> @echo ' leds - LEDs tools'
> @echo ' nolibc - nolibc headers testing and installation'
> @echo ' objtool - an ELF object analysis tool'
> - @echo ' pci - PCI tools'
> @echo ' perf - Linux performance measurement and analysis tool'
> @echo ' selftests - various kernel selftests'
> @echo ' sched_ext - sched_ext example schedulers'
> @@ -69,7 +68,7 @@ acpi: FORCE
> cpupower: FORCE
> $(call descend,power/$@)
>
> -counter firewire hv guest bootconfig spi usb virtio mm bpf iio gpio objtool leds wmi pci firmware debugging tracing: FORCE
> +counter firewire hv guest bootconfig spi usb virtio mm bpf iio gpio objtool leds wmi firmware debugging tracing: FORCE
> $(call descend,$@)
>
> bpf/%: FORCE
> @@ -123,7 +122,7 @@ all: acpi counter cpupower gpio hv firewire \
> perf selftests bootconfig spi turbostat usb \
> virtio mm bpf x86_energy_perf_policy \
> tmon freefall iio objtool kvm_stat wmi \
> - pci debugging tracing thermal thermometer thermal-engine
> + debugging tracing thermal thermometer thermal-engine
>
> acpi_install:
> $(call descend,power/$(@:_install=),install)
> @@ -131,7 +130,7 @@ acpi_install:
> cpupower_install:
> $(call descend,power/$(@:_install=),install)
>
> -counter_install firewire_install gpio_install hv_install iio_install perf_install bootconfig_install spi_install usb_install virtio_install mm_install bpf_install objtool_install wmi_install pci_install debugging_install tracing_install:
> +counter_install firewire_install gpio_install hv_install iio_install perf_install bootconfig_install spi_install usb_install virtio_install mm_install bpf_install objtool_install wmi_install debugging_install tracing_install:
> $(call descend,$(@:_install=),install)
>
> selftests_install:
> @@ -163,7 +162,7 @@ install: acpi_install counter_install cpupower_install gpio_install \
> perf_install selftests_install turbostat_install usb_install \
> virtio_install mm_install bpf_install x86_energy_perf_policy_install \
> tmon_install freefall_install objtool_install kvm_stat_install \
> - wmi_install pci_install debugging_install intel-speed-select_install \
> + wmi_install debugging_install intel-speed-select_install \
> tracing_install thermometer_install thermal-engine_install
>
> acpi_clean:
> @@ -172,7 +171,7 @@ acpi_clean:
> cpupower_clean:
> $(call descend,power/cpupower,clean)
>
> -counter_clean hv_clean firewire_clean bootconfig_clean spi_clean usb_clean virtio_clean mm_clean wmi_clean bpf_clean iio_clean gpio_clean objtool_clean leds_clean pci_clean firmware_clean debugging_clean tracing_clean:
> +counter_clean hv_clean firewire_clean bootconfig_clean spi_clean usb_clean virtio_clean mm_clean wmi_clean bpf_clean iio_clean gpio_clean objtool_clean leds_clean firmware_clean debugging_clean tracing_clean:
> $(call descend,$(@:_clean=),clean)
>
> libapi_clean:
> @@ -219,7 +218,7 @@ clean: acpi_clean counter_clean cpupower_clean hv_clean firewire_clean \
> perf_clean selftests_clean turbostat_clean bootconfig_clean spi_clean usb_clean virtio_clean \
> mm_clean bpf_clean iio_clean x86_energy_perf_policy_clean tmon_clean \
> freefall_clean build_clean libbpf_clean libsubcmd_clean \
> - gpio_clean objtool_clean leds_clean wmi_clean pci_clean firmware_clean debugging_clean \
> + gpio_clean objtool_clean leds_clean wmi_clean firmware_clean debugging_clean \
> intel-speed-select_clean tracing_clean thermal_clean thermometer_clean thermal-engine_clean \
> sched_ext_clean
>
> --
> 2.43.0
>
--
மணிவண்ணன் சதாசிவம்
On Mon, Feb 17, 2025 at 07:51:52PM +0800, Jianfeng Liu wrote:
> Commit e19bde2269ca ("selftests: Move PCI Endpoint tests from tools/pci to
> Kselftests") moves tools/pci directory to
> tools/testing/selftests/pci_endpoint, which will cause build failure
> when running "make pci" under tools:
>
> linux/tools$ make pci
> DESCEND pci
> make[1]: *** No targets specified and no makefile found. Stop.
> make: *** [Makefile:73: pci] Error 2
>
> This patch updates the top level tools/Makefile to remove reference to
> building, installing and cleaning pci components.
>
> Signed-off-by: Jianfeng Liu <liujianfeng1994@gmail.com>
> Fixes: e19bde2269ca ("selftests: Move PCI Endpoint tests from tools/pci to Kselftests")
Applied to pci/endpoint-test for v6.15, thanks!
> ---
>
> tools/Makefile | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/tools/Makefile b/tools/Makefile
> index 278d24723b74..5e1254eb66de 100644
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@ -25,7 +25,6 @@ help:
> @echo ' leds - LEDs tools'
> @echo ' nolibc - nolibc headers testing and installation'
> @echo ' objtool - an ELF object analysis tool'
> - @echo ' pci - PCI tools'
> @echo ' perf - Linux performance measurement and analysis tool'
> @echo ' selftests - various kernel selftests'
> @echo ' sched_ext - sched_ext example schedulers'
> @@ -69,7 +68,7 @@ acpi: FORCE
> cpupower: FORCE
> $(call descend,power/$@)
>
> -counter firewire hv guest bootconfig spi usb virtio mm bpf iio gpio objtool leds wmi pci firmware debugging tracing: FORCE
> +counter firewire hv guest bootconfig spi usb virtio mm bpf iio gpio objtool leds wmi firmware debugging tracing: FORCE
> $(call descend,$@)
>
> bpf/%: FORCE
> @@ -123,7 +122,7 @@ all: acpi counter cpupower gpio hv firewire \
> perf selftests bootconfig spi turbostat usb \
> virtio mm bpf x86_energy_perf_policy \
> tmon freefall iio objtool kvm_stat wmi \
> - pci debugging tracing thermal thermometer thermal-engine
> + debugging tracing thermal thermometer thermal-engine
>
> acpi_install:
> $(call descend,power/$(@:_install=),install)
> @@ -131,7 +130,7 @@ acpi_install:
> cpupower_install:
> $(call descend,power/$(@:_install=),install)
>
> -counter_install firewire_install gpio_install hv_install iio_install perf_install bootconfig_install spi_install usb_install virtio_install mm_install bpf_install objtool_install wmi_install pci_install debugging_install tracing_install:
> +counter_install firewire_install gpio_install hv_install iio_install perf_install bootconfig_install spi_install usb_install virtio_install mm_install bpf_install objtool_install wmi_install debugging_install tracing_install:
> $(call descend,$(@:_install=),install)
>
> selftests_install:
> @@ -163,7 +162,7 @@ install: acpi_install counter_install cpupower_install gpio_install \
> perf_install selftests_install turbostat_install usb_install \
> virtio_install mm_install bpf_install x86_energy_perf_policy_install \
> tmon_install freefall_install objtool_install kvm_stat_install \
> - wmi_install pci_install debugging_install intel-speed-select_install \
> + wmi_install debugging_install intel-speed-select_install \
> tracing_install thermometer_install thermal-engine_install
>
> acpi_clean:
> @@ -172,7 +171,7 @@ acpi_clean:
> cpupower_clean:
> $(call descend,power/cpupower,clean)
>
> -counter_clean hv_clean firewire_clean bootconfig_clean spi_clean usb_clean virtio_clean mm_clean wmi_clean bpf_clean iio_clean gpio_clean objtool_clean leds_clean pci_clean firmware_clean debugging_clean tracing_clean:
> +counter_clean hv_clean firewire_clean bootconfig_clean spi_clean usb_clean virtio_clean mm_clean wmi_clean bpf_clean iio_clean gpio_clean objtool_clean leds_clean firmware_clean debugging_clean tracing_clean:
> $(call descend,$(@:_clean=),clean)
>
> libapi_clean:
> @@ -219,7 +218,7 @@ clean: acpi_clean counter_clean cpupower_clean hv_clean firewire_clean \
> perf_clean selftests_clean turbostat_clean bootconfig_clean spi_clean usb_clean virtio_clean \
> mm_clean bpf_clean iio_clean x86_energy_perf_policy_clean tmon_clean \
> freefall_clean build_clean libbpf_clean libsubcmd_clean \
> - gpio_clean objtool_clean leds_clean wmi_clean pci_clean firmware_clean debugging_clean \
> + gpio_clean objtool_clean leds_clean wmi_clean firmware_clean debugging_clean \
> intel-speed-select_clean tracing_clean thermal_clean thermometer_clean thermal-engine_clean \
> sched_ext_clean
>
> --
> 2.43.0
>
© 2016 - 2025 Red Hat, Inc.