tools pci: Do not delete pcitest.sh in 'make clean'
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: c9a7078750531c189c04ddd184c4367a5cb77780 Gitweb: https://git.kernel.org/tip/c9a7078750531c189c04ddd184c4367a5cb77780 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 13 May 2019 13:53:20 -0400 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 15 May 2019 16:36:46 -0300
tools pci: Do not delete pcitest.sh in 'make clean'
When running 'make -C tools clean' I noticed that a revision controlled file was being deleted:
$ git diff diff --git a/tools/pci/pcitest.sh b/tools/pci/pcitest.sh deleted file mode 100644 index 75ed48ff2990..000000000000 --- a/tools/pci/pcitest.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 - -echo "BAR tests" -echo <SNIP>
So I changed the make variables to fix that, testing it should produce the same intended result while not deleting revision controlled files.
$ make O=/tmp/build/pci -C tools/pci install make: Entering directory '/home/acme/git/perf/tools/pci' make -f /home/acme/git/perf/tools/build/Makefile.build dir=. obj=pcitest install -d -m 755 /usr/bin; \ for program in /tmp/build/pci/pcitest pcitest.sh; do \ install $program /usr/bin; \ done install: cannot change permissions of ‘/usr/bin’: Operation not permitted install: cannot create regular file '/usr/bin/pcitest': Permission denied install: cannot create regular file '/usr/bin/pcitest.sh': Permission denied make: *** [Makefile:46: install] Error 1 make: Leaving directory '/home/acme/git/perf/tools/pci' $ ls -la /tmp/build/pci/pcitest -rwxrwxr-x. 1 acme acme 27152 May 13 13:52 /tmp/build/pci/pcitest $ /tmp/build/pci/pcitest can't open PCI Endpoint Test device: No such file or directory $
Cc Adrian Hunter <[email protected]>
Cc Gustavo Pimentel <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Kishon Vijay Abraham I <[email protected]>
Cc Lorenzo Pieralisi <[email protected]>
Cc Namhyung Kim <[email protected]>
Fixes 1ce78ce09430 ("tools: PCI: Change pcitest compiling process")
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/pci/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/pci/Makefile +2 -2
@@ -14,7 +14,7 @@ MAKEFLAGS += -r CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include -ALL_TARGETS := pcitest pcitest.sh +ALL_TARGETS := pcitest ALL_PROGRAMS := $(patsubst %,$(OUTPUT)%,$(ALL_TARGETS)) all: $(ALL_PROGRAMS)
@@ -44,7 +44,7 @@ clean: install: $(ALL_PROGRAMS) install -d -m 755 $(DESTDIR)$(bindir); \ - for program in $(ALL_PROGRAMS); do \ + for program in $(ALL_PROGRAMS) pcitest.sh; do \ install $$program $(DESTDIR)$(bindir); \ done