Skip to contentSkip to conversation

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

PATCH Superseded Andy Shevchenko 3 participants 7 messages Jun 28, 2019 – Jul 9, 2019 PCI

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 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]>
---
 tools/pci/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/pci/Makefile +2 -2
index 6876ee4bd78c..cc4a161ee2cc 100644
@@ -47,10 +47,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 pcitest.sh; do			\
 		install $$script $(DESTDIR)$(bindir);	\
 	done
 
Signature · 1 line
2.20.1
#1 lore raw
Quoted 10 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.

Sigh, hopefully that's the last fix :), Kishon if that's OK mind ACKing it please ?

Thanks,
Lorenzo

Quoted 29 lines
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]>
---
 tools/pci/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/pci/Makefile +2 -2
index 6876ee4bd78c..cc4a161ee2cc 100644
@@ -47,10 +47,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 pcitest.sh; do			\
 		install $$script $(DESTDIR)$(bindir);	\
 	done
 
Signature · 1 line
2.20.1
#2 lore raw
Quoted 10 lines · Lorenzo Pieralisi
Quoted 9 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

Quoted 4 lines
Quoted 1 line

Here is the missed part of the fix.

Sigh, hopefully that's the last fix :), Kishon if that's OK mind ACKing it please ?

From my side, yes. Now it works as I expect.

Honestly, I'm puzzled how so many errors has been pushed upstream...

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#3 lore raw

Hi,

Quoted 11 lines · Andy Shevchenko
Quoted 10 lines · Lorenzo Pieralisi
Quoted 9 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

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

Here is the missed part of the fix.

Sigh, hopefully that's the last fix :), Kishon if that's OK mind ACKing it please ?

From my side, yes. Now it works as I expect.

Honestly, I'm puzzled how so many errors has been pushed upstream...

I'm not sure why, but I don't see any issue without this patch as well. Am I missing something here? I'm copy pasting the steps below.

a0393678@a0393678ub:~/repos/linux/tools/pci$ make clean
rm -f pcitest
rm -rf include/
find . -name '*.o' -delete -o -name '\.*.d' -delete
a0393678@a0393678ub:~/repos/linux/tools/pci$ make
mkdir -p include/linux/ 2>&1 || true
ln -sf /home/a0393678/repos/linux/tools/pci/../../include/uapi/linux/pcitest.h
include/linux/
make -f /home/a0393678/repos/linux/tools/build/Makefile.build dir=. obj=pcitest
make[1]: Entering directory '/home/a0393678/repos/linux/tools/pci'
  CC       pcitest.o
  LD       pcitest-in.o
make[1]: Leaving directory '/home/a0393678/repos/linux/tools/pci'
  LINK     pcitest
a0393678@a0393678ub:~/repos/linux/tools/pci$ sudo make install
make -f /home/a0393678/repos/linux/tools/build/Makefile.build dir=. obj=pcitest
install -d -m 755 /usr/bin;		\
for program in pcitest pcitest.sh; do	\
	install $program /usr/bin;	\
done;						\
for script in pcitest.sh; do		\
	install $script /usr/bin;	\
done
a0393678@a0393678ub:~/repos/linux/tools/pci$

Thanks
Kishon

#4 lore raw
Quoted 19 lines · Kishon Vijay Abraham I

Hi,

Quoted 16 lines · Andy Shevchenko
Quoted 14 lines · Lorenzo Pieralisi
Quoted 10 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.

Sigh, hopefully that's the last fix :), Kishon if that's OK mind ACKing it please ?

Quoted 6 lines
Quoted 3 lines

From my side, yes. Now it works as I expect.

Honestly, I'm puzzled how so many errors has been pushed upstream...

I'm not sure why, but I don't see any issue without this patch as well. Am I missing something here?

Yes.
I'm not contaminate my Linux kernel tree with any build stuff, so, I'm using the folder which is out to the build, i.e.

% make O=/xyz ...

Quoted 29 lines

I'm copy pasting the steps below.

