From: Andy Chiang Date: Sat, 4 Oct 2025 10:38:41 +0000 (+0700) Subject: toplevel.mk: use relative path for feeds/base symlink X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=631d535282a39f2d6a440b27f211a7678916f525;p=openwrt%2Fstaging%2Fstintel.git 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 Link: https://github.com/openwrt/openwrt/pull/20297 Signed-off-by: Robert Marko --- 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 \