Skip to contentSkip to conversation

tools: PCI: Fix installation when `make tools/pci_install`

PATCH In review Andy Shevchenko 2 participants 2 messages Jul 9, 2019 PCI

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 tools: PCI: Fix installation when `make tools/pci_install`

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 <[email protected]>
Cc Kishon Vijay Abraham I <[email protected]>
Cc Lorenzo Pieralisi <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>

---
- addressed Kishon's comment
- appended his Ack

 tools/pci/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
tools/pci/Makefile +2 -3
index 6876ee4bd78c..4b95a5176355 100644
@@ -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
 
Signature · 1 line
2.20.1
#1 lore raw
Quoted 17 lines · Andy Shevchenko

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 <[email protected]>
Cc Kishon Vijay Abraham I <[email protected]>
Cc Lorenzo Pieralisi <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Quoted 5 lines

---
- 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

Quoted 28 lines
tools/pci/Makefile +2 -3
index 6876ee4bd78c..4b95a5176355 100644
@@ -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
 
Signature · 1 line
2.20.1