From patchwork Sun Nov 12 06:51:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliott Mitchell X-Patchwork-Id: 1863980 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=N+iLbTHa; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SVQlQ33cmz1yR8 for ; Wed, 15 Nov 2023 12:37:38 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:To:Subject:Date:From: References:In-Reply-To:Message-Id:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kaiiErXQNN+0K3ofvmFMyAdP5Fs6B4u6aDSQl4EoNs4=; b=N+iLbTHag2P302 SvFGRR8ApEH4Mn/bVdxuFt+wlPj1Q8BIHUXovVhyTVSfnXSEvyDtnxb+6GgkXHz5hP/CrJp/3CpuD VvbUdTdR8Uqetyte6VfP4/cwn4jpX18mVle7mleqlHQ/WYGUoPOomzm5sUuiIXJjvGf382opoDnXZ Rc0ZA0L5jxvoakRM1GcGiqrz7jIZJ4QEECThwTuO28/CJL3kzEIyPBiGrkmTe2+BSEM8nQzBhE+Pp BSBW4NIDyOou64o1q2pKqqW63Mea5rZYktcqui1O1egHjc18NXARQPnE4MzKcFu/BkUfBMiZqWJAx 2gvoytbbLDVU7Qe0JVYw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r34pH-00HAFw-0P; Wed, 15 Nov 2023 01:36:19 +0000 Received: from mailhost.m5p.com ([74.104.188.4]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r34pD-00HAE8-1n for openwrt-devel@lists.openwrt.org; Wed, 15 Nov 2023 01:36:16 +0000 Received: from m5p.com (mailhost.m5p.com [IPv6:2001:470:1f07:15ff:0:0:0:f7]) by mailhost.m5p.com (8.17.1/8.15.2) with ESMTPS id 3AF1a7bv088910 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Tue, 14 Nov 2023 20:36:13 -0500 (EST) (envelope-from ehem@m5p.com) Received: (from ehem@localhost) by m5p.com (8.17.1/8.15.2/Submit) id 3AF1a7gf088909; Tue, 14 Nov 2023 17:36:07 -0800 (PST) (envelope-from ehem) Message-Id: In-Reply-To: References: From: Elliott Mitchell Date: Sat, 11 Nov 2023 22:51:08 -0800 Subject: [PATCH 15/20] [WIP] package: update packages with explicit make flags To: openwrt-devel@lists.openwrt.org X-Spam-Status: No, score=0.0 required=10.0 tests=KHOP_HELO_FCRDNS autolearn=unavailable autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on mattapan.m5p.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231114_173615_737603_B3B549AE X-CRM114-Status: UNSURE ( 8.81 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Identifying which variable to substitute in appropriate places is a bit interesting here. Since these set their own make flags, they need to reference both. Signed-off-by: Elliott Mitchell --- I'm less than certain about perf. I *hope* this matches the requirements, but I'm worried about the comment. --- package/devel/perf/Makefile [...] 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 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Identifying which variable to substitute in appropriate places is a bit interesting here. Since these set their own make flags, they need to reference both. Signed-off-by: Elliott Mitchell --- I'm less than certain about perf. I *hope* this matches the requirements, but I'm worried about the comment. --- package/devel/perf/Makefile | 4 ++-- package/kernel/mac80211/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/devel/perf/Makefile b/package/devel/perf/Makefile index 31881c0136..f5290805fc 100644 --- a/package/devel/perf/Makefile +++ b/package/devel/perf/Makefile @@ -19,7 +19,7 @@ PKG_FLAGS:=nonshared # Perf's makefile and headers are not relocatable and must be built from the # Linux sources directory -PKG_BUILD_DIR:=$(LINUX_DIR)/tools/perf-$(TARGET_DIR_NAME) +PKG_BUILD_DIR:=$(LINUX_OBJ_DIR)/tools/perf-$(TARGET_DIR_NAME) include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -70,7 +70,7 @@ MAKE_FLAGS = \ define Build/Compile +$(MAKE_FLAGS) $(MAKE) $(PKG_JOBS) \ --no-print-directory \ - -C $(LINUX_DIR)/tools/perf + -C $(LINUX_SRC_DIR)/tools/perf endef define Package/perf/install diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index d5e3171f94..e735040530 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -274,9 +274,9 @@ ifeq ($(BUILD_VARIANT),smallbuffers) endif MAKE_OPTS:= \ - $(subst -C $(LINUX_DIR),-C "$(PKG_BUILD_DIR)",$(KERNEL_MAKEOPTS)) \ + $(subst -C $(LINUX_SRC_DIR),-C "$(PKG_BUILD_DIR)",$(KERNEL_MAKEOPTS)) \ EXTRA_CFLAGS="-I$(PKG_BUILD_DIR)/include $(IREMAP_CFLAGS) $(C_DEFINES)" \ - KLIB_BUILD="$(LINUX_DIR)" \ + KLIB_BUILD="$(LINUX_OBJ_DIR)" \ MODPROBE=true \ KLIB=$(TARGET_MODULES_DIR) \ KERNEL_SUBLEVEL=$(lastword $(subst ., ,$(KERNEL_PATCHVER))) \