a0393678@a0393678ub:~/repos/linux/tools/pci$ make clean
rm -f pcitest
rm -rf include/
find . -name '*.o' -delete -o -name '\.*.d' -delete
a0393678@a0393678ub:~/repos/linux/tools/pci$ make
mkdir -p include/linux/ 2>&1 || true
ln -sf /home/a0393678/repos/linux/tools/pci/../../include/uapi/linux/pcitest.h
include/linux/
make -f /home/a0393678/repos/linux/tools/build/Makefile.build dir=. obj=pcitest
make[1]: Entering directory '/home/a0393678/repos/linux/tools/pci'
  CC       pcitest.o
  LD       pcitest-in.o
make[1]: Leaving directory '/home/a0393678/repos/linux/tools/pci'
  LINK     pcitest
a0393678@a0393678ub:~/repos/linux/tools/pci$ sudo make install
make -f /home/a0393678/repos/linux/tools/build/Makefile.build dir=. obj=pcitest
install -d -m 755 /usr/bin;		\
for program in pcitest pcitest.sh; do	\
	install $program /usr/bin;	\
done;						\
for script in pcitest.sh; do		\
	install $script /usr/bin;	\
done
a0393678@a0393678ub:~/repos/linux/tools/pci$

Thanks
Kishon

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#5 lore raw

Hi,

Quoted 24 lines · Andy Shevchenko
Quoted 23 lines · Kishon Vijay Abraham I

Hi,

Quoted 19 lines · Andy Shevchenko
Quoted 10 lines · Lorenzo Pieralisi
Quoted 9 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

Quoted 4 lines
Quoted 1 line

Here is the missed part of the fix.

Sigh, hopefully that's the last fix :), Kishon if that's OK mind ACKing it please ?

From my side, yes. Now it works as I expect.

Honestly, I'm puzzled how so many errors has been pushed upstream...

Quoted 8 lines
Quoted 2 lines

I'm not sure why, but I don't see any issue without this patch as well. Am I missing something here?

Yes.
I'm not contaminate my Linux kernel tree with any build stuff, so, I'm using the folder which is out to the build, i.e.

% make O=/xyz ...

Okay, got it.

Thanks
Kishon

Quoted 31 lines
Quoted 30 lines

I'm copy pasting the steps below.

a0393678@a0393678ub:~/repos/linux/tools/pci$ make clean
rm -f pcitest
rm -rf include/
find . -name '*.o' -delete -o -name '\.*.d' -delete
a0393678@a0393678ub:~/repos/linux/tools/pci$ make
mkdir -p include/linux/ 2>&1 || true
ln -sf /home/a0393678/repos/linux/tools/pci/../../include/uapi/linux/pcitest.h
include/linux/
make -f /home/a0393678/repos/linux/tools/build/Makefile.build dir=. obj=pcitest
make[1]: Entering directory '/home/a0393678/repos/linux/tools/pci'
  CC       pcitest.o
  LD       pcitest-in.o
make[1]: Leaving directory '/home/a0393678/repos/linux/tools/pci'
  LINK     pcitest
a0393678@a0393678ub:~/repos/linux/tools/pci$ sudo make install
make -f /home/a0393678/repos/linux/tools/build/Makefile.build dir=. obj=pcitest
install -d -m 755 /usr/bin;		\
for program in pcitest pcitest.sh; do	\
	install $program /usr/bin;	\
done;						\
for script in pcitest.sh; do		\
	install $script /usr/bin;	\
done
a0393678@a0393678ub:~/repos/linux/tools/pci$

Thanks
Kishon

Acked-by on v1 1/1
#6 lore raw
In reply to Andy Shevchenko

Hi Andy,

Quoted 25 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]>
---
 tools/pci/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/pci/Makefile +0 -0
index 6876ee4bd78c..cc4a161ee2cc 100644

tools/pci/Makefile clean: · line 53

Quoted 9 lines
tools/pci/Makefile +2 -2
@@ -47,10 +47,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 pcitest.sh; do			\

If ALL_SCRIPTS is not used anywhere else, this patch can remove that as well. With that fixed

Thanks
Kishon