From patchwork Mon Oct 30 01:02:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliott Mitchell X-Patchwork-Id: 1856806 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=QR6qlknx; 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 4SJZm409SLz1yQ6 for ; Mon, 30 Oct 2023 12:04:04 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=N1IhnLY1s8TShRW6JuyR+XRLsm1Bvea05vKLMBp8F5A=; b=QR6qlknxJTlRWT TypJGZ94DdiNo+nJhvYhi5R3thmMPaQiPi25gt72lEdrY5j7rP0Z2U82l9Mzh4eJZVnPmqRB92Vrw DMx8ypmF2izB2t/gqpOdFEhw+SggC0RdGCLoCpncWABsk6rmrWNtoC/kz2ywoBQn53RpcPIoc8giz w4NAAeDpy7E1xyHKVWFhK9mNV/AY/JLwti6W5t1OIA4R1Xa5H47rxp6/v5MD8WT7eLxLp7L3IgARN 0iSbfPmIjXQxCNZJRfG8Q59Wo1z5lnpxRA4TTFwBZ+hLLI+tKymcxDpDx+WGKjsxyB5EnJ8LirdRH T29b/5Jrjj42RMlDBzdw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qxGfw-002MzL-2f; Mon, 30 Oct 2023 01:02:40 +0000 Received: from mailhost.m5p.com ([74.104.188.4]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qxGft-002Mxz-2V for openwrt-devel@lists.openwrt.org; Mon, 30 Oct 2023 01:02:39 +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 39U12UOr091627 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Sun, 29 Oct 2023 21:02:35 -0400 (EDT) (envelope-from ehem@m5p.com) Received: (from ehem@localhost) by m5p.com (8.17.1/8.15.2/Submit) id 39U12UF2091626 for openwrt-devel@lists.openwrt.org; Sun, 29 Oct 2023 18:02:30 -0700 (PDT) (envelope-from ehem) Date: Sun, 29 Oct 2023 18:02:30 -0700 From: Elliott Mitchell To: openwrt-devel@lists.openwrt.org Subject: [PATCH 09/10] packages/x86: detect architecture, not x86/64 target Message-ID: <01c1526a5bf8b29e0ab8ef6a451ca6be6991933f.1698621006.git.ehem+openwrt@m5p.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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-20231029_180237_970048_42BAA65D X-CRM114-Status: GOOD ( 10.23 ) 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: 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 ++-- [...] 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: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org 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 ae802e210e..dc85274c5d 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 511410d614..f5f225d06f 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)