From: Christian Marangi <ansuelsmth@gmail.com>
Date: Thu, 24 Oct 2024 18:32:42 +0000 (+0200)
Subject: imagebuilder: correctly export PACKAGE_DIR and PACKAGE_DIR_ALL
X-Git-Tag: v24.10.0-rc1~218
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1c211e778180068b348cffaa668b37156bb8e5fd;p=openwrt%2Fopenwrt.git

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@gmail.com>
---

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)) \