diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-05-13 13:53:20 -0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-05-15 16:36:46 -0300 |
| commit | c9a7078750531c189c04ddd184c4367a5cb77780 (patch) | |
| tree | 11fddaead24a530f4dda414d475b549da76aadc3 /tools/pci | |
| parent | 0ceb5499a8001e5ddac2c8bd7b45eb4c643469ad (diff) | |
| download | linux-starfive-c9a7078750531c189c04ddd184c4367a5cb77780.tar.gz linux-starfive-c9a7078750531c189c04ddd184c4367a5cb77780.tar.bz2 linux-starfive-c9a7078750531c189c04ddd184c4367a5cb77780.zip | |
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 <adrian.hunter@intel.com>
Cc: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Fixes: 1ce78ce09430 ("tools: PCI: Change pcitest compiling process")
Link: https://lkml.kernel.org/n/tip-9re6bd7eh9epi3koslkv3ocn@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/pci')
| -rw-r--r-- | tools/pci/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/pci/Makefile b/tools/pci/Makefile index 46e4c2f318c9..f64da817bc03 100644 --- a/tools/pci/Makefile +++ b/tools/pci/Makefile @@ -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 |