From patchwork Sun Dec 10 02:16:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliott Mitchell X-Patchwork-Id: 1874226 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=Hsk1OPcK; 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 4SpCFn4F41z23n5 for ; Mon, 11 Dec 2023 04:55:09 +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:Cc:To:Subject:Date:From: References:In-Reply-To:Message-Id:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=WjLFWrQHzlnw2oUjqHgowkkGPTwaRUQ2q0MtNaul7cU=; b=Hsk1OPcKD7wg00 bEcZ1nQekxVUJyzt1LrBvXjYlRYF+YZ/qLNaH7ZWLelfNqDGwaUU5pQQbmYDl9kU+G0n1lg5apMg0 kznaifN92gV4uJDS+YocsbRmM8O5ZxPgjkZaoBiwqRaRWthomSL3OAyXMu0fj8V3V4mlGJWgH2T1F CsUlyXPWTre4D0R364vnE27H72o2Lf2ktG0uhZ9DQMKL3BnJzkoWg45rRx8oGJ9mt2XFU/nWrI9fX iR/TpI0lHKLAcStfG9BNIFkLWKq1P9OFRAGYYwjxB6qElB5nEtCs9GBhTFIxMVir1KMR8BfVo4u8H gKP1if355qpfiNK2vBFA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rCNzm-003K0W-0Y; Sun, 10 Dec 2023 17:53:38 +0000 Received: from mailhost.m5p.com ([74.104.188.4]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rCNzi-003Jz3-0X for openwrt-devel@lists.openwrt.org; Sun, 10 Dec 2023 17:53:35 +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 3BAHrQ2t020260 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sun, 10 Dec 2023 12:53:32 -0500 (EST) (envelope-from ehem@m5p.com) Received: (from ehem@localhost) by m5p.com (8.17.1/8.15.2/Submit) id 3BAHrQ6v020259; Sun, 10 Dec 2023 09:53:26 -0800 (PST) (envelope-from ehem) Message-Id: In-Reply-To: References: From: Elliott Mitchell Date: Sat, 9 Dec 2023 18:16:15 -0800 Subject: [PATCH RESEND 10/11] packages/x86: detect architecture, not x86/64 target To: openwrt-devel@lists.openwrt.org Cc: daniel@makrotopia.org X-Spam-Status: No, score=0.8 required=10.0 tests=DATE_IN_PAST_12_24, KHOP_HELO_FCRDNS autolearn=no 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-20231210_095334_354706_9EAD64AF X-CRM114-Status: UNSURE ( 7.58 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.8 (/) 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: Date: Mon, 27 Feb 2023 17:24:27 -0800 These spots should be detecting the amd64 architecture, not the specific target name. If additional amd64 targets were added, or the target was renamed, these would fail to build. Content analysis details: (0.8 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.8 DATE_IN_PAST_12_24 Date: is 12 to 24 hours before Received: date -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 Date: Mon, 27 Feb 2023 17:24:27 -0800 These spots should be detecting the amd64 architecture, not the specific target name. If additional amd64 targets were added, or the target was renamed, these would fail to build. Signed-off-by: Elliott Mitchell --- package/firmware/intel-microcode/Makefile | 2 +- package/kernel/linux/modules/crypto.mk | 2 +- package/kernel/linux/modules/virt.mk | 4 ++-- package/libs/wolfssl/Makefile | 2 +- target/linux/x86/modules.mk | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/firmware/intel-microcode/Makefile b/package/firmware/intel-microcode/Makefile index 9e87dccc12..f6e9c2def7 100644 --- a/package/firmware/intel-microcode/Makefile +++ b/package/firmware/intel-microcode/Makefile @@ -19,7 +19,7 @@ PKG_CPE_ID:=cpe:/a:intel:microcode PKG_BUILD_DEPENDS:=iucode-tool/host -ifdef CONFIG_TARGET_x86_64 +ifdef CONFIG_x86_64 MICROCODE:="intel-microcode-64" else MICROCODE:="intel-microcode" diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index dd17d868fa..5e6fed631a 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -777,7 +777,7 @@ define KernelPackage/crypto-misc $(call AddDepends/crypto) endef -ifndef CONFIG_TARGET_x86_64 +ifndef CONFIG_x86_64 define KernelPackage/crypto-misc/x86 FILES+= \ $(LINUX_DIR)/arch/x86/crypto/twofish-i586.ko \ diff --git a/package/kernel/linux/modules/virt.mk b/package/kernel/linux/modules/virt.mk index f45cb17614..82fb1af2de 100644 --- a/package/kernel/linux/modules/virt.mk +++ b/package/kernel/linux/modules/virt.mk @@ -77,7 +77,7 @@ $(eval $(call KernelPackage,kvm-amd)) define KernelPackage/vfio SUBMENU:=Virtualization TITLE:=VFIO Non-Privileged userspace driver framework - DEPENDS:=@TARGET_x86_64||TARGET_armsr_armv8 + DEPENDS:=@x86_64||TARGET_armsr_armv8 KCONFIG:= \ CONFIG_VFIO \ CONFIG_VFIO_NOIOMMU=n \ @@ -99,7 +99,7 @@ $(eval $(call KernelPackage,vfio)) define KernelPackage/vfio-pci SUBMENU:=Virtualization TITLE:=Generic VFIO support for any PCI device - DEPENDS:=@TARGET_x86_64||TARGET_armsr_armv8 @PCI_SUPPORT +kmod-vfio +kmod-irqbypass + DEPENDS:=@x86_64||TARGET_armsr_armv8 @PCI_SUPPORT +kmod-vfio +kmod-irqbypass KCONFIG:= \ CONFIG_VFIO_PCI \ CONFIG_VFIO_PCI_IGD=n diff --git a/package/libs/wolfssl/Makefile b/package/libs/wolfssl/Makefile index 6451dca68d..4326d1483e 100644 --- a/package/libs/wolfssl/Makefile +++ b/package/libs/wolfssl/Makefile @@ -185,7 +185,7 @@ else ifdef CONFIG_aarch64 CONFIGURE_ARGS += --enable-armasm TARGET_CFLAGS:=$(TARGET_CFLAGS:-mcpu%=-mcpu%+crypto) Package/libwolfsslcpu-crypto/preinst=$(Package/libwolfsslcpu-crypto/preinst-aarch64) -else ifdef CONFIG_TARGET_x86_64 +else ifdef CONFIG_x86_64 CONFIGURE_ARGS += --enable-intelasm endif diff --git a/target/linux/x86/modules.mk b/target/linux/x86/modules.mk index cdae01bce6..29834d096b 100644 --- a/target/linux/x86/modules.mk +++ b/target/linux/x86/modules.mk @@ -5,7 +5,7 @@ define KernelPackage/amd-xgbe SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=AMD Ethernet on SoC support - DEPENDS:=@PCI_SUPPORT @TARGET_x86_64 +kmod-lib-crc32c +kmod-ptp +kmod-libphy +kmod-mdio-devres + DEPENDS:=@PCI_SUPPORT @x86_64 +kmod-lib-crc32c +kmod-ptp +kmod-libphy +kmod-mdio-devres KCONFIG:=CONFIG_AMD_XGBE FILES:=$(LINUX_DIR)/drivers/net/ethernet/amd/xgbe/amd-xgbe.ko AUTOLOAD:=$(call AutoLoad,35,amd-xgbe)