libtraceevent: fix header installation
PATCH 1/1 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.
---
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(-)
tools/lib/traceevent/Makefile +4 -4
@@ -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
Signature · 1 line
2.11.0
Arnaldo,
Can you take this?
-- Steve
Quoted 40 lines · On Thu, 14 Nov 2019 13:37:19 +0000 Sudip Mukherjee…
When we passed some location in DESTDIR,
install_headerscalleddo_installwith DESTDIR as part of the second argument. Butdo_installis 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 ofdo_installso that the headers are installed in the correct location.Signed-off-by Sudip Mukherjee <[email protected]>---
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 bypc_path.tools/lib/traceevent/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)tools/lib/traceevent/Makefile +4
-4@@ -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
Quoted 4 lines · Steven Rostedt
Arnaldo,
Can you take this?
Sure
Quoted 54 lines
Reviewed-by Steven Rostedt (VMware) <[email protected]>-- Steve
Quoted 2 lines · On Thu, 14 Nov 2019 13:37:19 +0000 Sudip Mukherjee…
When we passed some location in DESTDIR,
install_headerscalleddo_installwith DESTDIR as part of the second argument. But
do_installQuoted 5 lines
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 ofdo_installso thatthe
Quoted 7 lines
headers are installed in the correct location.
Signed-off-by Sudip Mukherjee <[email protected]>---
Hi Steve,
sent this earlier as an attachment to an email thread, not sure ifyou
Quoted 2 lines
saw it, so sending it now properly.
The other problem with the pkgconfig, I guess we can live with thatfor
Review
Quoted 6 lines
now as that folder is given by
pc_path.tools/lib/traceevent/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)(quoted diff) +0
-0b/tools/lib/traceevent/Makefile
Quoted 18 lines
index
5315f3787f8d..cbb429f55062100644tools/lib/traceevent/Makefile +4
-4@@ -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 Carvalho de Melo
AppliedEm Thu, Nov 14, 2019 at 05:40:22PM -0500, Steven Rostedt escreveu:
Quoted 6 lines
Arnaldo,
Can you take this?
Reviewed-by Steven Rostedt (VMware) <[email protected]>
Thanks, applied.
- Arnaldo
Quoted 46 lines
-- Steve
Quoted 40 lines · On Thu, 14 Nov 2019 13:37:19 +0000 Sudip Mukherjee…
When we passed some location in DESTDIR,
install_headerscalleddo_installwith DESTDIR as part of the second argument. Butdo_installis 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 ofdo_installso that the headers are installed in the correct location.Signed-off-by Sudip Mukherjee <[email protected]>---
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 bypc_path.tools/lib/traceevent/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)tools/lib/traceevent/Makefile +4
-4@@ -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
Signature · 1 line
- Arnaldo
[tip: perf/core] libtraceevent: Fix header installation
In reply to Sudip MukherjeeThe following commit has been merged into the perf/core branch of tip:
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 <[email protected]> AuthorDate: Thu, 14 Nov 2019 13:37:19 Committer: Arnaldo Carvalho de Melo <[email protected]> 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.
--- tools/lib/traceevent/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/lib/traceevent/Makefile +4 -4
@@ -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