pkg-infra: improve reliability of foo-install

PATCH New Arnout Vandecappelle (Essensium/Mind) 2 participants 2 messages Jan 21, 2012 – Feb 2, 2012

lore

Share & tools

lore

Arnout Vandecappelle (Essensium/Mind)

author

2012-01-21 00:01 UTC #0 lore raw

PATCH 1/1 pkg-infra: improve reliability of foo-install

From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>

Running foo-uninstall has a high likelyhood of failing, because we remove a lot of directories from the target. To improve the reliability, remove the stamp files before calling the uninstall commands, and add the -k option to the sub-make.

Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
 package/Makefile.autotools.in |    5 ++++-
 package/Makefile.package.in   |    5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

package/Makefile.autotools.in +4 -1

index 0f9b2c6..cf1e8ef 100644
@@ -285,10 +285,13 @@ endif
 #
 # Uninstall from target step. Only define it if not already defined
 # by the package .mk file.
+# Autotools Makefiles do uninstall with ( cd ...; rm -f ... )
+# Since we remove a lot of directories in target-finalize, this is likely
+# to fail.  Therefore add -k flag.
 #
 ifndef $(2)_UNINSTALL_TARGET_CMDS
 define $(2)_UNINSTALL_TARGET_CMDS
-	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_UNINSTALL_TARGET_OPT) -C $$($$(PKG)_SRCDIR)
+	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) -k $$($$(PKG)_UNINSTALL_TARGET_OPT) -C $$($$(PKG)_SRCDIR)
 endef
 endif

package/Makefile.package.in +3 -2

index 0f6bcd2..cd801ed 100644
@@ -442,12 +442,13 @@ $(BUILD_DIR)/%/.stamp_cleaned:
 	rm -f $(@D)/.stamp_built
 
 # Uninstall package from target and staging
+# Uninstall commands tend to fail, so remove the stamp files first
 $(BUILD_DIR)/%/.stamp_uninstalled:
 	@$(call MESSAGE,"Uninstalling")
-	$($(PKG)_UNINSTALL_STAGING_CMDS)
 	rm -f $($(PKG)_TARGET_INSTALL_STAGING)
-	$($(PKG)_UNINSTALL_TARGET_CMDS)
 	rm -f $($(PKG)_TARGET_INSTALL_TARGET)
+	$($(PKG)_UNINSTALL_STAGING_CMDS)
+	$($(PKG)_UNINSTALL_TARGET_CMDS)
 
 # Remove package sources
 $(BUILD_DIR)/%/.stamp_dircleaned:

Signature · 1 line

1.7.8.3

Peter Korsgaard

2012-02-02 22:00 UTC #1 lore raw

PATCH 1/1 pkg-infra: improve reliability of foo-install

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle (Essensium/Mind) <[email protected]> writes:

Arnout> From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]> Arnout> Running foo-uninstall has a high likelyhood of failing, because we Arnout> remove a lot of directories from the target. To improve the reliability, Arnout> remove the stamp files before calling the uninstall commands, and add Arnout> the -k option to the sub-make.

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard