[20/20,TEST] TESTING: try separating build from sources

Message ID	3c39ec02c837eacd2f5fcda0c14e8a39c7e0a1ab.1700010295.git.ehem+openwrt@m5p.com
State	Not Applicable
Delegated to:	Petr Štetiar
Headers	show Return-Path: <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org> Message-Id: <3c39ec02c837eacd2f5fcda0c14e8a39c7e0a1ab.1700010295.git.ehem+openwrt@m5p.com> In-Reply-To: <cover.1700010286.git.ehem+openwrt@m5p.com> References: <cover.1700010286.git.ehem+openwrt@m5p.com> From: Elliott Mitchell <ehem+openwrt@m5p.com> Date: Sun, 12 Nov 2023 13:28:40 -0800 Subject: [PATCH 20/20] [TEST] TESTING: try separating build from sources To: openwrt-devel@lists.openwrt.org preview: Check whether all the spots have been handled. This hasn't been tried in a long while, I doubt I've got everything right. Signed-off-by: Elliott Mitchell <ehem+openwrt@m5p.com> --- include/kernel.mk \| 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Content analysis details: (-0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org
Series	Kernel build fixups, split object directory off (partial WIP) \| expand [00/20] Kernel build fixups, split object directory off (partial WIP) [07/20] kernel: copy all built kernel modules to root filesystem image [06/20] kernel: remove drivers marked as modules [10/20,WIP] build: use dtc from $(LINUX_OBJ_DIR) [12/20,WIP] build: adjust include paths to use LINUX_SRC_DIR/LINUX_OBJ_DIR [13/20,WIP] build: point user_headers at $(LINUX_OBJ_DIR) [11/20,WIP] package/target: update to get modules from $(LINUX_OBJ_DIR) [19/20,WIP] build: point remainder at $(LINUX_SRC_DIR) [16/20,WIP] build: point kernel build tasks at $(LINUX_OBJ_DIR) [18/20,WIP] build: point remaining obvious cases at $(LINUX_SRC_DIR) [15/20,WIP] package: update packages with explicit make flags [14/20,WIP] build: update quilt references to use $(LINUX_SRC_DIR) [08/20] build: add make variables for kernel source and object directories [17/20,WIP] build: split kernel object directory from kernel source directory [01/20] ppp: make copy of compiler_types.h unconditional [20/20,TEST] TESTING: try separating build from sources [03/20] bcm27xx: fix device-tree support patch for split source/build dirs [02/20] package/lantiq: use make -C instead of `cd;` [09/20,WIP] build: split $(DTB_DIR) off of $(DTS_DIR) [04/20] patch: always backup files [05/20] build: merge Kernel/Prepare steps together

Message ID

3c39ec02c837eacd2f5fcda0c14e8a39c7e0a1ab.1700010295.git.ehem+openwrt@m5p.com

State

Not Applicable

Delegated to:

Petr Štetiar

Headers

Message-Id: 
 <3c39ec02c837eacd2f5fcda0c14e8a39c7e0a1ab.1700010295.git.ehem+openwrt@m5p.com>
In-Reply-To: <cover.1700010286.git.ehem+openwrt@m5p.com>
References: <cover.1700010286.git.ehem+openwrt@m5p.com>
From: Elliott Mitchell <ehem+openwrt@m5p.com>
Date: Sun, 12 Nov 2023 13:28:40 -0800
Subject: [PATCH 20/20] [TEST] TESTING: try separating build from sources
To: openwrt-devel@lists.openwrt.org
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org>
Errors-To: 
 openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org

Series

Kernel build fixups, split object directory off (partial WIP) | expand

Commit Message

Elliott Mitchell Nov. 12, 2023, 9:28 p.m. UTC

Check whether all the spots have been handled.  This hasn't been tried
in a long while, I doubt I've got everything right.

Signed-off-by: Elliott Mitchell <ehem+openwrt@m5p.com>
---
 include/kernel.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Elliott Mitchell Nov. 17, 2023, 12:34 a.m. UTC | #1

In case anyone was wondering, the later patches are marked "WIP" since
they hadn't been sufficiently tested.

I had run into this a bit ago, but hadn't tracked down the issue.  Now
that I have, another patch is attached to this message.  This is an
outright bug in the patch and should be fixed.

diff --git a/include/kernel.mk b/include/kernel.mk
index 7f236ece45..4afc9eaf4e 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -44,11 +44,10 @@  else
     FILES_DIR ?= $(foreach dir,$(wildcard $(CURDIR)/files $(CURDIR)/files-$(KERNEL_PATCHVER)),"$(dir)")
   endif
   KERNEL_BUILD_DIR ?= $(BUILD_DIR)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))
-  LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
   # Location of kernel source files
-  LINUX_SRC_DIR ?= $(LINUX_DIR)
+  LINUX_SRC_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
   # Location of kernel object files
-  LINUX_OBJ_DIR ?= $(LINUX_DIR)
+  LINUX_OBJ_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)-$(PROFILE)
   LINUX_UAPI_DIR=uapi/
   LINUX_VERMAGIC:=$(strip $(shell cat $(LINUX_OBJ_DIR)/.vermagic 2>/dev/null))
   LINUX_VERMAGIC:=$(if $(LINUX_VERMAGIC),$(LINUX_VERMAGIC),unknown)

[20/20,TEST] TESTING: try separating build from sources

Commit Message

Comments

Patch