From patchwork Mon Feb 27 01:48:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliott Mitchell X-Patchwork-Id: 1756022 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) 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=zx3q67vk; dkim-atps=neutral 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PZdFd53TNz1yWp for ; Mon, 13 Mar 2023 11:44:05 +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=baVm/+uh6nPwcG/IdhaXuZtDsavck0T6H31cBM9TiNI=; b=zx3q67vkxOSgDw izlh1J2yh3bo+g5jWA4XzwSPNWq+YpzIduiD7vBI601w8quH5/Qr9usTmIms6cym40QxaEVpLyEC2 tPIgQkW1cmu5E1gpY2JGx8FwNjy79ou5XBghXhycKV3qtiaqqPpes/za4dD7z1W41v0v3E/1xB8IT IGQjIHYrUOiWZV2cgoFOw1gmpLX/GE1TF2mAahIiQp3sOa1iD8YqWyv9XXR47Dq5uhp9pKiEUaIAE WUTPUailofZMlxJ35Qnkdmr4tevZNafR79ER/QqpLqZf37TMdI85ZZr2pb5PePelB2T/99lji5rCI HbnCthIU/HlFRDqsww9g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pbWFy-003u0P-Fu; Mon, 13 Mar 2023 00:41:42 +0000 Received: from mailhost.m5p.com ([74.104.188.4]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pbWFu-003tzc-MU for openwrt-devel@lists.openwrt.org; Mon, 13 Mar 2023 00:41:40 +0000 Received: from m5p.com (mailhost.m5p.com [IPv6:2001:470:1f07:15ff:0:0:0:f7]) by mailhost.m5p.com (8.16.1/8.15.2) with ESMTPS id 32D0Or1g027271 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Sun, 12 Mar 2023 20:24:59 -0400 (EDT) (envelope-from ehem@m5p.com) Received: (from ehem@localhost) by m5p.com (8.16.1/8.15.2/Submit) id 32D0Orup027270; Sun, 12 Mar 2023 17:24:53 -0700 (PDT) (envelope-from ehem) Message-Id: <740b77725eb05a467e84063befd2ef1049baabbb.1678666509.git.ehem+git@drgnwing.com> In-Reply-To: References: From: Elliott Mitchell Date: Sun, 26 Feb 2023 17:48:00 -0800 Subject: [PATCH 4/4] kernel/x86: move "64" to "generic" To: openwrt-devel@lists.openwrt.org X-Spam-Status: No, score=2.5 required=10.0 tests=DATE_IN_PAST_96_XX, KHOP_HELO_FCRDNS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mattapan.m5p.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230312_174138_881647_88F45BD0 X-CRM114-Status: UNSURE ( 6.05 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 2.1 (++) 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: Point "generic" at amd64 which is far more important to nearly everyone. Signed-off-by: Elliott Mitchell --- package/kernel/linux/modules/virt.mk | 2 +- target/linux/x86/Makefile | 2 +- .../x86/{64 => generic}/base-files/lib/preinit/45_mount_xenfs | [...] Content analysis details: (2.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more 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 Point "generic" at amd64 which is far more important to nearly everyone. Signed-off-by: Elliott Mitchell --- package/kernel/linux/modules/virt.mk | 2 +- target/linux/x86/Makefile | 2 +- .../x86/{64 => generic}/base-files/lib/preinit/45_mount_xenfs | 0 target/linux/x86/{64 => generic}/config-5.10 | 0 target/linux/x86/{64 => generic}/config-5.15 | 0 target/linux/x86/{64 => generic}/target.mk | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) rename target/linux/x86/{64 => generic}/base-files/lib/preinit/45_mount_xenfs (100%) rename target/linux/x86/{64 => generic}/config-5.10 (100%) rename target/linux/x86/{64 => generic}/config-5.15 (100%) rename target/linux/x86/{64 => generic}/target.mk (85%) diff --git a/package/kernel/linux/modules/virt.mk b/package/kernel/linux/modules/virt.mk index d0fd4d72cc..fb2e7ccb24 100644 --- a/package/kernel/linux/modules/virt.mk +++ b/package/kernel/linux/modules/virt.mk @@ -18,7 +18,7 @@ $(eval $(call KernelPackage,irqbypass)) define KernelPackage/kvm-x86 SUBMENU:=Virtualization TITLE:=Kernel-based Virtual Machine (KVM) support - DEPENDS:=@TARGET_x86_generic||TARGET_x86_64||TARGET_x86_i686 +kmod-irqbypass + DEPENDS:=@TARGET_x86_generic||TARGET_x86_i686 +kmod-irqbypass KCONFIG:=\ CONFIG_KVM \ CONFIG_KVM_MMU_AUDIT=n \ diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 22bafb8d05..f2e9681621 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -8,7 +8,7 @@ ARCH:=i386 BOARD:=x86 BOARDNAME:=x86 FEATURES:=squashfs ext4 vdi vmdk vhdx pcmcia targz fpu boot-part rootfs-part -SUBTARGETS:=legacy geode 64 i686 +SUBTARGETS:=generic legacy geode i686 KERNEL_PATCHVER:=5.15 diff --git a/target/linux/x86/64/base-files/lib/preinit/45_mount_xenfs b/target/linux/x86/generic/base-files/lib/preinit/45_mount_xenfs similarity index 100% rename from target/linux/x86/64/base-files/lib/preinit/45_mount_xenfs rename to target/linux/x86/generic/base-files/lib/preinit/45_mount_xenfs diff --git a/target/linux/x86/64/config-5.10 b/target/linux/x86/generic/config-5.10 similarity index 100% rename from target/linux/x86/64/config-5.10 rename to target/linux/x86/generic/config-5.10 diff --git a/target/linux/x86/64/config-5.15 b/target/linux/x86/generic/config-5.15 similarity index 100% rename from target/linux/x86/64/config-5.15 rename to target/linux/x86/generic/config-5.15 diff --git a/target/linux/x86/64/target.mk b/target/linux/x86/generic/target.mk similarity index 85% rename from target/linux/x86/64/target.mk rename to target/linux/x86/generic/target.mk index ece3d1bc9a..d0c4a69f58 100644 --- a/target/linux/x86/64/target.mk +++ b/target/linux/x86/generic/target.mk @@ -1,5 +1,5 @@ ARCH:=x86_64 -BOARDNAME:=x86_64 +BOARDNAME:=Generic define Target/Description Build images for 64 bit systems including virtualized guests.