linux-kernel - [PATCH] tools pci: Do not delete pcitest.sh in 'make clean'

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 13 May 2019 15:37:28 -0300
From:   Arnaldo Carvalho de Melo <arnaldo.melo@...il.com>
To:     Gustavo Pimentel <gustavo.pimentel@...opsys.com>
Cc:     Kishon Vijay Abraham I <kishon@...com>,
        Lorenzo Pieralisi <lorenzo.pieralisi@....com>,
        Jiri Olsa <jolsa@...nel.org>,
        Namhyung Kim <namhyung@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: [PATCH] tools pci: Do not delete pcitest.sh in 'make clean'

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@...hat.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@...el.com>
    Cc: Gustavo Pimentel <gustavo.pimentel@...opsys.com>
    Cc: Jiri Olsa <jolsa@...nel.org>
    Cc: Kishon Vijay Abraham I <kishon@...com>
    Cc: Lorenzo Pieralisi <lorenzo.pieralisi@....com>
    Cc: Namhyung Kim <namhyung@...nel.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@...hat.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