lkml.org 
[lkml]   [2019]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRE: [PATCH] tools pci: Do not delete pcitest.sh in 'make clean'
Date
On Mon, May 13, 2019 at 19:37:28, Arnaldo Carvalho de Melo 
<arnaldo.melo@gmail.com> wrote:


Hi Arnaldo,

I think Kishon has already dispatched a patch fixing this issue.
Kishon, can you confirm it?

Regards,
Gustavo

> Hi,
>
> I have this in my local perf/core branch, lined up for 5.2,
> please let me know if you're ok with it.
>
> - Arnaldo
>
> commit 4dfe8f59156382b7695fe5c10bddd5c97c84289a
> Author: Arnaldo Carvalho de Melo <acme@redhat.com>
> Date: Mon May 13 13:53:20 2019 -0400
>
> 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://urldefense.proofpoint.com/v2/url?u=https-3A__lkml.kernel.org_n_tip-2D9re6bd7eh9epi3koslkv3ocn-40git.kernel.org&d=DwIDaQ&c=DPL6_X_6JkXFx7AXWqB0tg&r=bkWxpLoW-f-E3EdiDCCa0_h0PicsViasSlvIpzZvPxs&m=aZjR5R91AJR402FRDDnYzXZezTHphZCiNh-9G8BO6vE&s=VzkT0XYvB37sVZ8-lOxWN7LsG6IvDTCRjCTUfertsRs&e=
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
>
> 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
>


\
 
 \ /
  Last update: 2019-05-14 10:57    [W:0.035 / U:7.616 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site