[13/20,WIP] build: point user_headers at $(LINUX_OBJ_DIR)

Message ID	5dd3fcc01db31ad1f27f044551340dcb2e0de91e.1700010293.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: <5dd3fcc01db31ad1f27f044551340dcb2e0de91e.1700010293.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: Sat, 11 Nov 2023 22:51:08 -0800 Subject: [PATCH 13/20] [WIP] build: point user_headers at $(LINUX_OBJ_DIR) To: openwrt-devel@lists.openwrt.org preview: These may be regenerated with every build. As such they seem appropriate for the object directory, rather than source. Signed-off-by: Elliott Mitchell <ehem+openwrt@m5p.com> --- include/kernel-defaults.mk \| 6 +++--- package/devel/strace/Makefile \| 2 +- package/network/config/swconfig/Makefile \| 2 +- package/network/ut [...] 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

5dd3fcc01db31ad1f27f044551340dcb2e0de91e.1700010293.git.ehem+openwrt@m5p.com

State

Not Applicable

Delegated to:

Petr Štetiar

Headers

Message-Id: 
 <5dd3fcc01db31ad1f27f044551340dcb2e0de91e.1700010293.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: Sat, 11 Nov 2023 22:51:08 -0800
Subject: [PATCH 13/20] [WIP] build: point user_headers at $(LINUX_OBJ_DIR)
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, 6:51 a.m. UTC

These may be regenerated with every build.  As such they seem
appropriate for the object directory, rather than source.

Signed-off-by: Elliott Mitchell <ehem+openwrt@m5p.com>
---
 include/kernel-defaults.mk               | 6 +++---
 package/devel/strace/Makefile            | 2 +-
 package/network/config/swconfig/Makefile | 2 +-
 package/network/utils/iptables/Makefile  | 8 ++++----
 package/network/utils/linux-atm/Makefile | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 0b421d2cc3..10cd83712a 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -35,8 +35,8 @@  else
 		rmdir $(LINUX_DIR); \
 	fi
 	ln -s $(CONFIG_EXTERNAL_KERNEL_TREE) $(LINUX_DIR)
-	if [ -d $(LINUX_DIR)/user_headers ]; then \
-		rm -rf $(LINUX_DIR)/user_headers; \
+	if [ -d $(LINUX_OBJ_DIR)/user_headers ]; then \
+		rm -rf $(LINUX_OBJ_DIR)/user_headers; \
 	fi
   endef
 endif
@@ -111,7 +111,7 @@  define Kernel/Configure/Default
 		cp $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config; \
 		cp $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config.prev; \
 	}
-	$(_SINGLE) [ -d $(LINUX_DIR)/user_headers ] || $(KERNEL_MAKE) $(if $(findstring uml,$(BOARD)),ARCH=$(ARCH)) INSTALL_HDR_PATH=$(LINUX_DIR)/user_headers headers_install
+	$(_SINGLE) [ -d $(LINUX_OBJ_DIR)/user_headers ] || $(KERNEL_MAKE) $(if $(findstring uml,$(BOARD)),ARCH=$(ARCH)) INSTALL_HDR_PATH=$(LINUX_OBJ_DIR)/user_headers headers_install
 	grep '=[ym]' $(LINUX_DIR)/.config.set | LC_ALL=C sort | $(MKHASH) md5 > $(LINUX_DIR)/.vermagic
 endef
 
diff --git a/package/devel/strace/Makefile b/package/devel/strace/Makefile
index 3343177c3e..fa5e5c0492 100644
--- a/package/devel/strace/Makefile
+++ b/package/devel/strace/Makefile
@@ -31,7 +31,7 @@  PKG_CONFIG_DEPENDS := \
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 
-HOST_CFLAGS += -I$(LINUX_DIR)/user_headers/include
+HOST_CFLAGS += -I$(LINUX_OBJ_DIR)/user_headers/include
 
 CONFIGURE_VARS+= \
 	LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
diff --git a/package/network/config/swconfig/Makefile b/package/network/config/swconfig/Makefile
index 6549075e5c..69f795ce1e 100644
--- a/package/network/config/swconfig/Makefile
+++ b/package/network/config/swconfig/Makefile
@@ -30,7 +30,7 @@  TARGET_CPPFLAGS := \
 	-I$(STAGING_DIR)/usr/include/libnl-tiny \
 	-I$(PKG_BUILD_DIR) \
 	$(TARGET_CPPFLAGS) \
-	-I$(LINUX_DIR)/user_headers/include
+	-I$(LINUX_OBJ_DIR)/user_headers/include
 
 define Build/Compile
 	CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile
index 45a2b49070..f9e8d619fa 100644
--- a/package/network/utils/iptables/Makefile
+++ b/package/network/utils/iptables/Makefile
@@ -586,19 +586,19 @@  endef
 
 TARGET_CPPFLAGS := \
 	-I$(PKG_BUILD_DIR)/include \
-	-I$(LINUX_DIR)/user_headers/include \
+	-I$(LINUX_OBJ_DIR)/user_headers/include \
 	$(TARGET_CPPFLAGS)
 
 TARGET_CFLAGS += \
 	-I$(PKG_BUILD_DIR)/include \
-	-I$(LINUX_DIR)/user_headers/include \
+	-I$(LINUX_OBJ_DIR)/user_headers/include \
 	-DNO_LEGACY
 
 CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
 	--enable-devel \
-	--with-kernel="$(LINUX_DIR)/user_headers" \
+	--with-kernel="$(LINUX_OBJ_DIR)/user_headers" \
 	--with-xtlibdir=/usr/lib/iptables \
 	--with-xt-lock-name=/var/run/xtables.lock \
 	$(if $(CONFIG_IPTABLES_CONNLABEL),,--disable-connlabel) \
@@ -607,7 +607,7 @@  CONFIGURE_ARGS += \
 MAKE_FLAGS := \
 	$(TARGET_CONFIGURE_OPTS) \
 	COPT_FLAGS="$(TARGET_CFLAGS)" \
-	KERNEL_DIR="$(LINUX_DIR)/user_headers/" PREFIX=/usr \
+	KERNEL_DIR="$(LINUX_OBJ_DIR)/user_headers/" PREFIX=/usr \
 	KBUILD_OUTPUT="$(LINUX_DIR)" \
 	BUILTIN_MODULES="$(patsubst ip6t_%,%,$(patsubst ipt_%,%,$(patsubst xt_%,%,$(IPT_BUILTIN) $(IPT_CONNTRACK-m) $(IPT_NAT-m))))"
 
diff --git a/package/network/utils/linux-atm/Makefile b/package/network/utils/linux-atm/Makefile
index 43f4b6556b..0bed1d6e6d 100644
--- a/package/network/utils/linux-atm/Makefile
+++ b/package/network/utils/linux-atm/Makefile
@@ -99,7 +99,7 @@  endef
 
 $(foreach t,$(ATM_DEBUG_TOOLS),$(eval $(call GenAtmPlugin,atm-$(t),$(t))))
 
-TARGET_CFLAGS += -I$(LINUX_DIR)/user_headers/include
+TARGET_CFLAGS += -I$(LINUX_OBJ_DIR)/user_headers/include
 
 define Build/Configure
 	$(call Build/Configure/Default)

[13/20,WIP] build: point user_headers at $(LINUX_OBJ_DIR)

Commit Message

Patch