[source] include/package-ipkg.mk: use TARGET_PATH_PKG in Package/*/install steps

LEDE Commits lede-commits at lists.infradead.org
Wed Oct 5 17:11:34 PDT 2016


neoraider pushed a commit to source.git, branch master:
https://git.lede-project.org/ec041920b7132062a0e459692daf298932c63bdd

commit ec041920b7132062a0e459692daf298932c63bdd
Author: Matthias Schiffer <mschiffer at universe-factory.net>
AuthorDate: Thu Oct 6 00:42:32 2016 +0200

    include/package-ipkg.mk: use TARGET_PATH_PKG in Package/*/install steps
    
    Package/*/install was using a different PATH than all other steps like
    Build/Install, which was confusing and easily led to mistakes.
    
    Signed-off-by: Matthias Schiffer <mschiffer at universe-factory.net>
---
 include/package-ipkg.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index b8f886b..2591f5e 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -133,6 +133,7 @@ ifeq ($(DUMP),)
     $(eval $(call BuildIPKGVariable,$(1),prerm,-pkg,1))
     $(eval $(call BuildIPKGVariable,$(1),postrm,,1))
 
+    $(STAGING_DIR_ROOT)/stamp/.$(1)_installed : export PATH=$$(TARGET_PATH_PKG)
     $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT)
 	rm -rf $(STAGING_DIR_ROOT)/tmp-$(1)
 	mkdir -p $(STAGING_DIR_ROOT)/stamp $(STAGING_DIR_ROOT)/tmp-$(1)
@@ -172,6 +173,7 @@ $(_endef)
     $(PKG_INFO_DIR)/$(1).provides: $$(IPKG_$(1))
     $$(IPKG_$(1)) : export CONTROL=$$(Package/$(1)/CONTROL)
     $$(IPKG_$(1)) : export DESCRIPTION=$$(Package/$(1)/description)
+    $$(IPKG_$(1)) : export PATH=$$(TARGET_PATH_PKG)
     $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk
 	@rm -rf $$(PDIR_$(1))/$(1)_* $$(IDIR_$(1))
 	mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(PKG_INFO_DIR)



More information about the lede-commits mailing list