Fix uninstallation of non-staged packages
PATCH 1/1 Fix uninstallation of non-staged packages
Packages without $(PKG)_INSTALL_STAGING=YES currently fail to uninstall themselves with 'make pkg-uninstall'. For a real life example of the error, try uninstalling 'at' or 'dropbear'.
This patch fixes the issue by only uninstalling packages from staging if $(PKG)_INSTALL_STAGING==YES.
--- package/Makefile.package.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
package/Makefile.package.in +2 -0
@@ -321,8 +321,10 @@ $(BUILD_DIR)/%/.stamp_cleaned: # Uninstall package from target and staging $(BUILD_DIR)/%/.stamp_uninstalled: @$(call MESSAGE,"Uninstalling") +ifeq ($$($(2)_INSTALL_STAGING),YES) $($(PKG)_UNINSTALL_STAGING_CMDS) rm -f $($(PKG)_TARGET_INSTALL_STAGING) +endif $($(PKG)_UNINSTALL_TARGET_CMDS) rm -f $($(PKG)_TARGET_INSTALL_TARGET) $($(PKG)_HOOK_POST_INSTALL)
Signature · 1 line
1.7.1
PATCH 1/1 Fix uninstallation of non-staged packages
Hello Bjorn,
Quoted 17 lines · On Sun, 20 Feb 2011 19:27:45 +0100 Bj?rn Forsman <[email protected]>…
Packages without $(PKG)_INSTALL_STAGING=YES currently fail to uninstall themselves with 'make pkg-uninstall'. For a real life example of the error, try uninstalling 'at' or 'dropbear'.
This patch fixes the issue by only uninstalling packages from staging if $(PKG)_INSTALL_STAGING==YES.
Signed-off-by Bj?rn Forsman <[email protected]>--- package/Makefile.package.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)package/Makefile.package.in +0
-0
package/Makefile.package.in $(BUILD_DIR)/%/.stamp_cleaned: · line 327
Quoted 7 lines
package/Makefile.package.in +2
-0@@ -321,8 +321,10 @@ $(BUILD_DIR)/%/.stamp_cleaned: # Uninstall package from target and staging $(BUILD_DIR)/%/.stamp_uninstalled: @$(call MESSAGE,"Uninstalling") +ifeq ($$($(2)_INSTALL_STAGING),YES) $($(PKG)_UNINSTALL_STAGING_CMDS) rm -f $($(PKG)_TARGET_INSTALL_STAGING) +endif
I understand the problem, but I don't think that the solution works. The $(BUILD_DIR)/%/.stamp_* targets are defined *outside* of the GENTARGETS_INNER macro, so $(2) in your code has no value.
The uninstallation step should probably be split in 3 different stamp
files: one for host, one for staging, one for target. Then in GENTARGETS_INNER, then <pkg>-uninstall target would depend on .stamp_target_uninstalled && .stamp_staging_uninstalled, or .stamp_target_uninstalled only, or .stamp_host_uninstalled only.
However, all the uninstall code is due to be removed/reworked when we merge the package work on Lionel. But quite some work remains to clean it up, so I can't say when it's going to be ready.
Regards,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 1/1 Fix uninstallation of non-staged packages
Hi Thomas,
Quoted 17 lines · Thomas Petazzoni
Hello Bjorn,
Quoted 12 lines · On Sun, 20 Feb 2011 19:27:45 +0100 Bj?rn Forsman <[email protected]>…
Packages without $(PKG)_INSTALL_STAGING=YES currently fail to uninstall themselves with 'make pkg-uninstall'. For a real life example of the error, try uninstalling 'at' or 'dropbear'.
This patch fixes the issue by only uninstalling packages from staging if $(PKG)_INSTALL_STAGING==YES.
Signed-off-by Bj?rn Forsman <[email protected]>---
?package/Makefile.package.in | ? ?2 ++
?1 files changed, 2 insertions(+), 0 deletions(-)
Quoted 16 lines
Quoted 5 lines
package/Makefile.package.in +0
-0@@ -321,8 +321,10 @@ $(BUILD_DIR)/%/.stamp_cleaned:Quoted 7 lines
?# Uninstall package from target and staging
?$(BUILD_DIR)/%/.stamp_uninstalled:
? ? ? @$(call MESSAGE,"Uninstalling")
+ifeq ($$($(2)_INSTALL_STAGING),YES)
? ? ? $($(PKG)_UNINSTALL_STAGING_CMDS)
? ? ? rm -f $($(PKG)_TARGET_INSTALL_STAGING)
+endifI understand the problem, but I don't think that the solution works. The $(BUILD_DIR)/%/.stamp_* targets are defined *outside* of the
GENTARGETS_INNERmacro, so $(2) in your code has no value.
Oops! You are right, $(2) was empty. But $(PKG) seems to contain the package name. However, I'm having difficulties getting it to work as I'd like. Or, put another way, it's not working at all!
$(BUILD_DIR)/%/.stamp_uninstalled:
@$(call MESSAGE,"Uninstalling") @echo "$(PKG)_INSTALL_STAGING: $($(PKG)_INSTALL_STAGING)" ifeq ($($(PKG)_INSTALL_STAGING),YES) @echo "INSTALL_STAGING == YES" $($(PKG)_UNINSTALL_STAGING_CMDS) rm -f $($(PKG)_TARGET_INSTALL_STAGING) else @echo "INSTALL_STAGING != YES"
endif
The first echo statement shows that $($(PKG)_INSTALL_STAGING) evaluates correctly to either YES or NO, but the ifeq stuff always evaluates to false... help?
Quoted 5 lines
The uninstallation step should probably be split in 3 different stamp
files: one for host, one for staging, one for target. Then inGENTARGETS_INNER, then <pkg>-uninstall target would depend on .stamp_target_uninstalled && .stamp_staging_uninstalled, or .stamp_target_uninstalled only, or .stamp_host_uninstalled only.
Agree. But it's more work :-)
Quoted 3 lines
However, all the uninstall code is due to be removed/reworked when we merge the package work on Lionel. But quite some work remains to clean it up, so I can't say when it's going to be ready.
OK.
Best regards,
Bj?rn Forsman