* [PATCH] libtraceevent: fix header installation
@ 2019-11-14 13:37 Sudip Mukherjee
2019-11-14 22:40 ` Steven Rostedt
2019-11-23 8:15 ` [tip: perf/core] libtraceevent: Fix " tip-bot2 for Sudip Mukherjee
0 siblings, 2 replies; 5+ messages in thread
From: Sudip Mukherjee @ 2019-11-14 13:37 UTC (permalink / raw)
To: Steven Rostedt; +Cc: linux-kernel, linux-trace-devel, Sudip Mukherjee
When we passed some location in DESTDIR, install_headers called
do_install with DESTDIR as part of the second argument. But do_install
is again using '$(DESTDIR_SQ)$2', so as a result the headers were
installed in a location $DESTDIR/$DESTDIR. In my testing I passed
DESTDIR=/home/sudip/test and the headers were installed in:
/home/sudip/test/home/sudip/test/usr/include/traceevent.
Lets remove DESTDIR from the second argument of do_install so that the
headers are installed in the correct location.
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
---
Hi Steve,
sent this earlier as an attachment to an email thread, not sure if you
saw it, so sending it now properly.
The other problem with the pkgconfig, I guess we can live with that for
now as that folder is given by pc_path.
tools/lib/traceevent/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index 5315f3787f8d..cbb429f55062 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -232,10 +232,10 @@ install_pkgconfig:
install_headers:
$(call QUIET_INSTALL, headers) \
- $(call do_install,event-parse.h,$(DESTDIR)$(includedir_SQ),644); \
- $(call do_install,event-utils.h,$(DESTDIR)$(includedir_SQ),644); \
- $(call do_install,trace-seq.h,$(DESTDIR)$(includedir_SQ),644); \
- $(call do_install,kbuffer.h,$(DESTDIR)$(includedir_SQ),644)
+ $(call do_install,event-parse.h,$(includedir_SQ),644); \
+ $(call do_install,event-utils.h,$(includedir_SQ),644); \
+ $(call do_install,trace-seq.h,$(includedir_SQ),644); \
+ $(call do_install,kbuffer.h,$(includedir_SQ),644)
install: install_lib
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] libtraceevent: fix header installation
2019-11-14 13:37 [PATCH] libtraceevent: fix header installation Sudip Mukherjee
@ 2019-11-14 22:40 ` Steven Rostedt
2019-11-14 23:30 ` Arnaldo Carvalho de Melo
2019-11-21 14:40 ` Arnaldo Carvalho de Melo
2019-11-23 8:15 ` [tip: perf/core] libtraceevent: Fix " tip-bot2 for Sudip Mukherjee
1 sibling, 2 replies; 5+ messages in thread
From: Steven Rostedt @ 2019-11-14 22:40 UTC (permalink / raw)
To: Sudip Mukherjee; +Cc: linux-kernel, linux-trace-devel, Arnaldo Carvalho de Melo
Arnaldo,
Can you take this?
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-- Steve
On Thu, 14 Nov 2019 13:37:19 +0000
Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote:
> When we passed some location in DESTDIR, install_headers called
> do_install with DESTDIR as part of the second argument. But do_install
> is again using '$(DESTDIR_SQ)$2', so as a result the headers were
> installed in a location $DESTDIR/$DESTDIR. In my testing I passed
> DESTDIR=/home/sudip/test and the headers were installed in:
> /home/sudip/test/home/sudip/test/usr/include/traceevent.
> Lets remove DESTDIR from the second argument of do_install so that the
> headers are installed in the correct location.
>
> Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
> ---
>
> Hi Steve,
> sent this earlier as an attachment to an email thread, not sure if you
> saw it, so sending it now properly.
> The other problem with the pkgconfig, I guess we can live with that for
> now as that folder is given by pc_path.
>
> tools/lib/traceevent/Makefile | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
> index 5315f3787f8d..cbb429f55062 100644
> --- a/tools/lib/traceevent/Makefile
> +++ b/tools/lib/traceevent/Makefile
> @@ -232,10 +232,10 @@ install_pkgconfig:
>
> install_headers:
> $(call QUIET_INSTALL, headers) \
> - $(call do_install,event-parse.h,$(DESTDIR)$(includedir_SQ),644); \
> - $(call do_install,event-utils.h,$(DESTDIR)$(includedir_SQ),644); \
> - $(call do_install,trace-seq.h,$(DESTDIR)$(includedir_SQ),644); \
> - $(call do_install,kbuffer.h,$(DESTDIR)$(includedir_SQ),644)
> + $(call do_install,event-parse.h,$(includedir_SQ),644); \
> + $(call do_install,event-utils.h,$(includedir_SQ),644); \
> + $(call do_install,trace-seq.h,$(includedir_SQ),644); \
> + $(call do_install,kbuffer.h,$(includedir_SQ),644)
>
> install: install_lib
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] libtraceevent: fix header installation
2019-11-14 22:40 ` Steven Rostedt
@ 2019-11-14 23:30 ` Arnaldo Carvalho de Melo
2019-11-21 14:40 ` Arnaldo Carvalho de Melo
1 sibling, 0 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-11-14 23:30 UTC (permalink / raw)
To: Steven Rostedt, Sudip Mukherjee; +Cc: linux-kernel, linux-trace-devel
On November 14, 2019 7:40:22 PM GMT-03:00, Steven Rostedt <rostedt@goodmis.org> wrote:
>
>Arnaldo,
>
>Can you take this?
Sure
>
>Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
>
>-- Steve
>
>
>On Thu, 14 Nov 2019 13:37:19 +0000
>Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote:
>
>> When we passed some location in DESTDIR, install_headers called
>> do_install with DESTDIR as part of the second argument. But
>do_install
>> is again using '$(DESTDIR_SQ)$2', so as a result the headers were
>> installed in a location $DESTDIR/$DESTDIR. In my testing I passed
>> DESTDIR=/home/sudip/test and the headers were installed in:
>> /home/sudip/test/home/sudip/test/usr/include/traceevent.
>> Lets remove DESTDIR from the second argument of do_install so that
>the
>> headers are installed in the correct location.
>>
>> Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
>> ---
>>
>> Hi Steve,
>> sent this earlier as an attachment to an email thread, not sure if
>you
>> saw it, so sending it now properly.
>> The other problem with the pkgconfig, I guess we can live with that
>for
>> now as that folder is given by pc_path.
>>
>> tools/lib/traceevent/Makefile | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/tools/lib/traceevent/Makefile
>b/tools/lib/traceevent/Makefile
>> index 5315f3787f8d..cbb429f55062 100644
>> --- a/tools/lib/traceevent/Makefile
>> +++ b/tools/lib/traceevent/Makefile
>> @@ -232,10 +232,10 @@ install_pkgconfig:
>>
>> install_headers:
>> $(call QUIET_INSTALL, headers) \
>> - $(call do_install,event-parse.h,$(DESTDIR)$(includedir_SQ),644); \
>> - $(call do_install,event-utils.h,$(DESTDIR)$(includedir_SQ),644); \
>> - $(call do_install,trace-seq.h,$(DESTDIR)$(includedir_SQ),644); \
>> - $(call do_install,kbuffer.h,$(DESTDIR)$(includedir_SQ),644)
>> + $(call do_install,event-parse.h,$(includedir_SQ),644); \
>> + $(call do_install,event-utils.h,$(includedir_SQ),644); \
>> + $(call do_install,trace-seq.h,$(includedir_SQ),644); \
>> + $(call do_install,kbuffer.h,$(includedir_SQ),644)
>>
>> install: install_lib
>>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] libtraceevent: fix header installation
2019-11-14 22:40 ` Steven Rostedt
2019-11-14 23:30 ` Arnaldo Carvalho de Melo
@ 2019-11-21 14:40 ` Arnaldo Carvalho de Melo
1 sibling, 0 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-11-21 14:40 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Sudip Mukherjee, linux-kernel, linux-trace-devel
Em Thu, Nov 14, 2019 at 05:40:22PM -0500, Steven Rostedt escreveu:
>
> Arnaldo,
>
> Can you take this?
>
> Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Thanks, applied.
- Arnaldo
> -- Steve
>
>
> On Thu, 14 Nov 2019 13:37:19 +0000
> Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote:
>
> > When we passed some location in DESTDIR, install_headers called
> > do_install with DESTDIR as part of the second argument. But do_install
> > is again using '$(DESTDIR_SQ)$2', so as a result the headers were
> > installed in a location $DESTDIR/$DESTDIR. In my testing I passed
> > DESTDIR=/home/sudip/test and the headers were installed in:
> > /home/sudip/test/home/sudip/test/usr/include/traceevent.
> > Lets remove DESTDIR from the second argument of do_install so that the
> > headers are installed in the correct location.
> >
> > Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
> > ---
> >
> > Hi Steve,
> > sent this earlier as an attachment to an email thread, not sure if you
> > saw it, so sending it now properly.
> > The other problem with the pkgconfig, I guess we can live with that for
> > now as that folder is given by pc_path.
> >
> > tools/lib/traceevent/Makefile | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
> > index 5315f3787f8d..cbb429f55062 100644
> > --- a/tools/lib/traceevent/Makefile
> > +++ b/tools/lib/traceevent/Makefile
> > @@ -232,10 +232,10 @@ install_pkgconfig:
> >
> > install_headers:
> > $(call QUIET_INSTALL, headers) \
> > - $(call do_install,event-parse.h,$(DESTDIR)$(includedir_SQ),644); \
> > - $(call do_install,event-utils.h,$(DESTDIR)$(includedir_SQ),644); \
> > - $(call do_install,trace-seq.h,$(DESTDIR)$(includedir_SQ),644); \
> > - $(call do_install,kbuffer.h,$(DESTDIR)$(includedir_SQ),644)
> > + $(call do_install,event-parse.h,$(includedir_SQ),644); \
> > + $(call do_install,event-utils.h,$(includedir_SQ),644); \
> > + $(call do_install,trace-seq.h,$(includedir_SQ),644); \
> > + $(call do_install,kbuffer.h,$(includedir_SQ),644)
> >
> > install: install_lib
> >
--
- Arnaldo
^ permalink raw reply [flat|nested] 5+ messages in thread
* [tip: perf/core] libtraceevent: Fix header installation
2019-11-14 13:37 [PATCH] libtraceevent: fix header installation Sudip Mukherjee
2019-11-14 22:40 ` Steven Rostedt
@ 2019-11-23 8:15 ` tip-bot2 for Sudip Mukherjee
1 sibling, 0 replies; 5+ messages in thread
From: tip-bot2 for Sudip Mukherjee @ 2019-11-23 8:15 UTC (permalink / raw)
To: linux-tip-commits
Cc: Sudipm Mukherjee, Steven Rostedt (VMware),
linux-trace-devel, Arnaldo Carvalho de Melo, x86, LKML
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 68401a1799fa14cb72c2a129bbefdacd44279772
Gitweb: https://git.kernel.org/tip/68401a1799fa14cb72c2a129bbefdacd44279772
Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
AuthorDate: Thu, 14 Nov 2019 13:37:19
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Fri, 22 Nov 2019 10:48:14 -03:00
libtraceevent: Fix header installation
When we passed some location in DESTDIR, install_headers called
do_install with DESTDIR as part of the second argument.
But do_install is again using '$(DESTDIR_SQ)$2', so as a result the
headers were installed in a location $DESTDIR/$DESTDIR.
In my testing I passed DESTDIR=/home/sudip/test and the headers were
installed in: /home/sudip/test/home/sudip/test/usr/include/traceevent.
Lets remove DESTDIR from the second argument of do_install so that the
headers are installed in the correct location.
Signed-off-by: Sudipm Mukherjee <sudipm.mukherjee@gmail.com>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Sudipm Mukherjee <sudipm.mukherjee@gmail.com>
Cc: linux-trace-devel@vger.kernel.org
Link: http://lore.kernel.org/lkml/20191114133719.309-1-sudipm.mukherjee@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/lib/traceevent/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index 5315f37..cbb429f 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -232,10 +232,10 @@ install_pkgconfig:
install_headers:
$(call QUIET_INSTALL, headers) \
- $(call do_install,event-parse.h,$(DESTDIR)$(includedir_SQ),644); \
- $(call do_install,event-utils.h,$(DESTDIR)$(includedir_SQ),644); \
- $(call do_install,trace-seq.h,$(DESTDIR)$(includedir_SQ),644); \
- $(call do_install,kbuffer.h,$(DESTDIR)$(includedir_SQ),644)
+ $(call do_install,event-parse.h,$(includedir_SQ),644); \
+ $(call do_install,event-utils.h,$(includedir_SQ),644); \
+ $(call do_install,trace-seq.h,$(includedir_SQ),644); \
+ $(call do_install,kbuffer.h,$(includedir_SQ),644)
install: install_lib
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-11-23 8:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-14 13:37 [PATCH] libtraceevent: fix header installation Sudip Mukherjee
2019-11-14 22:40 ` Steven Rostedt
2019-11-14 23:30 ` Arnaldo Carvalho de Melo
2019-11-21 14:40 ` Arnaldo Carvalho de Melo
2019-11-23 8:15 ` [tip: perf/core] libtraceevent: Fix " tip-bot2 for Sudip Mukherjee
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).