lkml.org 
[lkml]   [2012]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
SubjectRe: [PATCH 1/2] perf tools: Initial bash completion support
Date
On Tue, 07 Aug 2012 16:10:54 -0600, David Ahern wrote:
> On 8/7/12 11:00 AM, Frederic Weisbecker wrote:
>> diff --git a/tools/perf/Makefile b/tools/perf/Makefile
>> index 35655c3..ddfb7e5 100644
>> --- a/tools/perf/Makefile
>> +++ b/tools/perf/Makefile
>> @@ -951,6 +951,7 @@ install: all
>> $(INSTALL) scripts/python/Perf-Trace-Util/lib/Perf/Trace/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/Perf-Trace-Util/lib/Perf/Trace'
>> $(INSTALL) scripts/python/*.py -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python'
>> $(INSTALL) scripts/python/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin'
>> + $(INSTALL) -m 755 bash_completion $(DESTDIR_SQ)/etc/bash_completion.d/perf
>
> still getting an error here:
>
> $ make DESTDIR=/tmp/junk-perf O=/tmp/pbuild -C tools/perf/ install
> ...
> install -m 755 bash_completion /tmp/junk-perf/etc/bash_completion.d/perf
> install: cannot create regular file
> /tmp/junk-perf/etc/bash_completion.d/perf': No such file or directory
> make: *** [install] Error 1
> make: Leaving directory `/opt/sw/ahern/perf.git/tools/perf'

Does patch below fix it?


diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index cfe4fc0b67f1..d0b27ba9663e 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -696,6 +696,7 @@ perfexecdir_SQ = $(subst ','\'',$(perfexecdir))
template_dir_SQ = $(subst ','\'',$(template_dir))
htmldir_SQ = $(subst ','\'',$(htmldir))
prefix_SQ = $(subst ','\'',$(prefix))
+sysconfdir_SQ = $(subst ','\'',$(sysconfdir))

SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))

@@ -947,7 +948,8 @@ install: all
$(INSTALL) scripts/python/Perf-Trace-Util/lib/Perf/Trace/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/Perf-Trace-Util/lib/Perf/Trace'
$(INSTALL) scripts/python/*.py -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python'
$(INSTALL) scripts/python/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin'
- $(INSTALL) -m 755 bash_completion $(DESTDIR_SQ)/etc/bash_completion.d/perf
+ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d'
+ $(INSTALL) bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf'

install-python_ext:
$(PYTHON_WORD) util/setup.py --quiet install --root='/$(DESTDIR_SQ)'

\
 
 \ /
  Last update: 2012-08-08 04:01    [from the cache]
©2003-2011 Jasper Spaans