| Message ID | 20190608220047.23910-1-jeffery.to@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Petr Štetiar |
| Headers | show |
| Series | [OpenWrt-Devel] build: Remove STAGING_DIR_HOST references for InstallDev/UninstallDev | expand |
Jeffery To <jeffery.to@gmail.com> [2019-06-09 06:00:47]: Hi, > Build/InstallDev no longer places a file list in > $(STAGING_DIR_HOST)/packages; this change removes the creation of > $(STAGING_DIR_HOST)/packages and the attempted removal of a > STAGING_DIR_HOST file list during package clean. that's clear, ok. > This also changes the host directory passed to Build/UninstallDev from > $(STAGING_DIR_HOST) to $(STAGING_DIR)/host, to match the directory > passed to Build/InstallDev. Late night, but I see following: include/package.mk: $(call Build/InstallDev,$(TMP_DIR)/stage-$(PKG_DIR_NAME),$(TMP_DIR)/stage-$(PKG_DIR_NAME)/host) > - $(call Build/UninstallDev,$(STAGING_DIR),$(STAGING_DIR_HOST)) > + $(call Build/UninstallDev,$(STAGING_DIR),$(STAGING_DIR)/host) So that description doesn't correspond with the change. > Signed-off-by: Jeffery To <jeffery.to@gmail.com> > --- > include/package.mk | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/include/package.mk b/include/package.mk > index 569ad647d6..348f75fba7 100644 > --- a/include/package.mk > +++ b/include/package.mk > @@ -195,7 +195,7 @@ define Build/CoreTargets > $(STAMP_INSTALLED) : export PATH=$$(TARGET_PATH_PKG) > $(STAMP_INSTALLED): $(STAMP_BUILT) > rm -rf $(TMP_DIR)/stage-$(PKG_DIR_NAME) > - mkdir -p $(TMP_DIR)/stage-$(PKG_DIR_NAME)/host $(STAGING_DIR)/packages $(STAGING_DIR_HOST)/packages > + mkdir -p $(TMP_DIR)/stage-$(PKG_DIR_NAME)/host $(STAGING_DIR)/packages > $(foreach hook,$(Hooks/InstallDev/Pre),\ > $(call $(hook),$(TMP_DIR)/stage-$(PKG_DIR_NAME),$(TMP_DIR)/stage-$(PKG_DIR_NAME)/host)$(sep)\ > ) > @@ -314,9 +314,9 @@ clean-build: $(if $(wildcard $(PKG_BUILD_DIR)/.autoremove),force-clean-build) > > clean: force-clean-build > $(CleanStaging) > - $(call Build/UninstallDev,$(STAGING_DIR),$(STAGING_DIR_HOST)) > + $(call Build/UninstallDev,$(STAGING_DIR),$(STAGING_DIR)/host) > $(Build/Clean) > - rm -f $(STAGING_DIR)/packages/$(STAGING_FILES_LIST) $(STAGING_DIR_HOST)/packages/$(STAGING_FILES_LIST) > + rm -f $(STAGING_DIR)/packages/$(STAGING_FILES_LIST) > > dist: > $(Build/Dist)
diff --git a/include/package.mk b/include/package.mk index 569ad647d6..348f75fba7 100644 --- a/include/package.mk +++ b/include/package.mk @@ -195,7 +195,7 @@ define Build/CoreTargets $(STAMP_INSTALLED) : export PATH=$$(TARGET_PATH_PKG) $(STAMP_INSTALLED): $(STAMP_BUILT) rm -rf $(TMP_DIR)/stage-$(PKG_DIR_NAME) - mkdir -p $(TMP_DIR)/stage-$(PKG_DIR_NAME)/host $(STAGING_DIR)/packages $(STAGING_DIR_HOST)/packages + mkdir -p $(TMP_DIR)/stage-$(PKG_DIR_NAME)/host $(STAGING_DIR)/packages $(foreach hook,$(Hooks/InstallDev/Pre),\ $(call $(hook),$(TMP_DIR)/stage-$(PKG_DIR_NAME),$(TMP_DIR)/stage-$(PKG_DIR_NAME)/host)$(sep)\ ) @@ -314,9 +314,9 @@ clean-build: $(if $(wildcard $(PKG_BUILD_DIR)/.autoremove),force-clean-build) clean: force-clean-build $(CleanStaging) - $(call Build/UninstallDev,$(STAGING_DIR),$(STAGING_DIR_HOST)) + $(call Build/UninstallDev,$(STAGING_DIR),$(STAGING_DIR)/host) $(Build/Clean) - rm -f $(STAGING_DIR)/packages/$(STAGING_FILES_LIST) $(STAGING_DIR_HOST)/packages/$(STAGING_FILES_LIST) + rm -f $(STAGING_DIR)/packages/$(STAGING_FILES_LIST) dist: $(Build/Dist)
Build/InstallDev no longer places a file list in $(STAGING_DIR_HOST)/packages; this change removes the creation of $(STAGING_DIR_HOST)/packages and the attempted removal of a STAGING_DIR_HOST file list during package clean. This also changes the host directory passed to Build/UninstallDev from $(STAGING_DIR_HOST) to $(STAGING_DIR)/host, to match the directory passed to Build/InstallDev. Signed-off-by: Jeffery To <jeffery.to@gmail.com> --- include/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)