From 3a67c5b662c0e388e776fe0c496d12b082825c55 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 12 Feb 2024 19:02:48 +0000 Subject: [PATCH] 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 --- include/package-defaults.mk | 2 +- 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 392aad0d5d..30b112c7d8 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 40fba83b5e..78ec7e2e94 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; \ -- 2.30.2