[openwrt/openwrt] toplevel.mk: use relative path for feeds/base symlink

LEDE Commits lede-commits at lists.infradead.org
Mon Nov 10 06:20:37 PST 2025


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/631d535282a39f2d6a440b27f211a7678916f525

commit 631d535282a39f2d6a440b27f211a7678916f525
Author: Andy Chiang <AndyChiang_git at outlook.com>
AuthorDate: Sat Oct 4 17:38:41 2025 +0700

    toplevel.mk: use relative path for feeds/base symlink
    
    Currently, feeds/base is created as an absolute symlink to $(TOPDIR)/package.
    If the OpenWrt source tree is copied to another location for building (while keeping the old tree), the symlink will still point to the package directory in the old tree.
    Using a relative symlink ensures that feeds/base always points to the package directory within the current OpenWrt source tree, improving portability and avoiding incorrect links.
    
    Signed-off-by: Andy Chiang <AndyChiang_git at outlook.com>
    Link: https://github.com/openwrt/openwrt/pull/20297
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 include/toplevel.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/toplevel.mk b/include/toplevel.mk
index 092dff786c..bffbd4a0be 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -78,7 +78,7 @@ _ignore = $(foreach p,$(IGNORE_PACKAGES),--ignore $(p))
 prepare-tmpinfo: FORCE
 	@+$(MAKE) -r -s $(STAGING_DIR_HOST)/.prereq-build $(PREP_MK)
 	mkdir -p tmp/info feeds
-	[ -e $(TOPDIR)/feeds/base ] || ln -sf $(TOPDIR)/package $(TOPDIR)/feeds/base
+	[ -e $(TOPDIR)/feeds/base ] || ln -sf ../package $(TOPDIR)/feeds/base
 	$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPTH=5 SCAN_EXTRA=""
 	$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPTH=3 SCAN_EXTRA="" SCAN_MAKEOPTS="TARGET_BUILD=1"
 	for type in package target; do \




More information about the lede-commits mailing list