diff options
| author | Paul Spooren | 2024-02-12 15:59:50 +0000 |
|---|---|---|
| committer | Alexander Couzens | 2024-09-23 12:34:46 +0000 |
| commit | 10cc5fcd00c648b1a3b4043734c49c18f294041f (patch) | |
| tree | f06fe30d95df60599929b7d5bd2d1abac2cafb07 | |
| parent | 87fbb5085d7e290b0ba536ad7d0876c4224723a6 (diff) | |
| download | openwrt-10cc5fcd00c648b1a3b4043734c49c18f294041f.tar.gz | |
build: align SOURCE path for build system and SDK
Building a package in the build system or the SDK results in different
values for the `SOURCE` property, it's either `packages/<package name>`
or `feeds/base/<package name>`. The reason is that the SDK handles
`openwrt.git` as an external feed called while the build system contains
the *base* packages directly.
Since packages created with either method are (ideally) the same (bit
for bit), align the content of SOURCE. To do so this commit creates a
symlink from `feeds/base` to `$(TOPDIR)/package` and adopts the SOURCE
when building from inside the build system.
Signed-off-by: Paul Spooren <mail@aparcar.org>
| -rw-r--r-- | include/package-defaults.mk | 2 | ||||
| -rw-r--r-- | include/toplevel.mk | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 2cff26b531..af92d4acd7 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -20,7 +20,7 @@ define Package/Default PROVIDES:= EXTRA_DEPENDS:= MAINTAINER:=$(PKG_MAINTAINER) - SOURCE:=$(patsubst $(TOPDIR)/%,%,$(CURDIR)) + SOURCE:=$(patsubst $(TOPDIR)/%,%,$(patsubst $(TOPDIR)/package/%,feeds/base/%,$(CURDIR))) ifneq ($(PKG_VERSION),) ifneq ($(PKG_RELEASE),) VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) diff --git a/include/toplevel.mk b/include/toplevel.mk index 328214be1b..f377933949 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -77,7 +77,8 @@ _ignore = $(foreach p,$(IGNORE_PACKAGES),--ignore $(p)) prepare-tmpinfo: FORCE @+$(MAKE) -r -s $(STAGING_DIR_HOST)/.prereq-build $(PREP_MK) - mkdir -p tmp/info + mkdir -p tmp/info feeds + [ -e $(TOPDIR)/feeds/base ] || ln -sf $(TOPDIR)/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 \ |