Skip to contentSkip to conversation

libtraceevent: Add uninstall and fix build dependency of libtraceevent.pc

PATCH New Steven Rostedt 1 participant 4 messages Dec 16, 2020 Kbuild

lore
Share & tools
lore
#0 lore raw

cover libtraceevent: Add uninstall and fix build dependency of libtraceevent.pc

Steven Rostedt (VMware) (3):
libtraceevent: Add a way to uninstall
libtraceevent: Update libtraceevent.pc if prefix is different
libtraceevent: Keep build_install file around

----

 Makefile                 | 42 +++++++++++++++++++++++++++++++++++++++++-
 scripts/Makefile.include |  2 ++
 2 files changed, 43 insertions(+), 1 deletion(-)
#1 lore raw

PATCH 1/3 libtraceevent: Add a way to uninstall

From: "Steven Rostedt (VMware)" <[email protected]>

Add an uninstall target. The way this works is to create a temp directory, build and install into it. The examine the files in that directory, to know what files need to be removed. The DESTDIR and prefix need to be the same as how the install happened.

---
 Makefile                 | 26 ++++++++++++++++++++++++++
 scripts/Makefile.include |  1 +
 2 files changed, 27 insertions(+)
Makefile +26 -0
index 12ae490276f4..c85114beef96 100644
@@ -292,6 +292,32 @@ clean: clean_plugins clean_src
 		$(RM) $(OUTPUT)*.o $(OUTPUT)*~ $(TARGETS) $(OUTPUT)*.a $(OUTPUT)*.so $(VERSION_FILES) $(OUTPUT).*.d $(OUTPUT).*.cmd; \
 		$(RM) TRACEEVENT-CFLAGS $(OUTPUT)tags $(OUTPUT)TAGS; \
 		$(RM) $(PKG_CONFIG_FILE)
+ifneq ($(OUTPUT),)
+else
+BUILD_OUTPUT := $(shell pwd)
+endif
+
+define build_uninstall_script
+	$(Q)mkdir $(BUILD_OUTPUT)/tmp_build
+	$(Q)$(MAKE) -C $(srctree) 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_UNINST,$(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 += doc
 doc:
scripts/Makefile.include +1 -0
index 5257bd6637a9..d505b2f20b92 100644
@@ -124,6 +124,7 @@ ifneq ($(silent),1)
 		$(MAKE) $(COMMAND_O) subdir=$(if $(subdir),$(subdir)/$(1),$(1)) $(PRINT_DIR) -C $(1) $(2)
 
 	PRINT_INSTALL  = printf '  INSTALL  %s\n' $1;
+	PRINT_UNINST   = printf '  UNINST   %s\n' $1;
 	QUIET_CLEAN    = @printf '  CLEAN    %s\n' $1;
 	QUIET_INSTALL  = @printf '  INSTALL  %s\n' $1;
 	QUIET_UNINST   = @printf '  UNINST   %s\n' $1;
Signature · 1 line
2.29.2
#2 lore raw

PATCH 2/3 libtraceevent: Update libtraceevent.pc if prefix is different

In reply to Steven Rostedt

From: "Steven Rostedt (VMware)" <[email protected]>

If a build is done with different DESTDIR and the prefix is changed, the the libtraceevent.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 libtraceevent.pc.

---
 Makefile                 | 17 ++++++++++++++++-
 scripts/Makefile.include |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)
Makefile +16 -1
index c85114beef96..f795e05d22a7 100644
@@ -213,6 +213,21 @@ TAGS:	force
 	find . -name '*.[ch]' | xargs etags \
 	--regex='/_PE(\([^,)]*\).*/TEP_ERRNO__\1/'
 
+define build_prefix
+	(echo $1 > [email protected];	\
+	if [ -r $@ ] && cmp -s $@ [email protected]; then				\
+		rm -f [email protected];						\
+	else								\
+		$(PRINT_GEN)						\
+		mv -f [email protected] $@;					\
+	fi);
+endef
+
+BUILD_PREFIX := $(OUTPUT)build_prefix
+
+$(BUILD_PREFIX): force
+	$(Q)$(call build_prefix,$(prefix))
+
 define do_install_mkdir
 	if [ ! -d '$(DESTDIR_SQ)$1' ]; then		\
 		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$1';	\
@@ -232,7 +247,7 @@ define do_make_pkgconfig_file
 	sed -i "s|HEADER_DIR|$(includedir)|g" ${PKG_CONFIG_FILE};
 endef
 
-$(PKG_CONFIG_FILE) : ${PKG_CONFIG_SOURCE_FILE}.template
+$(PKG_CONFIG_FILE) : ${PKG_CONFIG_SOURCE_FILE}.template $(BUILD_PREFIX)
 	$(QUIET_GEN) $(call do_make_pkgconfig_file,$(prefix))
 
 define do_install_pkgconfig_file
scripts/Makefile.include +1 -0
index d505b2f20b92..1c9266c34d2a 100644
@@ -110,6 +110,7 @@ ifneq ($(silent),1)
 	QUIET_AR       = @echo '  AR       '$@;
 	QUIET_LINK     = @echo '  LINK     '$@;
 	QUIET_MKDIR    = @echo '  MKDIR    '$@;
+	PRINT_GEN      = echo '  GEN      '$@;
 	QUIET_GEN      = @echo '  GEN      '$@;
 	QUIET_SUBDIR0  = +@subdir=
 	QUIET_SUBDIR1  = ;$(NO_SUBDIR) \
Signature · 1 line
2.29.2
#3 lore raw

PATCH 3/3 libtraceevent: Keep build_install file around

In reply to Steven Rostedt

From: "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
index f795e05d22a7..f96232b99e40 100644
@@ -319,7 +319,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
@@ -332,7 +332,6 @@ endef
 
 uninstall: $(BUILD_OUTPUT)/build_uninstall
 	@$(foreach file,$(shell cat $(BUILD_OUTPUT)/build_uninstall),$(call uninstall_file,$(file)))
-	$(Q)$(RM) $<
 
 PHONY += doc
 doc:
Signature · 1 line
2.29.2