From nobody Mon Feb 6 19:07:41 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P9bP95S6zz3n4F3; Mon, 6 Feb 2023 19:07:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P9bP93FMnz3PZC; Mon, 6 Feb 2023 19:07:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675710461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c8nxDJf1Cmcv8kqTxoOlfr12K8N9T5Mj3vKCMJlFtF0=; b=FQIDf5mqOw8t/MjjGLtWo1Ai1dw2lJST2KiuRhIB7QU4V9o8Q1I/OwWQdcGKv873ktsFLT EW8DGIbNSkSU1NXolQdNuFGQhdkfBn4XiKqvNHsHfFWyvDZ99kcH6scK1YTVpF9tmffK7m CkC6Utv+u9AkIEl4gS/n7vfAbHJmWd3LXqbVn20aTn4RCB/VQCZMBfFLAiOfbRoL0vDhMJ VP7NOxzaZ+nd6k1Af9VI1Gto2k9rZV28ugvH4MOxRGd4REImDtw+S0w53ciFmriSdWdjnG nBHTz9HHHjw8oPiAponMiyIxuHrHMT+r27JjZhAtmUG9Y29CBU+Vi2BqAJ7Z9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675710461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c8nxDJf1Cmcv8kqTxoOlfr12K8N9T5Mj3vKCMJlFtF0=; b=IJTUD4A1kERE2R22TpBi7S1hN/noIrrMPmp90T+iZVof9iZahjFjedj4F9qGoENnifQJas nxFdXHxsGL9+spERntIzz+ZfB9vYApQOtEAo8cPoBqeFNDL2jLhQdY/aKnFDB+dUqkTKTe +kqFqUirShTpRJ+yt93EOrx7pWcMbuTjxWrCPNDYX7QAzPP5zgpZFPUTVxsB2zeiMFBmdr tM0gWd4HVX5mPocvtYWauVHHQvbnf297hO427l/ZfHSG2tt4AgKPYp0YIchP3r8srKDJ2/ yGiiXbR4Xd9VQ2Iwb5toAv8d+/epd53Icq3heH7V3pKnneLkPA23EQy+u5dH7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675710461; a=rsa-sha256; cv=none; b=lAOGveKKAf/5kfMucaeKVKTJ5OcqSoTgUw7ii6AM5H/M2yMIe8QxI4hHo+tilwKgClK/cC IXzs33SMOy8Iv+s6y5NkC6a5X6aPVBIL3kHkwKZnigTpERcoPmBGHaj+8a59TPemZoW2TB 8xi+q705No0tbA3atG9oJZeFDKqALsAUzdjxsB5m/ZBPDHkKLNb0LeGbbdZihdfPFWdRYI 02mVfd3RygJx805pct86+KxQMuOhjIfiz9NFxHGAUAqBrb4OWa5gvmcxX4wCjuWX5+XMsP a6wcyMxeepekloY2T3ZMeU/kDaAs408Zg2XnDGTdrwT1JtTqjJ9fSnBPi3x94w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P9bP92M3xzmJM; Mon, 6 Feb 2023 19:07:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 316J7fcF076809; Mon, 6 Feb 2023 19:07:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316J7fe9076808; Mon, 6 Feb 2023 19:07:41 GMT (envelope-from git) Date: Mon, 6 Feb 2023 19:07:41 GMT Message-Id: <202302061907.316J7fe9076808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: fcab90d8e540 - stable/13 - linux_common: Fixup .PATH. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fcab90d8e540557355b38216965df7dec2c74dd9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=fcab90d8e540557355b38216965df7dec2c74dd9 commit fcab90d8e540557355b38216965df7dec2c74dd9 Author: Dmitry Chagin AuthorDate: 2023-01-28 17:31:38 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-06 19:06:29 +0000 linux_common: Fixup .PATH. Since we have arm64, and awaiting ppc64 Linuxulator, do not include x86 specific path to the module build for non x86 architectures. MFC after: 1 week (cherry picked from commit c19fc5cd9b49115604ce2b89279e3434c7f120cc) --- sys/modules/linux_common/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile index 6e67e7ab2578..204cfe5059e5 100644 --- a/sys/modules/linux_common/Makefile +++ b/sys/modules/linux_common/Makefile @@ -1,6 +1,9 @@ # $FreeBSD$ -.PATH: ${SRCTOP}/sys/compat/linux ${SRCTOP}/sys/x86/linux +.PATH: ${SRCTOP}/sys/compat/linux +.if ${MACHINE_CPUARCH} == "amd64" +.PATH: ${SRCTOP}/sys/x86/linux +.endif KMOD= linux_common SRCS= linux_common.c linux_mib.c linux_mmap.c linux_util.c linux_emul.c \