diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2024-02-12 19:02:48 +0000 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2024-02-12 19:03:17 +0000 |
| commit | 3a67c5b662c0e388e776fe0c496d12b082825c55 (patch) | |
| tree | d845be0516fdf98dd99e578ee5d7bc7327b04909 | |
| parent | 131e41614dcfae1f995e55330ada6573ca244ba3 (diff) | |
| download | upstream-3a67c5b662c0e388e776fe0c496d12b082825c55.tar.gz upstream-3a67c5b662c0e388e776fe0c496d12b082825c55.tar.bz2 upstream-3a67c5b662c0e388e776fe0c496d12b082825c55.zip | |
Revert "build: align SOURCE path for build system and SDK"
This reverts commit 131e41614dcfae1f995e55330ada6573ca244ba3.
Sadly it makes menuconfig fail with
tmp/.config-package.in:171: glob failed: No files found "feeds/base/utils/busybox/Config.in"
make: *** [/usr/src/openwrt/include/toplevel.mk:136: menuconfig] Error 1
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
| -rw-r--r-- | include/package-defaults.mk | 2 | ||||
| -rw-r--r-- | target/imagebuilder/files/Makefile | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 392aad0d5db..30b112c7d8c 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)/%,%,$(patsubst $(TOPDIR)/package/%,feeds/base/%,$(CURDIR))) + SOURCE:=$(patsubst $(TOPDIR)/%,%,$(CURDIR)) ifneq ($(PKG_VERSION),) ifneq ($(PKG_RELEASE),) VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 40fba83b5e4..78ec7e2e94a 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -106,8 +106,7 @@ PROFILE_LIST = $(foreach p,$(PROFILE_NAMES), \ @$(SCRIPT_DIR)/target-metadata.pl profile_mk $< '$(BOARD)$(if $(SUBTARGET),/$(SUBTARGET))' > $@ staging_dir/host/.prereq-build: include/prereq-build.mk - mkdir -p tmp feeds - ln -sf $(TOPDIR)/package $(TOPDIR)/feeds/base + mkdir -p tmp @$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f $(TOPDIR)/include/prereq-build.mk prereq IB=1 2>/dev/null || { \ echo "Prerequisite check failed. Use FORCE=1 to override."; \ false; \ |