libtracefs: Makefile fixes, add uninstall and fix dependency of libtracefs.pc
cover libtracefs: Makefile fixes, add uninstall and fix dependency of libtracefs.pc
Steven Rostedt (VMware) (5):
libtracefs: Have etcdir always be at the root directory
libtracefs: Remove obsolete do_install_ld call
libtracefs: Add make uninstall
libtracefs: Update libtracefs.pc if prefix is different
libtracefs: Keep build_install file around
----
Makefile | 35 +++++++++++++++++++++++++++-------- scripts/utils.mk | 12 ++++++++++++ 2 files changed, 39 insertions(+), 8 deletions(-)
PATCH 1/5 libtracefs: Have etcdir always be at the root directory
From: "Steven Rostedt (VMware)" <[email protected]>
There's a test if prefix == /usr/local and if so, then etcdir is set to "/etc", otherwise it is set to $(prefix)/etc, which is not correct.
Always have etcdir = "/etc".
--- Makefile | 4 ---- 1 file changed, 4 deletions(-)
Makefile +0 -4
@@ -71,11 +71,7 @@ ifeq ("$(LIBTRACEEVENT_INCLUDES)","") $(error libtraceevent.so not installed) endif -ifeq ($(prefix),/usr/local) etcdir ?= /etc -else -etcdir ?= $(prefix)/etc -endif etcdir_SQ = '$(subst ','\'',$(etcdir))' export man_dir man_dir_SQ html_install html_install_SQ INSTALL
Signature · 1 line
2.29.2
PATCH 2/5 libtracefs: Remove obsolete do_install_ld call
In reply to Steven RostedtFrom: "Steven Rostedt (VMware)" <[email protected]>
Now that there's a test to install the ld.so.conf.d config file only if needed, remove the unused do_install_ld references and the variables it used. As do_install_ld is not even defined.
--- Makefile | 3 --- 1 file changed, 3 deletions(-)
Makefile +0 -3
@@ -89,8 +89,6 @@ HELP_DIR_SQ = '$(subst ','\'',$(HELP_DIR))' #' emacs highlighting gets confused by the above escaped quote. BASH_COMPLETE_DIR ?= $(etcdir)/bash_completion.d -LD_SO_CONF_DIR ?= $(etcdir)/ld.so.conf.d -TRACE_LD_FILE ?= trace.conf # copy a bit from Linux kbuild
@@ -242,7 +240,6 @@ install_libs: libs install_pkgconfig $(Q)$(call do_install,$(LIBTRACEFS_SHARED),$(libdir_SQ)); \ cp -fpR $(LIB_INSTALL) $(DESTDIR)$(libdir_SQ) $(Q)$(call do_install,$(src)/include/tracefs.h,$(includedir_SQ)) - $(Q)$(call do_install_ld,$(TRACE_LD_FILE),$(LD_SO_CONF_DIR),$(libdir_SQ)) $(Q)$(call install_ld_config) install: install_libs
Signature · 1 line
2.29.2
PATCH 3/5 libtracefs: Add make uninstall
In reply to Steven RostedtFrom: "Steven Rostedt (VMware)" <[email protected]>
Create the logic to remove the files that would normally be installed.
Note, this does take the DESTDIR and prefix variables into account. Where the uninstall may only work for an install with the same variables.
--- Makefile | 22 ++++++++++++++++++++++ scripts/utils.mk | 2 ++ 2 files changed, 24 insertions(+)
Makefile +22 -0
@@ -264,6 +264,28 @@ install_doc: install_doc_gui: $(MAKE) -C $(kshark-dir)/Documentation install +define build_uninstall_script + $(Q)mkdir $(BUILD_OUTPUT)/tmp_build + $(Q)$(MAKE) -C $(src) DESTDIR=$(BUILD_OUTPUT)/tmp_build/ O=$(BUILD_OUTPUT) $1 > /dev/null + $(Q)find $(BUILD_OUTPUT)/tmp_build ! -type d -printf "%P\n" > $(BUILD_OUTPUT)/build_$2 + $(Q)$(RM) -rf $(BUILD_OUTPUT)/tmp_build +endef + +build_uninstall: + $(call build_uninstall_script,install,uninstall) + +$(BUILD_OUTPUT)/build_uninstall: build_uninstall + +define uninstall_file + if [ -f $(DESTDIR)/$1 -o -h $(DESTDIR)/$1 ]; then \ + $(call print_uninstall,$(DESTDIR)/$1)$(RM) $(DESTDIR)/$1; \ + fi; +endef + +uninstall: $(BUILD_OUTPUT)/build_uninstall + @$(foreach file,$(shell cat $(BUILD_OUTPUT)/build_uninstall),$(call uninstall_file,$(file))) + $(Q)$(RM) $< + PHONY += force force:
scripts/utils.mk +2 -0
@@ -22,6 +22,7 @@ ifeq ($(findstring 1,$(SILENT)$(VERBOSE)),1) print_plugin_obj_compile = print_plugin_build = print_install = + print_uninstall = print_update = else print_compile = echo ' COMPILE '$(GOBJ);
@@ -32,6 +33,7 @@ else print_plugin_build = echo ' BUILD PLUGIN '$(GOBJ); print_static_lib_build = echo ' BUILD STATIC LIB '$(GOBJ); print_install = echo ' INSTALL '$1' to $(DESTDIR_SQ)$2'; + print_uninstall = echo ' UNINSTALL $(DESTDIR_SQ)$1'; print_update = echo ' UPDATE '$(GOBJ); endif
Signature · 1 line
2.29.2
PATCH 4/5 libtracefs: Update libtracefs.pc if prefix is different
In reply to Steven RostedtFrom: "Steven Rostedt (VMware)" <[email protected]>
If a build is done with different DESTDIR and the prefix is changed, the the libtracefs.pc is not updated with the new prefix, and the one used may not work with the installation being performed.
Add a "build_prefix" dependency, that creates a file "build_prefix" that has the last prefix used to build the library. And if a new prefix is used, then that file gets updated and so does libtracefs.pc.
--- Makefile | 7 ++++++- scripts/utils.mk | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-)
Makefile +6 -1
@@ -197,7 +197,12 @@ define do_make_pkgconfig_file sed -i "s|HEADER_DIR|$(includedir)|g" ${PKG_CONFIG_FILE}; endef -$(PKG_CONFIG_FILE) : ${PKG_CONFIG_SOURCE_FILE}.template +BUILD_PREFIX := $(BUILD_OUTPUT)/build_prefix + +$(BUILD_PREFIX): force + $(Q)$(call build_prefix,$(prefix)) + +$(PKG_CONFIG_FILE) : ${PKG_CONFIG_SOURCE_FILE}.template $(BUILD_PREFIX) $(Q) $(call do_make_pkgconfig_file,$(prefix)) tags: force
scripts/utils.mk +10 -0
@@ -113,6 +113,16 @@ define update_dir fi); endef +define build_prefix + (echo $1 > [email protected]; \ + if [ -r $@ ] && cmp -s $@ [email protected]; then \ + rm -f [email protected]; \ + else \ + $(print_update) \ + mv -f [email protected] $@; \ + fi); +endef + define do_install_mkdir if [ ! -d '$(DESTDIR_SQ)$1' ]; then \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$1'; \
Signature · 1 line
2.29.2
PATCH 5/5 libtracefs: Keep build_install file around
In reply to Steven RostedtFrom: "Steven Rostedt (VMware)" <[email protected]>
Instead of rebuilding the build_install files every time the uninstall is created, make it depend on the prefix, as if the prefix is the same, then the uninstall should be the same.
--- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Makefile +1 -2
@@ -276,7 +276,7 @@ define build_uninstall_script $(Q)$(RM) -rf $(BUILD_OUTPUT)/tmp_build endef -build_uninstall: +build_uninstall: $(BUILD_PREFIX) $(call build_uninstall_script,install,uninstall) $(BUILD_OUTPUT)/build_uninstall: build_uninstall
@@ -289,7 +289,6 @@ endef uninstall: $(BUILD_OUTPUT)/build_uninstall @$(foreach file,$(shell cat $(BUILD_OUTPUT)/build_uninstall),$(call uninstall_file,$(file))) - $(Q)$(RM) $< PHONY += force force:
Signature · 1 line
2.29.2