[01/20] ppp: make copy of compiler_types.h unconditional

Message ID	af5c57f86477d2e2af9dbf86dd2eac5db3d8e823.1700010289.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: <af5c57f86477d2e2af9dbf86dd2eac5db3d8e823.1700010289.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 10:22:28 -0800 Subject: [PATCH 01/20] ppp: make copy of compiler_types.h unconditional To: openwrt-devel@lists.openwrt.org preview: 04cb1e0fd2 was implemented to avoid failures with kernels before 4.14.9. At this point OpenWRT no longer supports earlier kernels, so make the copy fail if compiler_types.h doesn't exist. Updates: 04cb1e0fd2 ("ppp: fix build with kernel 4.14.9+") Signed-off-by: Elliott Mitchell <ehem+openwrt@m5p.com> --- package/network/services/ppp/Makefile \| 6 +----- 1 file changed, 1 insertion(+), 5 [...] 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

af5c57f86477d2e2af9dbf86dd2eac5db3d8e823.1700010289.git.ehem+openwrt@m5p.com

State

Not Applicable

Delegated to:

Petr Štetiar

Headers

Message-Id: 
 <af5c57f86477d2e2af9dbf86dd2eac5db3d8e823.1700010289.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 10:22:28 -0800
Subject: [PATCH 01/20] ppp: make copy of compiler_types.h unconditional
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:22 p.m. UTC

04cb1e0fd2 was implemented to avoid failures with kernels before
4.14.9.  At this point OpenWRT no longer supports earlier kernels,
so make the copy fail if compiler_types.h doesn't exist.

Updates: 04cb1e0fd2 ("ppp: fix build with kernel 4.14.9+")
Signed-off-by: Elliott Mitchell <ehem+openwrt@m5p.com>
---
 package/network/services/ppp/Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile
index 40ec5c5cf1..5f4b8ac02f 100644
--- a/package/network/services/ppp/Makefile
+++ b/package/network/services/ppp/Makefile
@@ -184,13 +184,9 @@  $(call Build/Configure/Default,, \
 	mkdir -p $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux
 	$(CP) \
 		$(LINUX_DIR)/include/linux/compiler.h \
+		$(LINUX_DIR)/include/linux/compiler_types.h \
 		$(LINUX_DIR)/include/$(LINUX_UAPI_DIR)linux/atm*.h \
 		$(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/
-
-	# Kernel 4.14.9+ only, ignore the exit status of cp in case the file
-	# doesn't exits
-	-$(CP) $(LINUX_DIR)/include/linux/compiler_types.h \
-		$(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/
 endef
 
 MAKE_FLAGS += COPTS="$(TARGET_CFLAGS)" \

[01/20] ppp: make copy of compiler_types.h unconditional

Commit Message

Patch