[openwrt/openwrt] imagebuilder: correctly export PACKAGE_DIR and PACKAGE_DIR_ALL

LEDE Commits lede-commits at lists.infradead.org
Mon Oct 28 16:08:22 PDT 2024


ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/1c211e778180068b348cffaa668b37156bb8e5fd

commit 1c211e778180068b348cffaa668b37156bb8e5fd
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Thu Oct 24 20:32:42 2024 +0200

    imagebuilder: correctly export PACKAGE_DIR and PACKAGE_DIR_ALL
    
    Correctly export PACKAGE_DIR and PACKAGE_DIR_ALL so that they won't be
    reset on internal call of rules.mk
    
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 target/imagebuilder/files/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 7d01bc0e42..024002666a 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -83,9 +83,9 @@ help: FORCE
 
 
 # override variables from rules.mk
-PACKAGE_DIR:=$(TOPDIR)/packages
+export PACKAGE_DIR:=$(TOPDIR)/packages
 LISTS_DIR:=$(subst $(space),/,$(patsubst %,..,$(subst /,$(space),$(TARGET_DIR))))$(DL_DIR)
-PACKAGE_DIR_ALL:=$(TOPDIR)/packages
+export PACKAGE_DIR_ALL:=$(TOPDIR)/packages
 
 export OPKG_KEYS:=$(TOPDIR)/keys
 OPKG:=$(call opkg,$(TARGET_DIR)) \




More information about the lede-commits mailing list