From nobody Tue Nov 07 08:35:27 2023 X-Original-To: dev-commits-ports-all@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 4SPhPD0rtPz50Mqj; Tue, 7 Nov 2023 08:35:28 +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 4SPhPD0JT4z3F6r; Tue, 7 Nov 2023 08:35:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699346128; 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=dP3OtcbYJc9m3pZBM6VuFd6Cp2/aQ2VL1lGz6I7lOl0=; b=b3voGuxKw7y00c4MFFoFqyVGLZi4dXYG2QbVoeXmnTxPO8FDgl2KEhDav6334p2hCbyBVL DxJgdZMZ7kXKZuL0g/0EjJDgy6eSRQIeONAU2w1t1Ba188vB7enEnSaNIWn7uIY0k57rAN 8Sxcuea6m3SD8g57cNUbAU2zQ0zM2OL0ZMUnvVoyF8YzoFCPyI0cOtlcEK2q4+hoC8vBcI MrM7+s+EXvieA6QBZVSn60RPqoYJB7mqUOYai63wgII7alLVcjY0VBrft4SnoqvxKTgily AQeDlslc72J7y6vjD+KpT1jD/LVmv/3eTjoxX8qog0rQoupHzk+t3zKOojjVww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699346128; 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=dP3OtcbYJc9m3pZBM6VuFd6Cp2/aQ2VL1lGz6I7lOl0=; b=EZpAouHaPbNQ4vG9M34s2IuQCPwVvaBH25Q1NCUKuEUfsSptjdy3XxH6BCAl9+yG4LQIRE SfExgrlMuRvLLGUlRtlZ3pTNv2lp91kwhKyP0asLDNWII6eLHO5NjRwTONwiUGuc97iHxI eBtusHMiQrhx3VF2UUj2ytMxS3JNl44kwWRT6B2wht7w9P7YleoQMZiLkd88xFJpfm0Bw6 AdYlgMuzkLUvjMnB4f3WLa7H/x1155jn7eHaSk55xprPL1kf1mbgk/TXWvI36q8BFPL8MG YV6Orau/j6XPfLTyxqjVgT7cYuS3AcqsRXK7H3zDquR6CmhNRaoQZgYGK2TlpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699346128; a=rsa-sha256; cv=none; b=c6iss+d3i3OmLH3TnejyUFQcCywAZVt8VIYb0DoSDIDgPMi0OULQl6jeqVzQde+UMegSEu CtqcZ+bEuiu4/spXT1wF7Eq1l97e/ktFcH2DKC6z3Qx91YJ2KyTrq7PCqjW84yOyGRygkf 7k57OjJ0aQXsBdrx4xv/KmZt8NNX2B7QYGL57Mr94npNF32po6aEQry60OynPbfwA0bM6E M10FPx7lv5bAnysuw1oc2CmVZ7JM29fwMT1+oDlXcBJEAOZ/y+gcTt6VZQ4CZ9PCm2Ec1M CgUKcE8TeAO3Izn/xHePeVpkZ5y4QM50pYFmcvCS68F0pZ3GQjkI/javtnmsWw== 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 4SPhPC6SLCzk4r; Tue, 7 Nov 2023 08:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A78ZRGO050360; Tue, 7 Nov 2023 08:35:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A78ZRJu050357; Tue, 7 Nov 2023 08:35:27 GMT (envelope-from git) Date: Tue, 7 Nov 2023 08:35:27 GMT Message-Id: <202311070835.3A78ZRJu050357@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 0a0e141da5b5 - main - graphics/nvidia-drm-515-kmod: Remove dependency on linuxkpi_gplv2.ko List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a0e141da5b584e00c498947e596b957bd40db94 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=0a0e141da5b584e00c498947e596b957bd40db94 commit 0a0e141da5b584e00c498947e596b957bd40db94 Author: Austin Shafer AuthorDate: 2023-11-07 08:26:48 +0000 Commit: Gleb Popov CommitDate: 2023-11-07 08:35:19 +0000 graphics/nvidia-drm-515-kmod: Remove dependency on linuxkpi_gplv2.ko This fixes a failure on module load for nvidia-drm.ko as a result of linuxkpi_gplv2.ko being removed from drm-kmod in 5.15. For now we just remove the dependency in the nvidia-drm 515 port to unbreak things, I'll create a longer-term upstream fix. PR: 274910 Reviewed by: arrowd Differential Revision: https://reviews.freebsd.org/D42484 --- graphics/nvidia-drm-515-kmod/Makefile | 2 +- .../nvidia-drm-515-kmod/files/patch-nvidia-drm-freebsd-lkpi.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/graphics/nvidia-drm-515-kmod/Makefile b/graphics/nvidia-drm-515-kmod/Makefile index aa8adc6442b6..5d43afc9f2c4 100644 --- a/graphics/nvidia-drm-515-kmod/Makefile +++ b/graphics/nvidia-drm-515-kmod/Makefile @@ -1,6 +1,6 @@ PORTNAME= nvidia-drm-515-kmod PORTVERSION= ${NVIDIA_DISTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-515-kmod diff --git a/graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-freebsd-lkpi.c b/graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-freebsd-lkpi.c new file mode 100644 index 000000000000..5f707bd2f03d --- /dev/null +++ b/graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-freebsd-lkpi.c @@ -0,0 +1,10 @@ +--- nvidia-drm-freebsd-lkpi.c.orig 2023-11-06 18:11:13 UTC ++++ nvidia-drm-freebsd-lkpi.c +@@ -228,7 +228,6 @@ MODULE_DEPEND(nvidia_drm, linuxkpi, 1, 1, 1); + + LKPI_DRIVER_MODULE(nvidia_drm, nv_drm_init, nv_drm_exit); + MODULE_DEPEND(nvidia_drm, linuxkpi, 1, 1, 1); +-MODULE_DEPEND(nvidia_drm, linuxkpi_gplv2, 1, 1, 1); + MODULE_DEPEND(nvidia_drm, drmn, 2, 2, 2); + MODULE_DEPEND(nvidia_drm, dmabuf, 1, 1, 1); + MODULE_DEPEND(nvidia_drm, nvidia, 1, 1, 1);