Re: [PATCH v2] tools: PCI: Fix installation when `make tools/pci_install`

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Jul 09, 2019 at 07:13:59PM +0300, Andy Shevchenko wrote:
> The commit c9a707875053 ("tools pci: Do not delete pcitest.sh in 'make clean'")
> fixed a `make tools clean` issue and simultaneously brought a regression
> to the installation process:
> 
>   for script in .../tools/pci/pcitest.sh; do	\
> 	install $script .../usr/usr/bin;	\
>   done
>   install: cannot stat '.../tools/pci/pcitest.sh': No such file or directory
> 
> Here is the missed part of the fix.
> 
> Cc: Jean-Jacques Hiblot <jjhiblot@xxxxxx>
> Cc: Kishon Vijay Abraham I <kishon@xxxxxx>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx>
> Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> Acked-by: Kishon Vijay Abraham I <kishon@xxxxxx>
> ---
> - addressed Kishon's comment
> - appended his Ack
>  tools/pci/Makefile | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)

Thank you Andy, merged in pci/misc for v5.3, thanks.

Lorenzo

> diff --git a/tools/pci/Makefile b/tools/pci/Makefile
> index 6876ee4bd78c..4b95a5176355 100644
> --- a/tools/pci/Makefile
> +++ b/tools/pci/Makefile
> @@ -18,7 +18,6 @@ ALL_TARGETS := pcitest
>  ALL_PROGRAMS := $(patsubst %,$(OUTPUT)%,$(ALL_TARGETS))
>  
>  SCRIPTS := pcitest.sh
> -ALL_SCRIPTS := $(patsubst %,$(OUTPUT)%,$(SCRIPTS))
>  
>  all: $(ALL_PROGRAMS)
>  
> @@ -47,10 +46,10 @@ clean:
>  
>  install: $(ALL_PROGRAMS)
>  	install -d -m 755 $(DESTDIR)$(bindir);		\
> -	for program in $(ALL_PROGRAMS) pcitest.sh; do	\
> +	for program in $(ALL_PROGRAMS); do		\
>  		install $$program $(DESTDIR)$(bindir);	\
>  	done;						\
> -	for script in $(ALL_SCRIPTS); do		\
> +	for script in $(SCRIPTS); do			\
>  		install $$script $(DESTDIR)$(bindir);	\
>  	done
>  
> -- 
> 2.20.1
> 



[Index of Archives]     [DMA Engine]     [Linux Coverity]     [Linux USB]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Greybus]

  Powered by Linux